diff options
author | 2017-11-04 08:53:04 +0100 | |
---|---|---|
committer | 2017-11-04 08:53:04 +0100 | |
commit | 649e441f49d4bfb717e9467950891dc452f4e063 (patch) | |
tree | 2bdfdca65519db2f350c236cbbd65f24d5746cad /tools/perf/scripts/python/stackcollapse.py | |
parent | watchdog/hardlockup/perf: Use atomics to track in-use cpu counter (diff) | |
parent | Kbuild: don't pass "-C" to preprocessor when processing linker scripts (diff) | |
download | linux-dev-649e441f49d4bfb717e9467950891dc452f4e063.tar.xz linux-dev-649e441f49d4bfb717e9467950891dc452f4e063.zip |
Merge branch 'linus' into core/urgent, to pick up dependent commits
We want to fix an objtool build warning that got introduced in the latest upstream kernel.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to '')
-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 @@ # stackcollapse.py - format perf samples with one line per distinct call stack +# SPDX-License-Identifier: GPL-2.0 # # This script's output has two space-separated fields. The first is a semicolon # separated stack including the program name (from the "comm" field) and the |