diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-11-04 10:49:35 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-11-04 10:49:35 +0400 |
| commit | 2a3ede8cb2ddee5885518e4232aca13056f9a6e0 (patch) | |
| tree | 79b2b4e060a97b1e7c60d58549f8c97cb15db5dd /tools/perf/tests/attr/test-record-graph-dwarf | |
| parent | 0e73453e172aaa38fd59fd4d3fc589e8fc9b9a70 (diff) | |
| parent | 215432ed30393ed4a8f77db0a1fe34523c48cdba (diff) | |
| download | linux-2a3ede8cb2ddee5885518e4232aca13056f9a6e0.tar.xz | |
Merge branch 'perf/urgent' into perf/core to fix conflicts
Conflicts:
tools/perf/bench/numa.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/tests/attr/test-record-graph-dwarf')
| -rw-r--r-- | tools/perf/tests/attr/test-record-graph-dwarf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/tests/attr/test-record-graph-dwarf b/tools/perf/tests/attr/test-record-graph-dwarf index e93e082f5208..d6f324ea578c 100644 --- a/tools/perf/tests/attr/test-record-graph-dwarf +++ b/tools/perf/tests/attr/test-record-graph-dwarf @@ -1,6 +1,6 @@ [config] command = record -args = -g dwarf -- kill >/dev/null 2>&1 +args = --call-graph dwarf -- kill >/dev/null 2>&1 [event:base-record] sample_type=12583 |