---

yaml --- r: 252673 b: refs/heads/master c: b590409 h: refs/heads/master i: 252671: 313509f v: v3
git-mirror · May 26, 2011 · 808162f · 808162f
1 parent 3b77ce6
commit 808162f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1135633bddcf7a819a1490c18d04965c490bcc1e
+refs/heads/master: b5904090c754327ed6c2ecaefed4f7d473df393f
diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c
@@ -421,8 +421,9 @@ void rcu_irq_exit(void)
 	WARN_ON_ONCE(rdtp->dynticks & 0x1);
 
 	/* If the interrupt queued a callback, get out of dyntick mode. */
-	if (__this_cpu_read(rcu_sched_data.nxtlist) ||
-	    __this_cpu_read(rcu_bh_data.nxtlist))
+	if (in_irq() &&
+	    (__this_cpu_read(rcu_sched_data.nxtlist) ||
+	     __this_cpu_read(rcu_bh_data.nxtlist)))
 		set_need_resched();
 }