---

yaml --- r: 127608 b: refs/heads/master c: 1333771 h: refs/heads/master v: v3
git-mirror · Jan 8, 2009 · 283df1f · 283df1f
1 parent 48e20e4
commit 283df1f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git 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
@@ -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);