diff options
| author | Russell King | 2014-04-13 19:40:12 +0100 |
|---|---|---|
| committer | Russell King | 2014-06-02 09:20:16 +0100 |
| commit | 3cb099f0894c06359dd6495dec81359591d06207 (patch) | |
| tree | 7240ca83eccafdf36cbeb9fa65211e83845d9143 /arch/arm | |
| parent | c6e13600d3b2137ff583767d7f8688a41e34ac49 (diff) | |
ARM: remove CPU_CP15 conditional from alignment.c
alignment.c will not be built unless CPU_CP15 is set:
config CPU_CP15
bool
config CPU_CP15_MMU
bool
select CPU_CP15
config ALIGNMENT_TRAP
bool
depends on CPU_CP15_MMU
So there's no point having conditionals on CPU_CP15 within this code.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mm/alignment.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c index 4cfefa20ee98..054e995d2f5b 100644 --- a/arch/arm/mm/alignment.c +++ b/arch/arm/mm/alignment.c @@ -974,12 +974,10 @@ static int __init alignment_init(void) return -ENOMEM; #endif -#ifdef CONFIG_CPU_CP15 if (cpu_is_v6_unaligned()) { set_cr(__clear_cr(CR_A)); ai_usermode = safe_usermode(ai_usermode, false); } -#endif hook_fault_code(FAULT_CODE_ALIGNMENT, do_alignment, SIGBUS, BUS_ADRALN, "alignment exception"); |