Message ID | 1427831308-1854-27-git-send-email-kamal@canonical.com |
---|---|
State | New |
Headers | show |
diff --git a/kernel/softirq.c b/kernel/softirq.c index 11025cc..824a7ff 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -654,9 +654,13 @@ static void run_ksoftirqd(unsigned int cpu) * in the task stack here. */ __do_softirq(); - rcu_note_context_switch(cpu); local_irq_enable(); cond_resched(); + + preempt_disable(); + rcu_note_context_switch(cpu); + preempt_enable(); + return; } local_irq_enable();