diff --git a/[refs] b/[refs]
index e353959f1a2b..86318b7b6608 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ceb1a04187553e08c6ab60d30cee7c454ee139a
+refs/heads/master: ee5f80a993539490a07477ff2526bf62c503fbb4
diff --git a/trunk/kernel/softirq.c b/trunk/kernel/softirq.c
index 7110daeb9a90..e7c69a720d69 100644
--- a/trunk/kernel/softirq.c
+++ b/trunk/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