From 2e4f556125be8dae401e03020e9ede69a8bd17cf Mon Sep 17 00:00:00 2001
From: Yasunori Goto <y-goto@jp.fujitsu.com>
Date: Sat, 28 Oct 2006 10:38:32 -0700
Subject: [PATCH] --- yaml --- r: 40395 b: refs/heads/master c:
 f2d0aa5bf8d4f7ae4cb1a7feebf5b1afddd0b9b0 h: refs/heads/master i:   40393:
 0ad04a18b83ea882e3e171eb36b3ba49aae91a0a   40391:
 13ce08cdced218194eb3685513e3938340063eb0 v: v3

---
 [refs]            | 2 +-
 trunk/mm/sparse.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c224eb5afbbe..ae38f2e6ea96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 969b755aadf7bcf3df5991a127a103acd0145a52
+refs/heads/master: f2d0aa5bf8d4f7ae4cb1a7feebf5b1afddd0b9b0
diff --git a/trunk/mm/sparse.c b/trunk/mm/sparse.c
index 86c52ab80878..b3c82ba30012 100644
--- a/trunk/mm/sparse.c
+++ b/trunk/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;