diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-03-13 16:34:48 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-03-13 16:35:16 +0100 |
| commit | df8d291f28aa1e8437c8f7816328a6516379c71b (patch) | |
| tree | 26ae585aa259584ddd0d9088933547c065c37086 /tools/perf/util/evlist.c | |
| parent | 5234ffb9f74cfa8993d174782bc861dd9b7b5bfb (diff) | |
| parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 (diff) | |
| download | linux-df8d291f28aa1e8437c8f7816328a6516379c71b.tar.gz | |
Merge branch 'linus' into irq/core
Reason: Get upstream fixes integrated before further modifications.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'tools/perf/util/evlist.c')
| -rw-r--r-- | tools/perf/util/evlist.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 3f16e08a5c8d..ea32a061f1c8 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -349,6 +349,10 @@ struct perf_evsel *perf_evlist__id2evsel(struct perf_evlist *evlist, u64 id) hlist_for_each_entry(sid, pos, head, node) if (sid->id == id) return sid->evsel; + + if (!perf_evlist__sample_id_all(evlist)) + return list_entry(evlist->entries.next, struct perf_evsel, node); + return NULL; } |