diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-03-21 10:47:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-21 10:47:40 +0100 |
| commit | 42e405f7b1d252c90a2468dd2140f47b8142b7a0 (patch) | |
| tree | baeda52d8726fe694d3344a0d0fda1dadc30a901 /tools/perf/builtin-diff.c | |
| parent | e9532e69b8d1d1284e8ecf8d2586de34aec61244 (diff) | |
| parent | 710d60cbf1b312a8075a2158cbfbbd9c66132dcc (diff) | |
| download | lwn-42e405f7b1d252c90a2468dd2140f47b8142b7a0.tar.gz lwn-42e405f7b1d252c90a2468dd2140f47b8142b7a0.zip | |
Merge branch 'linus' into sched/urgent, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-diff.c')
| -rw-r--r-- | tools/perf/builtin-diff.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c index 36ccc2b8827f..4d72359fd15a 100644 --- a/tools/perf/builtin-diff.c +++ b/tools/perf/builtin-diff.c @@ -1264,8 +1264,6 @@ int cmd_diff(int argc, const char **argv, const char *prefix __maybe_unused) if (ret < 0) return ret; - perf_config(perf_default_config, NULL); - argc = parse_options(argc, argv, options, diff_usage, 0); if (symbol__init(NULL) < 0) |