X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=kernel%2Fsoftirq.c;h=e7c69a720d69a0a7d9166c21883e05d2521cb26a;hb=refs%2Fheads%2Fv2.6.28-omap1-h63xx;hp=83ba21a13bd470cea2815d6792e8ff24af43e727;hpb=58617d5e59663d2edea03bd03cb74279827611bb;p=linux-2.6-omap-h63xx.git

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 83ba21a13bd..e7c69a720d6 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -267,16 +267,13 @@ asmlinkage void do_softirq(void)
  */
 void irq_enter(void)
 {
-#ifdef CONFIG_NO_HZ
 	int cpu = smp_processor_id();
-	if (idle_cpu(cpu) && !in_interrupt())
-		tick_nohz_stop_idle(cpu);
-#endif
-	__irq_enter();
-#ifdef CONFIG_NO_HZ
-	if (idle_cpu(cpu))
-		tick_nohz_update_jiffies();
-#endif
+
+	if (idle_cpu(cpu) && !in_interrupt()) {
+		__irq_enter();
+		tick_check_idle(cpu);
+	} else
+		__irq_enter();
 }
 
 #ifdef __ARCH_IRQ_EXIT_IRQS_DISABLED