From 3547977bc2965859cb0f39ae780eb27c7bf79745 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung@gmail.com>
Date: Thu, 26 May 2011 16:25:29 -0700
Subject: [PATCH] --- yaml --- r: 252037 b: refs/heads/master c:
 268433b8e54486b12478e94ba18587bcc7de4d57 h: refs/heads/master i:   252035:
 c55bf6183b01ce1357585a68be942132a9f9d2ed v: v3

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

diff --git a/[refs] b/[refs]
index 641a6f1d06bf..7e3f21dad489 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39cc98f1f8aa949afeea89f424c7494b0785d7da
+refs/heads/master: 268433b8e54486b12478e94ba18587bcc7de4d57
diff --git a/trunk/mm/page_cgroup.c b/trunk/mm/page_cgroup.c
index 2daadc322ba6..4eb05302e2e1 100644
--- a/trunk/mm/page_cgroup.c
+++ b/trunk/mm/page_cgroup.c
@@ -130,7 +130,7 @@ struct page *lookup_cgroup_page(struct page_cgroup *pc)
 	return page;
 }
 
-static void *__init_refok alloc_page_cgroup(size_t size, int nid)
+static void *__meminit alloc_page_cgroup(size_t size, int nid)
 {
 	void *addr = NULL;
 
@@ -162,7 +162,7 @@ static void free_page_cgroup(void *addr)
 }
 #endif
 
-static int __init_refok init_section_page_cgroup(unsigned long pfn)
+static int __meminit init_section_page_cgroup(unsigned long pfn)
 {
 	struct page_cgroup *base, *pc;
 	struct mem_section *section;