summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-05-15 10:13:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2021-05-15 10:13:42 -0700
commit077fc64407457d504882a7ba8c3348df4dea8042 (patch)
tree23d0df303338967cae8ccfbe6932c30a318c9e15
parent91b7a0f0637c14ce0d252111cf9bca3830e16593 (diff)
parent0d3ae948741ac6d80e39ab27b45297367ee477de (diff)
Merge tag 'irq-urgent-2021-05-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fix from Ingo Molnar: "Fix build warning on SH" * tag 'irq-urgent-2021-05-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sh: Remove unused variable
-rw-r--r--arch/sh/kernel/traps.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c
index f5beecdac693..e76b22157099 100644
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
@@ -180,7 +180,6 @@ static inline void arch_ftrace_nmi_exit(void) { }
BUILD_TRAP_HANDLER(nmi)
{
- unsigned int cpu = smp_processor_id();
TRAP_HANDLER_DECL;
arch_ftrace_nmi_enter();