From 8229c54fa1747765dae1a77875b04e4d69f6ab62 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 13 Apr 2014 20:24:51 +0100 Subject: ARM: consolidate last remaining open-coded alignment trap enable We can use the alignment_trap assembly macro here too. Signed-off-by: Russell King --- arch/arm/kernel/entry-common.S | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'arch/arm/kernel/entry-common.S') diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index a2dcafdf1bc8..7139d4a7dea7 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -365,13 +365,7 @@ ENTRY(vector_swi) str r0, [sp, #S_OLD_R0] @ Save OLD_R0 #endif zero_fp - -#ifdef CONFIG_ALIGNMENT_TRAP - ldr ip, __cr_alignment - ldr ip, [ip] - mcr p15, 0, ip, c1, c0 @ update control register -#endif - + alignment_trap ip, __cr_alignment enable_irq ct_user_exit get_thread_info tsk -- cgit v1.2.3