From: Anders Grafström Date: Mon, 15 Mar 2010 15:04:14 +0000 (+0100) Subject: ARM: 5991/1: Fix regression in restore_user_regs macro X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8e4971f2fb2380ce66196136e113d04196b80fcd;p=linux-beck.git 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 b86040a59feb255a8193173caa4d5199464433d5. Signed-off-by: Anders Grafström Signed-off-by: Russell King --- diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S index 7e9ed1eea40a..d93f976fb389 100644 --- a/arch/arm/kernel/entry-header.S +++ b/arch/arm/kernel/entry-header.S @@ -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