From df9ea6aeda0ca6f75d731dad176a95210d9e3fda Mon Sep 17 00:00:00 2001
From: Paul Jackson <pj@sgi.com>
Date: Sun, 8 Jan 2006 01:02:04 -0800
Subject: [PATCH] --- yaml --- r: 16914 b: refs/heads/master c:
 03a285f58064b8e0af08383e082e383753d9c33e h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/kernel/cpuset.c | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f5549070aebd..781b3f517192 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7edc59628b2f5d6516b4677b3b56f5f056e45cd9
+refs/heads/master: 03a285f58064b8e0af08383e082e383753d9c33e
diff --git a/trunk/kernel/cpuset.c b/trunk/kernel/cpuset.c
index 681a5d58d40d..e04c2da9dadb 100644
--- a/trunk/kernel/cpuset.c
+++ b/trunk/kernel/cpuset.c
@@ -647,10 +647,15 @@ void cpuset_update_task_memory_state()
 	struct task_struct *tsk = current;
 	struct cpuset *cs;
 
-	rcu_read_lock();
-	cs = rcu_dereference(tsk->cpuset);
-	my_cpusets_mem_gen = cs->mems_generation;
-	rcu_read_unlock();
+	if (tsk->cpuset == &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();
+		cs = rcu_dereference(tsk->cpuset);
+		my_cpusets_mem_gen = cs->mems_generation;
+		rcu_read_unlock();
+	}
 
 	if (my_cpusets_mem_gen != tsk->cpuset_mems_generation) {
 		down(&callback_sem);