diff --git a/[refs] b/[refs]
index 0ddb25a41249..5d738cc93d63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c0ee6a4bba0e21eb0fb4de5bdac03c11b74242d
+refs/heads/master: b74ab703b1326aafadb5604ff6200da62c61df49
diff --git a/trunk/arch/sh/kernel/hw_breakpoint.c b/trunk/arch/sh/kernel/hw_breakpoint.c
index 75b8c471120f..022d8ed66bd6 100644
--- a/trunk/arch/sh/kernel/hw_breakpoint.c
+++ b/trunk/arch/sh/kernel/hw_breakpoint.c
@@ -398,9 +398,18 @@ BUILD_TRAP_HANDLER(breakpoint)
 int __kprobes hw_breakpoint_exceptions_notify(struct notifier_block *unused,
 				    unsigned long val, void *data)
 {
+	struct die_args *args = data;
+
 	if (val != DIE_BREAKPOINT)
 		return NOTIFY_DONE;
 
+	/*
+	 * If the breakpoint hasn't been triggered by the UBC, it's
+	 * probably from a debugger, so don't do anything more here.
+	 */
+	if (args->trapnr != 0x1e0)
+		return NOTIFY_DONE;
+
 	return hw_breakpoint_handler(data);
 }