diff options
Diffstat (limited to 'kernel/rcutree_plugin.h')
-rw-r--r-- | kernel/rcutree_plugin.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h index d9d7a89da8bb..8aafbb80b8b0 100644 --- a/kernel/rcutree_plugin.h +++ b/kernel/rcutree_plugin.h | |||
@@ -318,7 +318,7 @@ static noinline void rcu_read_unlock_special(struct task_struct *t) | |||
318 | } | 318 | } |
319 | 319 | ||
320 | /* Hardware IRQ handlers cannot block. */ | 320 | /* Hardware IRQ handlers cannot block. */ |
321 | if (in_irq()) { | 321 | if (in_irq() || in_serving_softirq()) { |
322 | local_irq_restore(flags); | 322 | local_irq_restore(flags); |
323 | return; | 323 | return; |
324 | } | 324 | } |