diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-18 18:42:31 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-18 18:42:31 +0900 |
| commit | a1ff31d74663077524aae3c2e90a76590c5002e8 (patch) | |
| tree | e29bbe6db6d5ee310472bcf981e95eb1728b7eff /tools/perf/util/header.c | |
| parent | 2277ba7cfd43c557eab882757b64755eb0a8ea95 (diff) | |
| parent | 531c221df182af5a7fc2bf7ba7eee89354fe9a10 (diff) | |
| download | lwn-a1ff31d74663077524aae3c2e90a76590c5002e8.tar.gz lwn-a1ff31d74663077524aae3c2e90a76590c5002e8.zip | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Thomas Gleixner:
"Three fixes for the perf user space side:
- Fix the probing of precise_ip level, which got broken recently for
x86.
- Unbreak the ARCH=x86_64 build
- Report module before trying to unwind into the module code, which
avoids broken stack frames displayed"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf unwind: Report module before querying isactivation in dwfl unwind
perf tools: Fix build with ARCH=x86_64
perf evsel: Fix probing of precise_ip level for default cycles event
Diffstat (limited to 'tools/perf/util/header.c')
| -rw-r--r-- | tools/perf/util/header.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 5cac8d5e009a..b5baff3007bb 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -841,7 +841,7 @@ static int write_group_desc(int fd, struct perf_header *h __maybe_unused, /* * default get_cpuid(): nothing gets recorded - * actual implementation must be in arch/$(ARCH)/util/header.c + * actual implementation must be in arch/$(SRCARCH)/util/header.c */ int __weak get_cpuid(char *buffer __maybe_unused, size_t sz __maybe_unused) { |