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

Commit f829fd23 authored by Ananth N Mavinakayanahalli's avatar Ananth N Mavinakayanahalli Committed by Linus Torvalds
Browse files

[PATCH] ppc64 kprobes: remove spurious MSR_SE masking 



Remove spurious MSR_SE reset during kprobe processing.
single_step_exception() already does it for us.  Reset it to be safe when
executing the fault_handler.

Signed-off-by: default avatarAnanth N Mavinakayanahalli <ananth@in.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 63224d1e

arch/ppc64/kernel/kprobes.c

+1 −2
Original line number Diff line number Diff line
@@ -177,8 +177,6 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs) 
	ret = emulate_step(regs, p->ainsn.insn[0]);

	if (ret == 0)

		regs->nip = (unsigned long)p->addr + 4;



	regs->msr &= ~MSR_SE;

}



static inline int post_kprobe_handler(struct pt_regs *regs)
@@ -215,6 +213,7 @@ static inline int kprobe_fault_handler(struct pt_regs *regs, int trapnr) 


	if (kprobe_status & KPROBE_HIT_SS) {

		resume_execution(current_kprobe, regs);

		regs->msr &= ~MSR_SE;

		regs->msr |= kprobe_saved_msr;



		unlock_kprobes();