|
@@ -361,10 +361,14 @@ void rcu_read_unlock_special(struct task_struct *t)
|
|
|
special = t->rcu_read_unlock_special;
|
|
special = t->rcu_read_unlock_special;
|
|
|
if (special & RCU_READ_UNLOCK_NEED_QS) {
|
|
if (special & RCU_READ_UNLOCK_NEED_QS) {
|
|
|
rcu_preempt_qs(smp_processor_id());
|
|
rcu_preempt_qs(smp_processor_id());
|
|
|
|
|
+ if (!t->rcu_read_unlock_special) {
|
|
|
|
|
+ local_irq_restore(flags);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- /* Hardware IRQ handlers cannot block. */
|
|
|
|
|
- if (in_irq() || in_serving_softirq()) {
|
|
|
|
|
|
|
+ /* Hardware IRQ handlers cannot block, complain if they get here. */
|
|
|
|
|
+ if (WARN_ON_ONCE(in_irq() || in_serving_softirq())) {
|
|
|
local_irq_restore(flags);
|
|
local_irq_restore(flags);
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|