diff --git a/[refs] b/[refs]
index faf69521189c..c9cb1b94a6f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11e6635763bdc0e24b39a38876574660755acffc
+refs/heads/master: 80bbf6b641c8843b9d751a1f299aa7ee073ab9d4
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index 34a1b9d7633e..f8c7939c57cf 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/kernel/perf_event.c
@@ -4303,10 +4303,6 @@ void perf_bp_event(struct perf_event *bp, void *data)
 		perf_swevent_add(bp, 1, 1, &sample, regs);
 }
 #else
-static void bp_perf_event_destroy(struct perf_event *event)
-{
-}
-
 static const struct pmu *bp_perf_event_init(struct perf_event *bp)
 {
 	return NULL;