From 3cb099f0894c06359dd6495dec81359591d06207 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 13 Apr 2014 19:40:12 +0100 Subject: [PATCH] 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 --- arch/arm/mm/alignment.c | 2 -- 1 file changed, 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"); -- 2.34.1