Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

[pandora-kernel.git] / mm / sparse.c

diff --git a/mm/sparse.c b/mm/sparse.c
index 86c52ab..b3c82ba 100644 (file)
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -211,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;