Merge branch 'hp-wmi' into release

[~andy/linux] / kernel / softirq.c

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 0740dfd55c51f8b6ffde0ae0c870eb9b51b36373..a09502e2ef758721917ab537e345da0036197628 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -302,9 +302,9 @@ void irq_exit(void)
        if (!in_interrupt() && local_softirq_pending())
                invoke_softirq();
 
+       rcu_irq_exit();
 #ifdef CONFIG_NO_HZ
        /* Make sure that timer wheel updates are propagated */
-       rcu_irq_exit();
        if (idle_cpu(smp_processor_id()) && !in_interrupt() && !need_resched())
                tick_nohz_stop_sched_tick(0);
 #endif