Commit 8a368260 authored by Mike Rapoport's avatar Mike Rapoport Committed by John Paul Adrian Glaubitz
Browse files

sh: kprobes: Remove unused variables in kprobe_exceptions_notify() 



kbuild reports the following warning:

   arch/sh/kernel/kprobes.c: In function 'kprobe_exceptions_notify':
>> arch/sh/kernel/kprobes.c:412:24: warning: variable 'p' set but not used [-Wunused-but-set-variable]
     412 |         struct kprobe *p = NULL;
         |                        ^

The variable 'p' is indeed unused since the commit fa5a24b1
("sh/kprobes: Don't call the ->break_handler() in SH kprobes code")

Remove that variable along with 'kprobe_opcode_t *addr' which also
becomes unused after 'p' is removed.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202505151341.EuRFR22l-lkp@intel.com/


Fixes: fa5a24b1 ("sh/kprobes: Don't call the ->break_handler() in SH kprobes code")
Signed-off-by: default avatarMike Rapoport (Microsoft) <rppt@kernel.org>
Reviewed-by: default avatarJohn Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarJohn Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
parent ab0a168f

arch/sh/kernel/kprobes.c

+0 −4
Original line number Diff line number Diff line
@@ -404,13 +404,10 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr) 
int __kprobes kprobe_exceptions_notify(struct notifier_block *self,

				       unsigned long val, void *data)

{

	struct kprobe *p = NULL;

	struct die_args *args = (struct die_args *)data;

	int ret = NOTIFY_DONE;

	kprobe_opcode_t *addr = NULL;

	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();



	addr = (kprobe_opcode_t *) (args->regs->pc);

	if (val == DIE_TRAP &&

	    args->trapnr == (BREAKPOINT_INSTRUCTION & 0xff)) {

		if (!kprobe_running()) {
@@ -421,7 +418,6 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self, 
				ret = NOTIFY_DONE;

			}

		} else {

			p = get_kprobe(addr);

			if ((kcb->kprobe_status == KPROBE_HIT_SS) ||

			    (kcb->kprobe_status == KPROBE_REENTER)) {

				if (post_kprobe_handler(args->regs))