| Subject: x86-no-perf-irq-work-rt.patch |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Wed, 13 Jul 2011 14:05:05 +0200 |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| --- |
| arch/x86/kernel/irq_work.c | 2 ++ |
| kernel/irq_work.c | 5 ++++- |
| kernel/timer.c | 6 +++++- |
| 3 files changed, 11 insertions(+), 2 deletions(-) |
| |
| --- a/arch/x86/kernel/irq_work.c |
| +++ b/arch/x86/kernel/irq_work.c |
| @@ -18,6 +18,7 @@ void smp_irq_work_interrupt(struct pt_re |
| irq_exit(); |
| } |
| |
| +#ifndef CONFIG_PREEMPT_RT_FULL |
| void arch_irq_work_raise(void) |
| { |
| #ifdef CONFIG_X86_LOCAL_APIC |
| @@ -28,3 +29,4 @@ void arch_irq_work_raise(void) |
| apic_wait_icr_idle(); |
| #endif |
| } |
| +#endif |
| --- a/kernel/irq_work.c |
| +++ b/kernel/irq_work.c |
| @@ -119,8 +119,9 @@ static void __irq_work_run(void) |
| if (llist_empty(this_list)) |
| return; |
| |
| +#ifndef CONFIG_PREEMPT_RT_FULL |
| BUG_ON(!irqs_disabled()); |
| - |
| +#endif |
| llnode = llist_del_all(this_list); |
| while (llnode != NULL) { |
| work = llist_entry(llnode, struct irq_work, llnode); |
| @@ -152,7 +153,9 @@ static void __irq_work_run(void) |
| */ |
| void irq_work_run(void) |
| { |
| +#ifndef CONFIG_PREEMPT_RT_FULL |
| BUG_ON(!in_irq()); |
| +#endif |
| __irq_work_run(); |
| } |
| EXPORT_SYMBOL_GPL(irq_work_run); |
| --- 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 sof |
| { |
| struct tvec_base *base = __this_cpu_read(tvec_bases); |
| |
| +#if defined(CONFIG_IRQ_WORK) && defined(CONFIG_PREEMPT_RT_FULL) |
| + irq_work_run(); |
| +#endif |
| + |
| hrtimer_run_pending(); |
| |
| if (time_after_eq(jiffies, base->timer_jiffies)) |