Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / kernel / softirq.c

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 75ffc1d1a2e06e9d08f1e121e7dfb86d7758b3ed..6f584861d329bfb0382a5691320938cf3db7009b 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -390,7 +390,7 @@ static inline void tick_irq_exit(void)
 
        /* Make sure that timer wheel updates are propagated */
        if ((idle_cpu(cpu) && !need_resched()) || tick_nohz_full_cpu(cpu)) {
-               if (!in_interrupt())
+               if (!in_irq())
                        tick_nohz_irq_exit();
        }
 #endif