Commit 8e4971f2 authored Mar 15, 2010 by Anders Grafström Committed by Russell King Mar 15, 2010

ARM: 5991/1: Fix regression in restore_user_regs macro



ARMv5T and earlier require that a ldm {}^ instruction is not followed
by an instruction that accesses banked registers. This patch restores
the nop that was lost in commit b86040a5.

Signed-off-by: Anders Grafström <grfstrm@users.sourceforge.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 5d8614cc

arch/arm/kernel/entry-header.S

+2 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,8 @@
		.else
		ldmdb sp, {r0 - lr}^ @ get calling r0 - lr
		.endif
		mov r0, r0 @ ARMv5T and earlier require a nop
		@ after ldm {}^
		add sp, sp, #S_FRAME_SIZE - S_PC
		movs pc, lr @ return & move spsr_svc into cpsr
		.endm