From ced7e7cd52b75055824053464f4995436937ef66 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 7 Nov 2008 11:06:00 +0100
Subject: [PATCH] --- yaml --- r: 118773 b: refs/heads/master c:
 ee5f80a993539490a07477ff2526bf62c503fbb4 h: refs/heads/master i:   118771:
 5f37a63a02fa17d91a9e9a5c8fbb6048b7264c8a v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/softirq.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

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