diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-14 07:21:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-14 07:21:44 +0100 |
| commit | 050ab10a645097e47c01cfab3ccf24167e9b266b (patch) | |
| tree | 686b17c63933f187305a87fba696415dccd032ae /tools/perf/arch/powerpc/annotate/instructions.c | |
| parent | 9eb719855f6c9b21eb5889d9ac2ca1c60527ad89 (diff) | |
| parent | b29c6ef7bb1257853c1e31616d84f55e561cf631 (diff) | |
Merge branch 'linus' into core/objtool, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/arch/powerpc/annotate/instructions.c')
| -rw-r--r-- | tools/perf/arch/powerpc/annotate/instructions.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/perf/arch/powerpc/annotate/instructions.c b/tools/perf/arch/powerpc/annotate/instructions.c index b7bc04980fe8..a3f423c27cae 100644 --- a/tools/perf/arch/powerpc/annotate/instructions.c +++ b/tools/perf/arch/powerpc/annotate/instructions.c @@ -1,4 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 +#include <linux/compiler.h> + static struct ins_ops *powerpc__associate_instruction_ops(struct arch *arch, const char *name) { int i; @@ -47,7 +49,7 @@ static struct ins_ops *powerpc__associate_instruction_ops(struct arch *arch, con return ops; } -static int powerpc__annotate_init(struct arch *arch) +static int powerpc__annotate_init(struct arch *arch, char *cpuid __maybe_unused) { if (!arch->initialized) { arch->initialized = true; |