Merge tag 'for-linus-20170510' of git://git.infradead.org/linux-mtd

[linux-2.6-microblaze.git] / drivers / mtd / nand / nandsim.c

diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index c847426..03a0d05 100644 (file)
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -40,6 +40,7 @@
 #include <linux/list.h>
 #include <linux/random.h>
 #include <linux/sched.h>
+#include <linux/sched/mm.h>
 #include <linux/fs.h>
 #include <linux/pagemap.h>
 #include <linux/seq_file.h>
@@ -901,7 +902,7 @@ static int parse_weakpages(void)
                zero_ok = (*w == '0' ? 1 : 0);
                page_no = simple_strtoul(w, &w, 0);
                if (!zero_ok && !page_no) {
-                       NS_ERR("invalid weakpagess.\n");
+                       NS_ERR("invalid weakpages.\n");
                        return -EINVAL;
                }
                max_writes = 3;
@@ -1368,31 +1369,18 @@ static int get_pages(struct nandsim *ns, struct file *file, size_t count, loff_t
        return 0;
 }
 
-static int set_memalloc(void)
-{
-       if (current->flags & PF_MEMALLOC)
-               return 0;
-       current->flags |= PF_MEMALLOC;
-       return 1;
-}
-
-static void clear_memalloc(int memalloc)
-{
-       if (memalloc)
-               current->flags &= ~PF_MEMALLOC;
-}
-
 static ssize_t read_file(struct nandsim *ns, struct file *file, void *buf, size_t count, loff_t pos)
 {
        ssize_t tx;
-       int err, memalloc;
+       int err;
+       unsigned int noreclaim_flag;
 
        err = get_pages(ns, file, count, pos);
        if (err)
                return err;
-       memalloc = set_memalloc();
+       noreclaim_flag = memalloc_noreclaim_save();
        tx = kernel_read(file, pos, buf, count);
-       clear_memalloc(memalloc);
+       memalloc_noreclaim_restore(noreclaim_flag);
        put_pages(ns);
        return tx;
 }
@@ -1400,14 +1388,15 @@ static ssize_t read_file(struct nandsim *ns, struct file *file, void *buf, size_
 static ssize_t write_file(struct nandsim *ns, struct file *file, void *buf, size_t count, loff_t pos)
 {
        ssize_t tx;
-       int err, memalloc;
+       int err;
+       unsigned int noreclaim_flag;
 
        err = get_pages(ns, file, count, pos);
        if (err)
                return err;
-       memalloc = set_memalloc();
+       noreclaim_flag = memalloc_noreclaim_save();
        tx = kernel_write(file, buf, count, pos);
-       clear_memalloc(memalloc);
+       memalloc_noreclaim_restore(noreclaim_flag);
        put_pages(ns);
        return tx;
 }