diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-13 14:05:05 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-11 11:07:50 -0500 |
| commit | 665f0cb8128778b1e37d54d8da0a1a1448be1932 (patch) | |
| tree | dc4aadf7b64b885433cd4c4b6352ffdcab180c94 | |
| parent | c0c5abce6df855cb31836be8d6432fcbd8204b28 (diff) | |
x86-no-perf-irq-work-rt.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/x86/kernel/irq_work.c | 2 | ||||
| -rw-r--r-- | kernel/irq_work.c | 2 | ||||
| -rw-r--r-- | kernel/timer.c | 6 |
3 files changed, 9 insertions, 1 deletions
diff --git a/arch/x86/kernel/irq_work.c b/arch/x86/kernel/irq_work.c index ca8f703a1e70..129b8bb73de2 100644 --- 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_regs *regs) 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 diff --git a/kernel/irq_work.c b/kernel/irq_work.c index 0c56d44b9fd5..6e1c594d642f 100644 --- a/kernel/irq_work.c +++ b/kernel/irq_work.c @@ -106,8 +106,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 f6f2958ad606..935f46dffbb5 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1412,7 +1412,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 @@ -1426,6 +1426,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(); |