2 files changed, 2 insertions, 3 deletions

diff --git a/arch/sh/include/asm/kprobes.h b/arch/sh/include/asm/kprobes.h
index 756a5cd96378..6078d8e551d4 100644
--- a/arch/sh/include/asm/kprobes.h
+++ b/arch/sh/include/asm/kprobes.h
@@ -7,7 +7,7 @@
 #include <linux/ptrace.h>
 
 typedef u16 kprobe_opcode_t;
-#define BREAKPOINT_INSTRUCTION  0xc3ff
+#define BREAKPOINT_INSTRUCTION  0xc33a
 
 #define MAX_INSN_SIZE 16
 #define MAX_STACK_SIZE 64
diff --git a/arch/sh/kernel/kprobes.c b/arch/sh/kernel/kprobes.c
index 81a3725e5155..fdd049e9ad86 100644
--- a/arch/sh/kernel/kprobes.c
+++ b/arch/sh/kernel/kprobes.c
@@ -525,8 +525,7 @@ int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
 
 void __kprobes jprobe_return(void)
 {
-        __asm("trapa #-1\n\t" "jprobe_return_end:\n\t" "nop\n\t");
-
+        asm volatile ("trapa #0x3a\n\t" "jprobe_return_end:\n\t" "nop\n\t");
 }
 
 int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)