Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 09:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: consolidate last remaining open-coded alignment trap enable

Browse Source 
We can use the alignment_trap assembly macro here too.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2014-04-13 20:24:51 +01:00
parent 0aeb3408ca
commit 8229c54fa1
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/kernel/entry-armv.S
View File

@ -344,7 +344,7 @@ ENDPROC(__pabt_svc)
@
@ Enable the alignment trap while in kernel mode
@
alignment_trap r0
alignment_trap r0, .LCcralign
@
@ Clear FP to mark the first stack frame

8
arch/arm/kernel/entry-common.S
View File

@ -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

4
arch/arm/kernel/entry-header.S
View File

@ -37,9 +37,9 @@
#endif
.endm
.macro alignment_trap, rtemp
.macro alignment_trap, rtemp, label
#ifdef CONFIG_ALIGNMENT_TRAP
ldr \rtemp, .LCcralign
ldr \rtemp, \label
ldr \rtemp, [\rtemp]
mcr p15, 0, \rtemp, c1, c0
#endif