Subject: x86-no-perf-irq-work-rt.patch From: Thomas Gleixner Date: Wed, 13 Jul 2011 14:05:05 +0200 Signed-off-by: Thomas Gleixner --- arch/x86/kernel/irq_work.c | 2 ++ kernel/irq_work.c | 2 ++ kernel/timer.c | 6 +++++- 3 files changed, 9 insertions(+), 1 deletion(-) Index: linux-stable/arch/x86/kernel/irq_work.c =================================================================== --- linux-stable.orig/arch/x86/kernel/irq_work.c +++ linux-stable/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 Index: linux-stable/kernel/irq_work.c =================================================================== --- linux-stable.orig/kernel/irq_work.c +++ linux-stable/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) { Index: linux-stable/kernel/timer.c =================================================================== --- linux-stable.orig/kernel/timer.c +++ linux-stable/kernel/timer.c @@ -1432,7 +1432,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 @@ -1446,6 +1446,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 + printk_tick(); hrtimer_run_pending();