OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86-no-perf-irq-work-rt.patch 

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner 2011-07-13 14:05:05 +02:00 committed by Alibek Omarov
parent 26af336d12
commit 10a8fb755e
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/irq_work.c
View File

@ -38,6 +38,7 @@ __visible void smp_trace_irq_work_interrupt(struct pt_regs *regs)
exiting_irq();
}
#ifndef CONFIG_PREEMPT_RT_FULL
void arch_irq_work_raise(void)
{
#ifdef CONFIG_X86_LOCAL_APIC
@ -48,3 +49,4 @@ void arch_irq_work_raise(void)
apic_wait_icr_idle();
#endif
}
#endif

5
kernel/irq_work.c
View File

@ -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);

6
kernel/timer.c
View File

@ -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 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
if (time_after_eq(jiffies, base->timer_jiffies))
__run_timers(base);
}