---

yaml --- r: 273240 b: refs/heads/master c: ff7ee93 h: refs/heads/master v: v3
git-mirror · Nov 2, 2011 · e4f7e38 · e4f7e38
1 parent 4dbab15
commit e4f7e38
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77ceab8ea590d7dc6c8f055ce43dfebd74428107
+refs/heads/master: ff7ee93f47151e23601856e7eb5510babf956571
diff --git a/trunk/mm/page_cgroup.c b/trunk/mm/page_cgroup.c
@@ -133,10 +133,13 @@ struct page *lookup_cgroup_page(struct page_cgroup *pc)
 static void *__meminit alloc_page_cgroup(size_t size, int nid)
 {
 	void *addr = NULL;
+	gfp_t flags = GFP_KERNEL | __GFP_NOWARN;
 
-	addr = alloc_pages_exact_nid(nid, size, GFP_KERNEL | __GFP_NOWARN);
-	if (addr)
+	addr = alloc_pages_exact_nid(nid, size, flags);
+	if (addr) {
+		kmemleak_alloc(addr, size, 1, flags);
 		return addr;
+	}
 
 	if (node_state(nid, N_HIGH_MEMORY))
 		addr = vmalloc_node(size, nid);