Merge branches 'core/debugobjects', 'core/iommu', 'core/locking', 'core/printk',...

[linux-2.6-omap-h63xx.git] / kernel / softirq.c

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 8d9934b4162aee2215fc9d7e13c639b90533e398..466e75ce271aa0795ac50266d9d3bc2acdde7261 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -255,6 +255,7 @@ void irq_enter(void)
 {
        int cpu = smp_processor_id();
 
+       rcu_irq_enter();
        if (idle_cpu(cpu) && !in_interrupt()) {
                __irq_enter();
                tick_check_idle(cpu);
@@ -281,9 +282,9 @@ void irq_exit(void)
 
 #ifdef CONFIG_NO_HZ
        /* Make sure that timer wheel updates are propagated */
-       if (!in_interrupt() && idle_cpu(smp_processor_id()) && !need_resched())
-               tick_nohz_stop_sched_tick(0);
        rcu_irq_exit();
+       if (idle_cpu(smp_processor_id()) && !in_interrupt() && !need_resched())
+               tick_nohz_stop_sched_tick(0);
 #endif
        preempt_enable_no_resched();
 }