diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-04 03:53:04 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-04 03:53:04 -0400 |
| commit | 649e441f49d4bfb717e9467950891dc452f4e063 (patch) | |
| tree | 2bdfdca65519db2f350c236cbbd65f24d5746cad /tools/perf/util/demangle-java.c | |
| parent | 42f930da7f00c0ab23df4c7aed36137f35988980 (diff) | |
| parent | 5cb0512c02ecd7e6214e912e4c150f4219ac78e0 (diff) | |
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 'tools/perf/util/demangle-java.c')
| -rw-r--r-- | tools/perf/util/demangle-java.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/util/demangle-java.c b/tools/perf/util/demangle-java.c index cb66d334f532..e4c486756053 100644 --- a/tools/perf/util/demangle-java.c +++ b/tools/perf/util/demangle-java.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <sys/types.h> | 2 | #include <sys/types.h> |
| 2 | #include <stdio.h> | 3 | #include <stdio.h> |
| 3 | #include <string.h> | 4 | #include <string.h> |