diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-18 13:59:17 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2011-12-28 16:25:43 -0600 |
| commit | 2c924306dd65e298b158ed6de9f535a5a5ca8aab (patch) | |
| tree | c07ef60bb9d2c6b75f8cae959fd84626b896b47b /arch/x86 | |
| parent | 76efb46bbddb095f9941f903a122f27ac13adfd9 (diff) | |
softirq-disable-softirq-stacks-for-rt.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/entry_64.S | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/irq_32.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/irq_64.c | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index faf8d5e74b0b..fb0f57824bd8 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -1192,6 +1192,7 @@ ENTRY(kernel_execve) CFI_ENDPROC END(kernel_execve) +#ifndef CONFIG_PREEMPT_RT_FULL /* Call softirq on interrupt stack. Interrupts are off. */ ENTRY(call_softirq) CFI_STARTPROC @@ -1211,6 +1212,7 @@ ENTRY(call_softirq) ret CFI_ENDPROC END(call_softirq) +#endif #ifdef CONFIG_XEN zeroentry xen_hypervisor_callback xen_do_hypervisor_callback diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c index 72090705a656..84417a251c3f 100644 --- a/arch/x86/kernel/irq_32.c +++ b/arch/x86/kernel/irq_32.c @@ -149,6 +149,7 @@ void __cpuinit irq_ctx_init(int cpu) cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu)); } +#ifndef CONFIG_PREEMPT_RT_FULL asmlinkage void do_softirq(void) { unsigned long flags; @@ -179,6 +180,7 @@ asmlinkage void do_softirq(void) local_irq_restore(flags); } +#endif bool handle_irq(unsigned irq, struct pt_regs *regs) { diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c index 69bca468c47a..3fbc07df72e1 100644 --- a/arch/x86/kernel/irq_64.c +++ b/arch/x86/kernel/irq_64.c @@ -65,7 +65,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs) return true; } - +#ifndef CONFIG_PREEMPT_RT_FULL extern void call_softirq(void); asmlinkage void do_softirq(void) @@ -85,3 +85,4 @@ asmlinkage void do_softirq(void) } local_irq_restore(flags); } +#endif |