diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2019-05-13 20:30:15 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-05-13 20:30:15 +0200 |
| commit | 82045dd85566d87128dcc66277cf1177d9930a4a (patch) | |
| tree | 22fea6311a4866293005a1a44f34310e4007a3c9 /tools/perf/scripts/python/export-to-sqlite.py | |
| parent | overflow.h: Add comment documenting __ab_c_size() (diff) | |
| parent | Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| download | linux-dev-82045dd85566d87128dcc66277cf1177d9930a4a.tar.xz linux-dev-82045dd85566d87128dcc66277cf1177d9930a4a.zip | |
Merge branch 'linus' into core/urgent, to merge in dependent changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/export-to-sqlite.py')
| -rw-r--r-- | tools/perf/scripts/python/export-to-sqlite.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/scripts/python/export-to-sqlite.py b/tools/perf/scripts/python/export-to-sqlite.py index 3b71902a5a21..bf271fbc3a88 100644 --- a/tools/perf/scripts/python/export-to-sqlite.py +++ b/tools/perf/scripts/python/export-to-sqlite.py @@ -331,7 +331,7 @@ if perf_db_export_calls: 'return_id,' 'CASE WHEN flags=0 THEN \'\' WHEN flags=1 THEN \'no call\' WHEN flags=2 THEN \'no return\' WHEN flags=3 THEN \'no call/return\' WHEN flags=6 THEN \'jump\' ELSE flags END AS flags,' 'parent_call_path_id,' - 'parent_id' + 'calls.parent_id' ' FROM calls INNER JOIN call_paths ON call_paths.id = call_path_id') do_query(query, 'CREATE VIEW samples_view AS ' |