69 lines
1.9 KiB
Diff
69 lines
1.9 KiB
Diff
From b7de7f8a316a6b8e3c90b282c8eb18780eb803b3 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Wed, 13 Jul 2011 14:05:05 +0200
|
|
Subject: [PATCH 230/290] x86-no-perf-irq-work-rt.patch
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
arch/x86/kernel/irq_work.c | 2 ++
|
|
kernel/irq_work.c | 2 ++
|
|
kernel/timer.c | 6 +++++-
|
|
3 files changed, 9 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/arch/x86/kernel/irq_work.c b/arch/x86/kernel/irq_work.c
|
|
index ca8f703..129b8bb 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 c3c46c7..727ba59 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 7f954e7..985772e 100644
|
|
--- a/kernel/timer.c
|
|
+++ b/kernel/timer.c
|
|
@@ -1364,7 +1364,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
|
|
@@ -1378,6 +1378,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();
|
|
|