From fdd03f34a87b4de328405eef25a6ad5ad10a105b Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Thu, 7 Feb 2008 00:14:03 -0800
Subject: [PATCH] --- yaml --- r: 83769 b: refs/heads/master c:
 3062fc67dad01b1d2a15d58c709eff946389eca4 h: refs/heads/master i:   83767:
 36763e7fbb7dce464c7d77dd5f2289086ccda768 v: v3

---
 [refs]                           |  2 +-
 trunk/include/linux/memcontrol.h | 11 +++++++++--
 trunk/mm/memcontrol.c            |  5 -----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index f5b61958fed0..8ac7c9194f18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1a1cd590e3fcb0d2e230128daf2337ea55387dc
+refs/heads/master: 3062fc67dad01b1d2a15d58c709eff946389eca4
diff --git a/trunk/include/linux/memcontrol.h b/trunk/include/linux/memcontrol.h
index cc0ad7191acd..4f580268b1b7 100644
--- a/trunk/include/linux/memcontrol.h
+++ b/trunk/include/linux/memcontrol.h
@@ -20,6 +20,9 @@
 #ifndef _LINUX_MEMCONTROL_H
 #define _LINUX_MEMCONTROL_H
 
+#include <linux/rcupdate.h>
+#include <linux/mm.h>
+
 struct mem_cgroup;
 struct page_cgroup;
 struct page;
@@ -45,7 +48,11 @@ extern unsigned long mem_cgroup_isolate_pages(unsigned long nr_to_scan,
 extern void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask);
 extern int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm,
 					gfp_t gfp_mask);
-extern struct mem_cgroup *mm_cgroup(struct mm_struct *mm);
+
+static inline struct mem_cgroup *mm_cgroup(const struct mm_struct *mm)
+{
+	return rcu_dereference(mm->mem_cgroup);
+}
 
 static inline void mem_cgroup_uncharge_page(struct page *page)
 {
@@ -98,7 +105,7 @@ static inline int mem_cgroup_cache_charge(struct page *page,
 	return 0;
 }
 
-static inline struct mem_cgroup *mm_cgroup(struct mm_struct *mm)
+static inline struct mem_cgroup *mm_cgroup(const struct mm_struct *mm)
 {
 	return NULL;
 }
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index ac8774426fec..f6cdbf755ed3 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -110,11 +110,6 @@ struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p)
 				struct mem_cgroup, css);
 }
 
-inline struct mem_cgroup *mm_cgroup(struct mm_struct *mm)
-{
-	return rcu_dereference(mm->mem_cgroup);
-}
-
 void mm_init_cgroup(struct mm_struct *mm, struct task_struct *p)
 {
 	struct mem_cgroup *mem;