---

yaml
---
r: 196335
b: refs/heads/master
c: 489022c
h: refs/heads/master
i:
  196333: 7d0306c
  196331: 16bf627
  196327: 408ad71
  196319: d87a947
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c75fbb05b523571c0fdc48d4b968b73f0e20acbb
+refs/heads/master: 489022cc86ec8817a30226d00d35c67d74dd24a0

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);
 }