ARM: 5991/1: Fix regression in restore_user_regs macro
authorAnders Grafström <grfstrm@users.sourceforge.net>
Mon, 15 Mar 2010 15:04:14 +0000 (16:04 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 15 Mar 2010 17:20:08 +0000 (17:20 +0000)
commit8e4971f2fb2380ce66196136e113d04196b80fcd
tree18504783969d9e5005deadaa8709a475cc30e04f
parent5d8614cc5d6c5c02b7995ed97303481d4e3a8cc7
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 <grfstrm@users.sourceforge.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/kernel/entry-header.S