Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf, x86: Complain louder about BIOSen corrupting CPU/PMU state and continue
  perf, x86: P4 PMU - Read proper MSR register to catch unflagged overflows
  perf symbols: Look at .dynsym again if .symtab not found
  perf build-id: Add quirk to deal with perf.data file format breakage
  perf session: Pass evsel in event_ops->sample()
  perf: Better fit max unprivileged mlock pages for tools needs
  perf_events: Fix stale ->cgrp pointer in update_cgrp_time_from_cpuctx()
  perf top: Fix uninitialized 'counter' variable
  tracing: Fix set_ftrace_filter probe function display
  perf, x86: Fix Intel fixed counters base initialization

1 files changed, 4 insertions, 14 deletions

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 695de4b5ae63..e18eb7ed30ae 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -42,9 +42,9 @@ static const char *sym_hist_filter;
 
 static int perf_evlist__add_sample(struct perf_evlist *evlist,
                                    struct perf_sample *sample,
+                                   struct perf_evsel *evsel,
                                    struct addr_location *al)
 {
-        struct perf_evsel *evsel;
         struct hist_entry *he;
         int ret;
 
@@ -59,18 +59,6 @@ static int perf_evlist__add_sample(struct perf_evlist *evlist,
                 return 0;
         }
 
-        evsel = perf_evlist__id2evsel(evlist, sample->id);
-        if (evsel == NULL) {
-                /*
-                 * FIXME: Propagate this back, but at least we're in a builtin,
-                 * where exit() is allowed. ;-)
-                 */
-                ui__warning("Invalid %s file, contains samples with id not in "
-                            "its header!\n", input_name);
-                exit_browser(0);
-                exit(1);
-        }
-
         he = __hists__add_entry(&evsel->hists, al, NULL, 1);
         if (he == NULL)
                 return -ENOMEM;
@@ -92,6 +80,7 @@ static int perf_evlist__add_sample(struct perf_evlist *evlist,
 
 static int process_sample_event(union perf_event *event,
                                 struct perf_sample *sample,
+                                struct perf_evsel *evsel,
                                 struct perf_session *session)
 {
         struct addr_location al;
@@ -103,7 +92,8 @@ static int process_sample_event(union perf_event *event,
                 return -1;
         }
 
-        if (!al.filtered && perf_evlist__add_sample(session->evlist, sample, &al)) {
+        if (!al.filtered &&
+            perf_evlist__add_sample(session->evlist, sample, evsel, &al)) {
                 pr_warning("problem incrementing symbol count, "
                            "skipping event\n");
                 return -1;