diff options
| author | Chen Gang <gang.chen@asianux.com> | 2013-06-24 11:27:49 +0200 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2013-07-19 16:49:43 +0200 |
| commit | c783c2815e13bbb0c0b99997cc240bd7e91b6bb8 (patch) | |
| tree | 03c8398781ec97193ef99983a91d14cc6de13815 /arch | |
| parent | arm64: Only enable local interrupts after the CPU is marked online (diff) | |
| download | linux-c783c2815e13bbb0c0b99997cc240bd7e91b6bb8.tar.xz linux-c783c2815e13bbb0c0b99997cc240bd7e91b6bb8.zip | |
arm64: add '#ifdef CONFIG_COMPAT' for aarch32_break_handler()
If 'COMPAT' not defined, aarch32_break_handler() cannot pass compiling,
and it can work independent with 'COMPAT', so remove dummy definition.
The related error:
arch/arm64/kernel/debug-monitors.c:249:5: error: redefinition of ‘aarch32_break_handler’
In file included from arch/arm64/kernel/debug-monitors.c:29:0:
/root/linux-next/arch/arm64/include/asm/debug-monitors.h:89:12: note: previous definition of ‘aarch32_break_handler’ was here
Signed-off-by: Chen Gang <gang.chen@asianux.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/include/asm/debug-monitors.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/asm/debug-monitors.h index ef8235c68c09..a2232d07be9d 100644 --- a/arch/arm64/include/asm/debug-monitors.h +++ b/arch/arm64/include/asm/debug-monitors.h @@ -83,14 +83,7 @@ static inline int reinstall_suspended_bps(struct pt_regs *regs) } #endif -#ifdef CONFIG_COMPAT int aarch32_break_handler(struct pt_regs *regs); -#else -static int aarch32_break_handler(struct pt_regs *regs) -{ - return -EFAULT; -} -#endif #endif /* __ASSEMBLY */ #endif /* __KERNEL__ */ |