---

yaml --- r: 349815 b: refs/heads/master c: 5a41344 h: refs/heads/master i: 349813: 59309dc 349811: 8d3c701 349807: 68cb040 v: v3
git-mirror · Feb 7, 2013 · cc8ea60 · cc8ea60
1 parent 2f692c4
commit cc8ea60
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0351096eb0584ba927a00a37e18be7af135250c3
+refs/heads/master: 5a41344a3d83ef2c08e40bfce1efa5795def9b82
diff --git a/trunk/kernel/srcu.c b/trunk/kernel/srcu.c
@@ -321,10 +321,8 @@ EXPORT_SYMBOL_GPL(__srcu_read_lock);
  */
 void __srcu_read_unlock(struct srcu_struct *sp, int idx)
 {
-	preempt_disable();
 	smp_mb(); /* C */  /* Avoid leaking the critical section. */
-	ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) -= 1;
-	preempt_enable();
+	this_cpu_dec(sp->per_cpu_ref->c[idx]);
 }
 EXPORT_SYMBOL_GPL(__srcu_read_unlock);