diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-13 14:05:05 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-03-07 16:15:14 -0600 |
| commit | c90664c5d84107bcc8ec101896e0a2b2617017ab (patch) | |
| tree | 41dbb6d0d4d5bda3efc7747c1fec6cfade6e59ba /kernel | |
| parent | 0b34c6ace9927ed63acd57644162e067a448ec0b (diff) | |
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 c3c46c72046e..727ba59e38f9 100644 --- a/kernel/irq_work.c +++ b/kernel/irq_work.c @@ -105,8 +105,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 7ea787b23d76..a791a43799b0 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1362,7 +1362,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 @@ -1376,6 +1376,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(); |