From e4f7e3884cf0d15e4875292aaed661f66c6a2f70 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <rostedt@goodmis.org>
Date: Wed, 2 Nov 2011 13:38:11 -0700
Subject: [PATCH] --- yaml --- r: 273240 b: refs/heads/master c:
 ff7ee93f47151e23601856e7eb5510babf956571 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 874117cb9c5c..3a6749717913 100644
--- 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
index 6bdc67dbbc28..3749ae15a8c8 100644
--- 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);