Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa5a24b1 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Ingo Molnar
Browse files

sh/kprobes: Don't call the ->break_handler() in SH kprobes code 



Don't call the ->break_handler() from the SH kprobes code,
because it was only used by jprobes which got removed.

Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rich Felker <dalias@libc.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: linux-arch@vger.kernel.org
Cc: linux-sh@vger.kernel.org
Link: https://lore.kernel.org/lkml/152942488763.15209.7791710414058030809.stgit@devbox


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent cba5ec98

arch/sh/kernel/kprobes.c

+1 −13
Original line number Diff line number Diff line
@@ -248,11 +248,6 @@ static int __kprobes kprobe_handler(struct pt_regs *regs) 
			prepare_singlestep(p, regs);

			kcb->kprobe_status = KPROBE_REENTER;

			return 1;

		} else {

			p = __this_cpu_read(current_kprobe);

			if (p->break_handler && p->break_handler(p, regs)) {

				goto ss_probe;

			}

		}

		goto no_kprobe;

	}
@@ -281,7 +276,6 @@ static int __kprobes kprobe_handler(struct pt_regs *regs) 
		/* handler has already set things up, so skip ss setup */

		return 1;



ss_probe:

	prepare_singlestep(p, regs);

	kcb->kprobe_status = KPROBE_HIT_SS;

	return 1;
@@ -508,17 +502,11 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self, 
				if (post_kprobe_handler(args->regs))

					ret = NOTIFY_STOP;

			} else {

				if (kprobe_handler(args->regs)) {

					ret = NOTIFY_STOP;

				} else {

					p = __this_cpu_read(current_kprobe);

					if (p->break_handler &&

					    p->break_handler(p, args->regs))

				if (kprobe_handler(args->regs))

					ret = NOTIFY_STOP;

			}

		}

	}

	}



	return ret;

}