From ed4716118e55a3216e6f328f2c800f757bd4f734 Mon Sep 17 00:00:00 2001
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Wed, 11 Feb 2009 13:04:29 -0800
Subject: [PATCH] --- yaml --- r: 131286 b: refs/heads/master c:
 2e9c23724328ae4e56c42a35a717a956d7d3001d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 347312e59594..3aab1bd3a01a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4097456cd1d9285e876fc5d08a789462804cc28
+refs/heads/master: 2e9c23724328ae4e56c42a35a717a956d7d3001d
diff --git a/trunk/mm/page_cgroup.c b/trunk/mm/page_cgroup.c
index 7006a11350c8..ceecfbb143fa 100644
--- a/trunk/mm/page_cgroup.c
+++ b/trunk/mm/page_cgroup.c
@@ -114,7 +114,8 @@ static int __init_refok init_section_page_cgroup(unsigned long pfn)
 		nid = page_to_nid(pfn_to_page(pfn));
 		table_size = sizeof(struct page_cgroup) * PAGES_PER_SECTION;
 		if (slab_is_available()) {
-			base = kmalloc_node(table_size, GFP_KERNEL, nid);
+			base = kmalloc_node(table_size,
+					GFP_KERNEL | __GFP_NOWARN, nid);
 			if (!base)
 				base = vmalloc_node(table_size, nid);
 		} else {