diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-07 04:51:10 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-07 04:51:10 -0500 |
| commit | 141d3b1daacd11bdbd6fa74c2b163093e10d17ee (patch) | |
| tree | 04c98496f16ad2fe34c0cf4f31fedf4fe558c017 /tools/perf/scripts/python/stackcollapse.py | |
| parent | c201c91799d687c0a6d8c3272950f51aad5ffebe (diff) | |
| parent | e4880bc5dfb1f02b152e62a894b5c6f3e995b3cf (diff) | |
Merge branch 'linus' into x86/apic, to resolve conflicts
Conflicts:
arch/x86/include/asm/x2apic.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/stackcollapse.py')
| -rwxr-xr-x | tools/perf/scripts/python/stackcollapse.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/scripts/python/stackcollapse.py b/tools/perf/scripts/python/stackcollapse.py index 5a605f70ef32..1697b5e18c96 100755 --- a/tools/perf/scripts/python/stackcollapse.py +++ b/tools/perf/scripts/python/stackcollapse.py | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | # stackcollapse.py - format perf samples with one line per distinct call stack | 1 | # stackcollapse.py - format perf samples with one line per distinct call stack |
| 2 | # SPDX-License-Identifier: GPL-2.0 | ||
| 2 | # | 3 | # |
| 3 | # This script's output has two space-separated fields. The first is a semicolon | 4 | # This script's output has two space-separated fields. The first is a semicolon |
| 4 | # separated stack including the program name (from the "comm" field) and the | 5 | # separated stack including the program name (from the "comm" field) and the |