diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-25 11:12:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-25 11:12:23 -0800 |
| commit | 82c477669a4665eb4e52030792051e0559ee2a36 (patch) | |
| tree | 02542b4e7d33f157aac83f0dadc988c5d4511544 /tools/perf/util/parse-events.c | |
| parent | f6d13daaddeb6e63b15a93bf36a80173bafd29bf (diff) | |
| parent | 993e5ee67a90c7b6a5dbb61b9c31df2955afff46 (diff) | |
| download | op-kernel-dev-82c477669a4665eb4e52030792051e0559ee2a36.zip op-kernel-dev-82c477669a4665eb4e52030792051e0559ee2a36.tar.gz | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"A handful of tooling fixes"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf symbols: Load map before using map->map_ip()
perf tools: Fix traceevent plugin path definitions
perf symbols: Fix JIT symbol resolution on heap
perf stat: Fix memory corruption of xyarray when cpumask is used
perf evsel: Remove duplicate member zeroing after free
perf tools: Ensure sscanf does not overrun the "mem" field
perf stat: fix NULL pointer reference bug with event unit
perf tools: Add support for the xtensa architecture
perf session: Free cpu_map in perf_session__cpu_bitmap
perf timechart: Fix wrong SVG height
Diffstat (limited to 'tools/perf/util/parse-events.c')
| -rw-r--r-- | tools/perf/util/parse-events.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index a7f1b6a..d248fca 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -635,7 +635,7 @@ int parse_events_add_pmu(struct list_head *list, int *idx, struct perf_event_attr attr; struct perf_pmu *pmu; struct perf_evsel *evsel; - char *unit; + const char *unit; double scale; pmu = perf_pmu__find(name); |
