Merge tag 'irq-urgent-2021-05-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit 077fc6440745 · 2021-05-15T10:13:42.000-07:00
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
diff --git 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();

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,6 @@ static inline void arch_ftrace_nmi_exit(void) { }`
`180`	`180`
`181`	`181`	`BUILD_TRAP_HANDLER(nmi)`
`182`	`182`	`{`
`183`		`- unsigned int cpu = smp_processor_id();`
`184`	`183`	`TRAP_HANDLER_DECL;`
`185`	`184`
`186`	`185`	`arch_ftrace_nmi_enter();`