diff options
author | Mark Salter <msalter@redhat.com> | 2014-04-05 10:25:49 -0400 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2014-04-06 18:25:04 -0400 |
commit | ff268ff7f32bf5388b7422f0c0773d88add23423 (patch) | |
tree | 8529cf6667316fde9cec43de153fd27f244f25b4 /arch/arm64/kernel/perf_regs.c | |
parent | 0a997ecc08e0b551119c56d52a591d9e5b38a7cd (diff) |
arm64: fix !CONFIG_COMPAT build failures
Recent arm64 builds using CONFIG_ARM64_64K_PAGES are failing with:
arch/arm64/kernel/perf_regs.c: In function ‘perf_reg_abi’:
arch/arm64/kernel/perf_regs.c:41:2: error: implicit declaration of function ‘is_compat_thread’
arch/arm64/kernel/perf_event.c:1398:2: error: unknown type name ‘compat_uptr_t’
This is due to some recent arm64 perf commits with compat support:
commit 23c7d70d55c6d9:
ARM64: perf: add support for frame pointer unwinding in compat mode
commit 2ee0d7fd36a3f8:
ARM64: perf: add support for perf registers API
Those patches make the arm64 kernel unbuildable if CONFIG_COMPAT is not
defined and CONFIG_ARM64_64K_PAGES depends on !CONFIG_COMPAT. This patch
allows the arm64 kernel to build with and without CONFIG_COMPAT.
Signed-off-by: Mark Salter <msalter@redhat.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/kernel/perf_regs.c')
-rw-r--r-- | arch/arm64/kernel/perf_regs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/kernel/perf_regs.c b/arch/arm64/kernel/perf_regs.c index f2d6f0a36d63..422ebd63b619 100644 --- a/arch/arm64/kernel/perf_regs.c +++ b/arch/arm64/kernel/perf_regs.c | |||
@@ -2,6 +2,8 @@ | |||
2 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
3 | #include <linux/perf_event.h> | 3 | #include <linux/perf_event.h> |
4 | #include <linux/bug.h> | 4 | #include <linux/bug.h> |
5 | |||
6 | #include <asm/compat.h> | ||
5 | #include <asm/perf_regs.h> | 7 | #include <asm/perf_regs.h> |
6 | #include <asm/ptrace.h> | 8 | #include <asm/ptrace.h> |
7 | 9 | ||