From 53cb45d3ac2fa29e00355b55de3c65f68ec98c4e Mon Sep 17 00:00:00 2001
From: Tiejun Chen <tiejun.chen@windriver.com>
Date: Wed, 22 Aug 2012 16:10:19 +0000
Subject: [PATCH] --- yaml --- r: 322275 b: refs/heads/master c:
 949616cf2d3095d1bb6b3d155c1cc963abd98b5c h: refs/heads/master i:   322273:
 d542170b7168d6e37c6e7f3fb0635babaf8a30eb   322271:
 41b73a17b33970f9f36033d88c8c1cf4773e9536 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/powerpc/kernel/kgdb.c | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 81e1d9c9d442..0079fd5e721c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 572b411cb4f1b208bb8ea278752f956b3554371e
+refs/heads/master: 949616cf2d3095d1bb6b3d155c1cc963abd98b5c
diff --git a/trunk/arch/powerpc/kernel/kgdb.c b/trunk/arch/powerpc/kernel/kgdb.c
index bbabc5abb1c4..05adb69febf4 100644
--- a/trunk/arch/powerpc/kernel/kgdb.c
+++ b/trunk/arch/powerpc/kernel/kgdb.c
@@ -101,6 +101,21 @@ static int computeSignal(unsigned int tt)
 	return SIGHUP;		/* default for things we don't know about */
 }
 
+/**
+ *
+ *	kgdb_skipexception - Bail out of KGDB when we've been triggered.
+ *	@exception: Exception vector number
+ *	@regs: Current &struct pt_regs.
+ *
+ *	On some architectures we need to skip a breakpoint exception when
+ *	it occurs after a breakpoint has been removed.
+ *
+ */
+int kgdb_skipexception(int exception, struct pt_regs *regs)
+{
+	return kgdb_isremovedbreak(regs->nip);
+}
+
 static int kgdb_call_nmi_hook(struct pt_regs *regs)
 {
 	kgdb_nmicallback(raw_smp_processor_id(), regs);