---

yaml --- r: 252674 b: refs/heads/master c: 4305ce7 h: refs/heads/master v: v3
git-mirror · May 26, 2011 · cb37b46 · cb37b46
1 parent 808162f
commit cb37b46
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5904090c754327ed6c2ecaefed4f7d473df393f
+refs/heads/master: 4305ce7894dd38b0633bfc8978437320119223bd
diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c
@@ -324,8 +324,8 @@ void rcu_enter_nohz(void)
 	smp_mb(); /* CPUs seeing ++ must see prior RCU read-side crit sects */
 	local_irq_save(flags);
 	rdtp = &__get_cpu_var(rcu_dynticks);
-	rdtp->dynticks++;
-	rdtp->dynticks_nesting--;
+	if (--rdtp->dynticks_nesting == 0)
+		rdtp->dynticks++;
 	WARN_ON_ONCE(rdtp->dynticks & 0x1);
 	local_irq_restore(flags);
 }