Merge branch 'fixes-2.6.39' into for-2.6.40

1 files changed, 3 insertions, 1 deletions

diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
index 7a2a79d2cf2..9ac05aafd9b 100644
--- a/tools/perf/builtin-lock.c
+++ b/tools/perf/builtin-lock.c
@@ -845,7 +845,9 @@ static void dump_info(void)
                 die("Unknown type of information\n");
 }
 
-static int process_sample_event(union perf_event *event, struct perf_sample *sample,
+static int process_sample_event(union perf_event *event,
+                                struct perf_sample *sample,
+                                struct perf_evsel *evsel __used,
                                 struct perf_session *s)
 {
         struct thread *thread = perf_session__findnew(s, sample->tid);