193 lines
4.9 KiB
Diff
193 lines
4.9 KiB
Diff
From 0a78fc3e819a0fbd2eb4a5e9c9741c6ba9c43a4f Mon Sep 17 00:00:00 2001
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Mon, 18 Jul 2011 13:59:17 +0200
|
|
Subject: [165/256] softirq-disable-softirq-stacks-for-rt.patch
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
arch/powerpc/kernel/irq.c | 2 ++
|
|
arch/powerpc/kernel/misc_32.S | 2 ++
|
|
arch/powerpc/kernel/misc_64.S | 2 ++
|
|
arch/sh/kernel/irq.c | 2 ++
|
|
arch/sparc/kernel/irq_64.c | 2 ++
|
|
arch/x86/kernel/entry_64.S | 2 ++
|
|
arch/x86/kernel/irq_32.c | 2 ++
|
|
arch/x86/kernel/irq_64.c | 3 ++-
|
|
include/linux/interrupt.h | 3 +--
|
|
9 files changed, 17 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
|
|
index 641da9e..7841465 100644
|
|
--- a/arch/powerpc/kernel/irq.c
|
|
+++ b/arch/powerpc/kernel/irq.c
|
|
@@ -538,6 +538,7 @@ void irq_ctx_init(void)
|
|
}
|
|
}
|
|
|
|
+#ifndef CONFIG_PREEMPT_RT_FULL
|
|
static inline void do_softirq_onstack(void)
|
|
{
|
|
struct thread_info *curtp, *irqtp;
|
|
@@ -574,6 +575,7 @@ void do_softirq(void)
|
|
|
|
local_irq_restore(flags);
|
|
}
|
|
+#endif
|
|
|
|
irq_hw_number_t virq_to_hw(unsigned int virq)
|
|
{
|
|
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
|
|
index 7cd07b4..46c6073 100644
|
|
--- a/arch/powerpc/kernel/misc_32.S
|
|
+++ b/arch/powerpc/kernel/misc_32.S
|
|
@@ -36,6 +36,7 @@
|
|
|
|
.text
|
|
|
|
+#ifndef CONFIG_PREEMPT_RT_FULL
|
|
_GLOBAL(call_do_softirq)
|
|
mflr r0
|
|
stw r0,4(r1)
|
|
@@ -46,6 +47,7 @@ _GLOBAL(call_do_softirq)
|
|
lwz r0,4(r1)
|
|
mtlr r0
|
|
blr
|
|
+#endif
|
|
|
|
_GLOBAL(call_handle_irq)
|
|
mflr r0
|
|
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
|
|
index 616921e..2961d75 100644
|
|
--- a/arch/powerpc/kernel/misc_64.S
|
|
+++ b/arch/powerpc/kernel/misc_64.S
|
|
@@ -29,6 +29,7 @@
|
|
|
|
.text
|
|
|
|
+#ifndef CONFIG_PREEMPT_RT_FULL
|
|
_GLOBAL(call_do_softirq)
|
|
mflr r0
|
|
std r0,16(r1)
|
|
@@ -39,6 +40,7 @@ _GLOBAL(call_do_softirq)
|
|
ld r0,16(r1)
|
|
mtlr r0
|
|
blr
|
|
+#endif
|
|
|
|
_GLOBAL(call_handle_irq)
|
|
ld r8,0(r6)
|
|
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
|
|
index a3ee919..9127bc0 100644
|
|
--- a/arch/sh/kernel/irq.c
|
|
+++ b/arch/sh/kernel/irq.c
|
|
@@ -149,6 +149,7 @@ void irq_ctx_exit(int cpu)
|
|
hardirq_ctx[cpu] = NULL;
|
|
}
|
|
|
|
+#ifndef CONFIG_PREEMPT_RT_FULL
|
|
asmlinkage void do_softirq(void)
|
|
{
|
|
unsigned long flags;
|
|
@@ -191,6 +192,7 @@ asmlinkage void do_softirq(void)
|
|
|
|
local_irq_restore(flags);
|
|
}
|
|
+#endif
|
|
#else
|
|
static inline void handle_one_irq(unsigned int irq)
|
|
{
|
|
diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c
|
|
index dff2c3d..618d4c2 100644
|
|
--- a/arch/sparc/kernel/irq_64.c
|
|
+++ b/arch/sparc/kernel/irq_64.c
|
|
@@ -698,6 +698,7 @@ void __irq_entry handler_irq(int pil, struct pt_regs *regs)
|
|
set_irq_regs(old_regs);
|
|
}
|
|
|
|
+#ifndef CONFIG_PREEMPT_RT_FULL
|
|
void do_softirq(void)
|
|
{
|
|
unsigned long flags;
|
|
@@ -723,6 +724,7 @@ void do_softirq(void)
|
|
|
|
local_irq_restore(flags);
|
|
}
|
|
+#endif
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
void fixup_irqs(void)
|
|
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
|
|
index cdc79b5..1bfb07b 100644
|
|
--- a/arch/x86/kernel/entry_64.S
|
|
+++ b/arch/x86/kernel/entry_64.S
|
|
@@ -1240,6 +1240,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
|
|
@@ -1259,6 +1260,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 58b7f27..a7b4e1b 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 d04d3ec..831f247 100644
|
|
--- a/arch/x86/kernel/irq_64.c
|
|
+++ b/arch/x86/kernel/irq_64.c
|
|
@@ -88,7 +88,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)
|
|
@@ -108,3 +108,4 @@ asmlinkage void do_softirq(void)
|
|
}
|
|
local_irq_restore(flags);
|
|
}
|
|
+#endif
|
|
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
|
|
index e53bd8b..5dde591 100644
|
|
--- a/include/linux/interrupt.h
|
|
+++ b/include/linux/interrupt.h
|
|
@@ -454,10 +454,9 @@ struct softirq_action
|
|
void (*action)(struct softirq_action *);
|
|
};
|
|
|
|
+#ifndef CONFIG_PREEMPT_RT_FULL
|
|
asmlinkage void do_softirq(void);
|
|
asmlinkage void __do_softirq(void);
|
|
-
|
|
-#ifndef CONFIG_PREEMPT_RT_FULL
|
|
static inline void thread_do_softirq(void) { do_softirq(); }
|
|
#else
|
|
extern void thread_do_softirq(void);
|