From 0bdda391445919917636f0720d0648ff1075d714 Mon Sep 17 00:00:00 2001
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Wed, 7 Jan 2009 18:08:07 -0800
Subject: [PATCH] --- yaml --- r: 127572 b: refs/heads/master c:
 2e4d40915fb85207fe48cfc31201824ec6d7426e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5b92f94a6758..77b7505a59aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18f59ea7de08db2449ba99185e8d8cc30e7acac5
+refs/heads/master: 2e4d40915fb85207fe48cfc31201824ec6d7426e
diff --git a/trunk/include/linux/memcontrol.h b/trunk/include/linux/memcontrol.h
index 472efd09118c..2de6504e01fb 100644
--- a/trunk/include/linux/memcontrol.h
+++ b/trunk/include/linux/memcontrol.h
@@ -61,8 +61,15 @@ int task_in_mem_cgroup(struct task_struct *task, const struct mem_cgroup *mem);
 
 extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p);
 
-#define mm_match_cgroup(mm, cgroup)	\
-	((cgroup) == mem_cgroup_from_task((mm)->owner))
+static inline
+int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
+{
+	struct mem_cgroup *mem;
+	rcu_read_lock();
+	mem = mem_cgroup_from_task((mm)->owner);
+	rcu_read_unlock();
+	return cgroup == mem;
+}
 
 extern int
 mem_cgroup_prepare_migration(struct page *page, struct mem_cgroup **ptr);