[NETFILTER]: nf_conntrack_ftp: fix missing helper mask initilization

[linux-2.6] / mm / sparse.c

diff --git a/mm/sparse.c b/mm/sparse.c
index c7a2b3a0e46b2961fbc6fe6794e562be66def97e..b3c82ba300124ea28d1cb952f337e387b1c4b9eb 100644 (file)
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -1,7 +1,6 @@
 /*
  * sparse memory mappings.
  */
-#include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/mmzone.h>
 #include <linux/bootmem.h>
@@ -212,7 +211,7 @@ static struct page *__kmalloc_section_memmap(unsigned long nr_pages)
        struct page *page, *ret;
        unsigned long memmap_size = sizeof(struct page) * nr_pages;
 
-       page = alloc_pages(GFP_KERNEL, get_order(memmap_size));
+       page = alloc_pages(GFP_KERNEL|__GFP_NOWARN, get_order(memmap_size));
        if (page)
                goto got_map_page;