diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-01 10:45:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-01 10:45:00 -0800 |
| commit | 834db333eda46246f6290f0e1a7525af04fc8cb4 (patch) | |
| tree | 4809b5da82a76a9924cde7a2db8986636f8be727 /tools | |
| parent | 8ea85c2817301adb986b3b86dc20414595b776be (diff) | |
| parent | 5352ae638e2d7d5c9b2e4d528676bbf2af6fd6f3 (diff) | |
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, hw_breakpoint, kgdb: Do not take mutex for kernel debugger
x86, hw_breakpoints, kgdb: Fix kgdb to use hw_breakpoint API
hw_breakpoints: Release the bp slot if arch_validate_hwbkpt_settings() fails.
perf: Ignore perf.data.old
perf report: Fix segmentation fault when running with '-g none'
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/.gitignore | 1 | ||||
| -rw-r--r-- | tools/perf/builtin-report.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/.gitignore b/tools/perf/.gitignore index fe08660ce0bd0..124760bb37b52 100644 --- a/tools/perf/.gitignore +++ b/tools/perf/.gitignore @@ -13,6 +13,7 @@ perf*.xml perf*.html common-cmds.h perf.data +perf.data.old tags TAGS cscope* diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index db10c0e8ecae7..860f1eeeea7db 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -269,7 +269,7 @@ parse_callchain_opt(const struct option *opt __used, const char *arg, else if (!strncmp(tok, "none", strlen(arg))) { callchain_param.mode = CHAIN_NONE; - symbol_conf.use_callchain = true; + symbol_conf.use_callchain = false; return 0; } |