aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/softirq.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/softirq.c')
-rw-r--r--kernel/softirq.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c
index de15813f2a66..8b1446d4a4db 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -337,6 +337,19 @@ static inline void invoke_softirq(void)
337 } 337 }
338} 338}
339 339
340static inline void tick_irq_exit(void)
341{
342#ifdef CONFIG_NO_HZ_COMMON
343 int cpu = smp_processor_id();
344
345 /* Make sure that timer wheel updates are propagated */
346 if ((idle_cpu(cpu) && !need_resched()) || tick_nohz_full_cpu(cpu)) {
347 if (!in_interrupt())
348 tick_nohz_irq_exit();
349 }
350#endif
351}
352
340/* 353/*
341 * Exit an interrupt context. Process softirqs if needed and possible: 354 * Exit an interrupt context. Process softirqs if needed and possible:
342 */ 355 */
@@ -348,11 +361,7 @@ void irq_exit(void)
348 if (!in_interrupt() && local_softirq_pending()) 361 if (!in_interrupt() && local_softirq_pending())
349 invoke_softirq(); 362 invoke_softirq();
350 363
351#ifdef CONFIG_NO_HZ_COMMON 364 tick_irq_exit();
352 /* Make sure that timer wheel updates are propagated */
353 if (idle_cpu(smp_processor_id()) && !in_interrupt() && !need_resched())
354 tick_nohz_irq_exit();
355#endif
356 rcu_irq_exit(); 365 rcu_irq_exit();
357 sched_preempt_enable_no_resched(); 366 sched_preempt_enable_no_resched();
358} 367}