"Tree RCU": scalable classic RCU implementation

[platform/adaptation/renesas_rcar/renesas_kernel.git] / kernel / softirq.c

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 7110dae..80d323e 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -269,10 +269,12 @@ void irq_enter(void)
 {
        int cpu = smp_processor_id();
 
-       if (idle_cpu(cpu) && !in_interrupt())
+       rcu_irq_enter();
+       if (idle_cpu(cpu) && !in_interrupt()) {
+               __irq_enter();
                tick_check_idle(cpu);
-
-       __irq_enter();
+       } else
+               __irq_enter();
 }
 
 #ifdef __ARCH_IRQ_EXIT_IRQS_DISABLED
@@ -294,9 +296,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();
 }