diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-13 12:05:05 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-10 00:19:48 (GMT) |
| commit | 8c57bf0162a60e73faf923f89db7b8f2b4723b2b (patch) | |
| tree | f12e2746efc0ed72e0750ae15f8e517f99306f78 /kernel/timer.c | |
| parent | 357da1383b14515af9b099ef760adf3c39bc04b8 (diff) | |
| download | linux-fsl-qoriq-8c57bf0162a60e73faf923f89db7b8f2b4723b2b.tar.xz | |
x86-no-perf-irq-work-rt.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index b4f860c..426d114 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1425,7 +1425,7 @@ void update_process_times(int user_tick) scheduler_tick(); run_local_timers(); rcu_check_callbacks(cpu, user_tick); -#ifdef CONFIG_IRQ_WORK +#if defined(CONFIG_IRQ_WORK) && !defined(CONFIG_PREEMPT_RT_FULL) if (in_irq()) irq_work_run(); #endif @@ -1439,6 +1439,10 @@ static void run_timer_softirq(struct softirq_action *h) { struct tvec_base *base = __this_cpu_read(tvec_bases); +#if defined(CONFIG_IRQ_WORK) && defined(CONFIG_PREEMPT_RT_FULL) + irq_work_run(); +#endif + if (time_after_eq(jiffies, base->timer_jiffies)) __run_timers(base); } |