From 4c37711bb77510052c1392e0f1d597b9a2758a51 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Mon, 8 Sep 2008 18:10:10 +0900 Subject: [PATCH] --- yaml --- r: 116105 b: refs/heads/master c: 174b5c9923e0170c844e03d55a9f3fb3b329a8b7 h: refs/heads/master i: 116103: 661e04df261ffe942181e05f34ff88646add0b54 v: v3 --- [refs] | 2 +- trunk/arch/sh/include/asm/kprobes.h | 2 +- trunk/arch/sh/kernel/kprobes.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6b1f0d556d9c..407daacb0edb 100644 --- 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 index 756a5cd96378..6078d8e551d4 100644 --- a/trunk/arch/sh/include/asm/kprobes.h +++ b/trunk/arch/sh/include/asm/kprobes.h @@ -7,7 +7,7 @@ #include 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 index 81a3725e5155..fdd049e9ad86 100644 --- 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)