diff --git a/[refs] b/[refs]
index ba022558a5d0..2dba6403cfad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b4f887fb2780e39383c1f202b72f5a2780b2d4c
+refs/heads/master: a28b460ec7968f430a2d6ea2809b249ee9fe1d28
diff --git a/trunk/arch/sh/kernel/hw_breakpoint.c b/trunk/arch/sh/kernel/hw_breakpoint.c
index ff3cb3d7df8f..75b8c471120f 100644
--- a/trunk/arch/sh/kernel/hw_breakpoint.c
+++ b/trunk/arch/sh/kernel/hw_breakpoint.c
@@ -302,8 +302,7 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp,
 		return ret;
 	}
 
-	if (bp->callback)
-		ret = arch_store_info(bp);
+	ret = arch_store_info(bp);
 
 	if (ret < 0)
 		return ret;
@@ -368,7 +367,7 @@ static int __kprobes hw_breakpoint_handler(struct die_args *args)
 			break;
 		}
 
-		(bp->callback)(bp, args->regs);
+		perf_bp_event(bp, args->regs);
 
 		rcu_read_unlock();
 	}