The following commit has been merged into the irq/urgent branch of tip:

Commit-ID: 0d3ae948741ac6d80e39ab27b45297367ee477de Gitweb: https://git.kernel.org/tip/0d3ae948741ac6d80e39ab27b45297367ee477de Author: Eric Dumazet edumazet@google.com AuthorDate: Wed, 14 Apr 2021 10:05:17 -07:00 Committer: Thomas Gleixner tglx@linutronix.de CommitterDate: Mon, 10 May 2021 23:23:04 +02:00

sh: Remove unused variable

Removes this annoying warning:

arch/sh/kernel/traps.c: In function ‘nmi_trap_handler’: arch/sh/kernel/traps.c:183:15: warning: unused variable ‘cpu’ [-Wunused-variable] 183 | unsigned int cpu = smp_processor_id();

Fixes: fe3f1d5d7cd3 ("sh: Get rid of nmi_count()") Signed-off-by: Eric Dumazet edumazet@google.com Signed-off-by: Thomas Gleixner tglx@linutronix.de Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20210414170517.1205430-1-eric.dumazet@gmail.com --- arch/sh/kernel/traps.c | 1 - 1 file changed, 1 deletion(-)

diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c index f5beecd..e76b221 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();