---

yaml --- r: 288560 b: refs/heads/master c: 8762705 h: refs/heads/master v: v3
git-mirror · Feb 21, 2012 · 81af578 · 81af578
1 parent c65e5f6
commit 81af578
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 768dfffdffbfcc07d6927bdd642c714c0dd64c99
+refs/heads/master: 8762705ad4ac860bb78434409df463d02ac8f027
diff --git a/trunk/kernel/rcutiny_plugin.h b/trunk/kernel/rcutiny_plugin.h
@@ -570,7 +570,7 @@ static noinline void rcu_read_unlock_special(struct task_struct *t)
 		rcu_preempt_cpu_qs();
 
 	/* Hardware IRQ handlers cannot block. */
-	if (in_irq()) {
+	if (in_irq() || in_serving_softirq()) {
 		local_irq_restore(flags);
 		return;
 	}