diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-13 12:05:05 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2013-04-04 22:09:31 (GMT) |
| commit | c257932f43b73f6a414e9dbb0f4be0dadfd3665a (patch) | |
| tree | 10f8dafd5737c4c01d5266e44c15ea16292cae93 /kernel | |
| parent | abf99e68a31845cbc4ba827728adb3aaeffcc065 (diff) | |
| download | linux-fsl-qoriq-c257932f43b73f6a414e9dbb0f4be0dadfd3665a.tar.xz | |
x86-no-perf-irq-work-rt.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq_work.c | 2 | ||||
| -rw-r--r-- | kernel/timer.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/kernel/irq_work.c b/kernel/irq_work.c index 1588e3b..170c2ea 100644 --- a/kernel/irq_work.c +++ b/kernel/irq_work.c @@ -107,8 +107,10 @@ void irq_work_run(void) if (llist_empty(this_list)) return; +#ifndef CONFIG_PREEMPT_RT_FULL BUG_ON(!in_irq()); BUG_ON(!irqs_disabled()); +#endif llnode = llist_del_all(this_list); while (llnode != NULL) { diff --git a/kernel/timer.c b/kernel/timer.c index 8af44de..374e7b1 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1419,7 +1419,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 @@ -1433,6 +1433,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 + printk_tick(); hrtimer_run_pending(); |