From 283df1fc494714fdb48729445ef370eead02d0ff Mon Sep 17 00:00:00 2001
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Wed, 7 Jan 2009 18:08:39 -0800
Subject: [PATCH] --- yaml --- r: 127608 b: refs/heads/master c:
 13337714f3b0307dc7f75ef5d83ecf0db2abbd65 h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/kernel/cpuset.c | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 6233bcf55356..7513853677fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7c5ec9193d32b9559a3bb8893ceedbda85201ff
+refs/heads/master: 13337714f3b0307dc7f75ef5d83ecf0db2abbd65
diff --git a/trunk/kernel/cpuset.c b/trunk/kernel/cpuset.c
index 345ace5117de..a841b5c01ef9 100644
--- a/trunk/kernel/cpuset.c
+++ b/trunk/kernel/cpuset.c
@@ -375,14 +375,9 @@ void cpuset_update_task_memory_state(void)
 	struct task_struct *tsk = current;
 	struct cpuset *cs;
 
-	if (task_cs(tsk) == &top_cpuset) {
-		/* Don't need rcu for top_cpuset.  It's never freed. */
-		my_cpusets_mem_gen = top_cpuset.mems_generation;
-	} else {
-		rcu_read_lock();
-		my_cpusets_mem_gen = task_cs(tsk)->mems_generation;
-		rcu_read_unlock();
-	}
+	rcu_read_lock();
+	my_cpusets_mem_gen = task_cs(tsk)->mems_generation;
+	rcu_read_unlock();
 
 	if (my_cpusets_mem_gen != tsk->cpuset_mems_generation) {
 		mutex_lock(&callback_mutex);