diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-13 21:24:51 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-06-02 10:20:20 +0200 |
| commit | 8229c54fa1747765dae1a77875b04e4d69f6ab62 (patch) | |
| tree | 359deac974ef4297566ca8dfd59e72c501c3d38d /arch/arm/kernel/entry-common.S | |
| parent | ARM: remove global cr_no_alignment (diff) | |
| download | linux-8229c54fa1747765dae1a77875b04e4d69f6ab62.tar.xz linux-8229c54fa1747765dae1a77875b04e4d69f6ab62.zip | |
ARM: consolidate last remaining open-coded alignment trap enable
We can use the alignment_trap assembly macro here too.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/entry-common.S')
| -rw-r--r-- | arch/arm/kernel/entry-common.S | 8 |
1 files changed, 1 insertions, 7 deletions
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 |