From 64f63771d3d502b6fa61b037846607bcf8f5a899 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Wed, 25 Nov 2009 21:20:53 +0100
Subject: [PATCH] --- yaml --- r: 169803 b: refs/heads/master c:
 80bbf6b641c8843b9d751a1f299aa7ee073ab9d4 h: refs/heads/master i:   169801:
 9da1807665e08c03e888fb85487128951ce7d128   169799:
 f8027639a4d92f357d8cbf0a3686d967b69a3409 v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/perf_event.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

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;