From bd6160ca505e21b5b7a89c5b62faff9890d3e5bc Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 19 Jan 2010 15:58:27 +0900
Subject: [PATCH] --- yaml --- r: 181120 b: refs/heads/master c:
 a4ae2b2b18d1766768987dc5de42dfa3c2a6d9f7 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/sh/kernel/cpu/sh5/entry.S | 2 +-
 trunk/arch/sh/kernel/ptrace_64.c     | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 52ed8493a15f..113a80d898c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6db8888c8957fbdcd611e1321a6f6a0d6fb7e15
+refs/heads/master: a4ae2b2b18d1766768987dc5de42dfa3c2a6d9f7
diff --git a/trunk/arch/sh/kernel/cpu/sh5/entry.S b/trunk/arch/sh/kernel/cpu/sh5/entry.S
index 36d031c700bb..6b80295dd7a4 100644
--- a/trunk/arch/sh/kernel/cpu/sh5/entry.S
+++ b/trunk/arch/sh/kernel/cpu/sh5/entry.S
@@ -187,7 +187,7 @@ trap_jtable:
 	.rept 6
 		.long do_exception_error	/* 0x880 - 0x920 */
 	.endr
-	.long	do_software_break_point	/* 0x940 */
+	.long	breakpoint_trap_handler	/* 0x940 */
 	.long	do_exception_error		/* 0x960 */
 	.long	do_single_step		/* 0x980 */
 
diff --git a/trunk/arch/sh/kernel/ptrace_64.c b/trunk/arch/sh/kernel/ptrace_64.c
index 23fbd92a74e7..2f6140e95ec5 100644
--- a/trunk/arch/sh/kernel/ptrace_64.c
+++ b/trunk/arch/sh/kernel/ptrace_64.c
@@ -478,9 +478,10 @@ asmlinkage void do_single_step(unsigned long long vec, struct pt_regs *regs)
 }
 
 /* Called with interrupts disabled */
-asmlinkage void do_software_break_point(unsigned long long vec,
-					struct pt_regs *regs)
+BUILD_TRAP_HANDLER(breakpoint)
 {
+	TRAP_HANDLER_DECL;
+
 	/* We need to forward step the PC, to counteract the backstep done
 	   in signal.c. */
 	local_irq_enable();