---

yaml --- r: 116105 b: refs/heads/master c: 174b5c9 h: refs/heads/master i: 116103: 661e04d v: v3
git-mirror · Sep 8, 2008 · 4c37711 · 4c37711
1 parent b82bbb6
commit 4c37711
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 037c10a612e8b7461e33672fb3848807ac6e2346
+refs/heads/master: 174b5c9923e0170c844e03d55a9f3fb3b329a8b7
diff --git a/trunk/arch/sh/include/asm/kprobes.h b/trunk/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/trunk/arch/sh/kernel/kprobes.c b/trunk/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)