Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8229c54f authored by Russell King's avatar Russell King
Browse files

ARM: consolidate last remaining open-coded alignment trap enable 



We can use the alignment_trap assembly macro here too.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0aeb3408

arch/arm/kernel/entry-armv.S

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/kernel/entry-common.S

+1 −7
Original line number Diff line number Diff line
@@ -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

arch/arm/kernel/entry-header.S

+2 −2
Original line number Diff line number Diff line
@@ -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