Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6

* 'for-linus' of git://git.infradead.org/ubi-2.6:
  UBIFS: fix assertion warning and refine comments
  UBIFS: kill CONFIG_UBIFS_FS_DEBUG_CHKS
  UBIFS: use GFP_NOFS properly
  UBI: use GFP_NOFS properly

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index aaa6e1e83b29..eededf94f5a6 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -1345,7 +1345,7 @@ int ubi_dbg_check_write(struct ubi_device *ubi, const void *buf, int pnum,
         if (!(ubi_chk_flags & UBI_CHK_IO))
                 return 0;
 
-        buf1 = __vmalloc(len, GFP_KERNEL | GFP_NOFS, PAGE_KERNEL);
+        buf1 = __vmalloc(len, GFP_NOFS, PAGE_KERNEL);
         if (!buf1) {
                 ubi_err("cannot allocate memory to check writes");
                 return 0;
@@ -1409,7 +1409,7 @@ int ubi_dbg_check_all_ff(struct ubi_device *ubi, int pnum, int offset, int len)
         if (!(ubi_chk_flags & UBI_CHK_IO))
                 return 0;
 
-        buf = __vmalloc(len, GFP_KERNEL | GFP_NOFS, PAGE_KERNEL);
+        buf = __vmalloc(len, GFP_NOFS, PAGE_KERNEL);
         if (!buf) {
                 ubi_err("cannot allocate memory to check for 0xFFs");
                 return 0;