From 4520f81bf85ac7924106a93c3b80152ceaa55aa2 Mon Sep 17 00:00:00 2001
From: Jason Wessel <jason.wessel@windriver.com>
Date: Thu, 20 May 2010 21:04:20 -0500
Subject: [PATCH] --- yaml --- r: 196335 b: refs/heads/master c:
 489022cc86ec8817a30226d00d35c67d74dd24a0 h: refs/heads/master i:   196333:
 7d0306c9ea8bbb8903bb83fec91957762159dd5e   196331:
 16bf627fd7cc95b3d5e7ef437c29beb2d046b592   196327:
 408ad7105dace00d8adb2e716335e2281d0ffa29   196319:
 d87a94773b6a12ff609fd2a641044dcab30ee1a7 v: v3

---
 [refs]                      |  2 +-
 trunk/arch/sh/kernel/kgdb.c | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 047e9e497499..b0ebd41f0ef3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c75fbb05b523571c0fdc48d4b968b73f0e20acbb
+refs/heads/master: 489022cc86ec8817a30226d00d35c67d74dd24a0
diff --git a/trunk/arch/sh/kernel/kgdb.c b/trunk/arch/sh/kernel/kgdb.c
index 70c69659b846..efb6d398dec3 100644
--- a/trunk/arch/sh/kernel/kgdb.c
+++ b/trunk/arch/sh/kernel/kgdb.c
@@ -237,6 +237,18 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
 	return -1;
 }
 
+unsigned long kgdb_arch_pc(int exception, struct pt_regs *regs)
+{
+	if (exception == 60)
+		return instruction_pointer(regs) - 2;
+	return instruction_pointer(regs);
+}
+
+void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip)
+{
+	regs->pc = ip;
+}
+
 /*
  * The primary entry points for the kgdb debug trap table entries.
  */
@@ -247,7 +259,7 @@ BUILD_TRAP_HANDLER(singlestep)
 
 	local_irq_save(flags);
 	regs->pc -= instruction_size(__raw_readw(regs->pc - 4));
-	kgdb_handle_exception(vec >> 2, SIGTRAP, 0, regs);
+	kgdb_handle_exception(0, SIGTRAP, 0, regs);
 	local_irq_restore(flags);
 }