diff options
Diffstat (limited to 'kernel/softirq.c')
-rw-r--r-- | kernel/softirq.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index 37d67aa2d56f..d410014279e7 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c | |||
@@ -265,16 +265,12 @@ asmlinkage void do_softirq(void) | |||
265 | */ | 265 | */ |
266 | void irq_enter(void) | 266 | void irq_enter(void) |
267 | { | 267 | { |
268 | #ifdef CONFIG_NO_HZ | ||
269 | int cpu = smp_processor_id(); | 268 | int cpu = smp_processor_id(); |
269 | |||
270 | if (idle_cpu(cpu) && !in_interrupt()) | 270 | if (idle_cpu(cpu) && !in_interrupt()) |
271 | tick_nohz_stop_idle(cpu); | 271 | tick_check_idle(cpu); |
272 | #endif | 272 | |
273 | __irq_enter(); | 273 | __irq_enter(); |
274 | #ifdef CONFIG_NO_HZ | ||
275 | if (idle_cpu(cpu)) | ||
276 | tick_nohz_update_jiffies(); | ||
277 | #endif | ||
278 | } | 274 | } |
279 | 275 | ||
280 | #ifdef __ARCH_IRQ_EXIT_IRQS_DISABLED | 276 | #ifdef __ARCH_IRQ_EXIT_IRQS_DISABLED |