---

yaml --- r: 349822 b: refs/heads/master c: 7a6b55e h: refs/heads/master v: v3
git-mirror · Feb 7, 2013 · 522ae44 · 522ae44
1 parent f917892
commit 522ae44
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49271ca60645d64197b28c0835fed39f74b1a2d7
+refs/heads/master: 7a6b55e7108b3476d13ee9501ec69dbe1605d774
diff --git a/trunk/kernel/srcu.c b/trunk/kernel/srcu.c
@@ -298,9 +298,8 @@ int __srcu_read_lock(struct srcu_struct *sp)
 {
 	int idx;
 
+	idx = ACCESS_ONCE(sp->completed) & 0x1;
 	preempt_disable();
-	idx = rcu_dereference_index_check(sp->completed,
-					  rcu_read_lock_sched_held()) & 0x1;
 	ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) += 1;
 	smp_mb(); /* B */  /* Avoid leaking the critical section. */
 	ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->seq[idx]) += 1;