---

yaml --- r: 131286 b: refs/heads/master c: 2e9c237 h: refs/heads/master v: v3
git-mirror · Feb 11, 2009 · ed47161 · ed47161
1 parent 8aa6fd2
commit ed47161
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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 {