summaryrefslogtreecommitdiff
path: root/arch/arm64/include/asm/irq.h
diff options
context:
space:
mode:
authorJames Morse <james.morse@arm.com>2015-12-18 16:01:47 +0000
committerWill Deacon <will.deacon@arm.com>2015-12-21 17:26:01 +0000
commitd224a69e3d80fe08f285d1f41d21b590bae4fa9f (patch)
tree714dfa475b1e358c18285af1d809e08fc7e6f790 /arch/arm64/include/asm/irq.h
parent66b3923a1a0f77a563b43f43f6ad091354abbfe9 (diff)
arm64: remove irq_count and do_softirq_own_stack()
sysrq_handle_reboot() re-enables interrupts while on the irq stack. The irq_stack implementation wrongly assumed this would only ever happen via the softirq path, allowing it to update irq_count late, in do_softirq_own_stack(). This means if an irq occurs in sysrq_handle_reboot(), during emergency_restart() the stack will be corrupted, as irq_count wasn't updated. Lose the optimisation, and instead of moving the adding/subtracting of irq_count into irq_stack_entry/irq_stack_exit, remove it, and compare sp_el0 (struct thread_info) with sp & ~(THREAD_SIZE - 1). This tells us if we are on a task stack, if so, we can safely switch to the irq stack. Finally, remove do_softirq_own_stack(), we don't need it anymore. Reported-by: Will Deacon <will.deacon@arm.com> Signed-off-by: James Morse <james.morse@arm.com> [will: use get_thread_info macro] Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/include/asm/irq.h')
-rw-r--r--arch/arm64/include/asm/irq.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/irq.h b/arch/arm64/include/asm/irq.h
index 3bece4379bd9..b77197d941fc 100644
--- a/arch/arm64/include/asm/irq.h
+++ b/arch/arm64/include/asm/irq.h
@@ -11,8 +11,6 @@
#include <asm-generic/irq.h>
#include <asm/thread_info.h>
-#define __ARCH_HAS_DO_SOFTIRQ
-
struct pt_regs;
DECLARE_PER_CPU(unsigned long [IRQ_STACK_SIZE/sizeof(long)], irq_stack);