Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature', 'x86/crashdump', 'x86...

[deliverable/linux.git] / kernel / softirq.c

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 7110daeb9a90b2b585d97cf0fda94b7eb0b1869f..e7c69a720d69a0a7d9166c21883e05d2521cb26a 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -269,10 +269,11 @@ void irq_enter(void)
 {
        int cpu = smp_processor_id();
 
-       if (idle_cpu(cpu) && !in_interrupt())
+       if (idle_cpu(cpu) && !in_interrupt()) {
+               __irq_enter();
                tick_check_idle(cpu);
-
-       __irq_enter();
+       } else
+               __irq_enter();
 }
 
 #ifdef __ARCH_IRQ_EXIT_IRQS_DISABLED