From 81af578719c7e84e7e83104e9a7ffd0b60f6c7ea Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Wed, 11 Jan 2012 16:59:01 -0800 Subject: [PATCH] --- yaml --- r: 288560 b: refs/heads/master c: 8762705ad4ac860bb78434409df463d02ac8f027 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/rcutiny_plugin.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9912994e0394..fb1e93b73385 100644 --- 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 index 95df60ebe363..387c2759e1b0 100644 --- 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; }