Commit 077fc644 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 91b7a0f0 0d3ae948

arch/sh/kernel/traps.c

+0 −1
Original line number Diff line number Diff line
@@ -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();