Skip to content

Commit

Permalink
Merge tag 'irq-urgent-2021-05-15' of git://git.kernel.org/pub/scm/lin…
Browse files Browse the repository at this point in the history
…ux/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
  • Loading branch information
Linus Torvalds committed May 15, 2021
2 parents 91b7a0f + 0d3ae94 commit 077fc64
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion arch/sh/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 077fc64

Please sign in to comment.