From: Nicolas Pitre Date: Fri, 25 Sep 2009 20:28:02 +0000 (-0400) Subject: make Linux bootable on ARM again X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9e6ec39becb02bda776eebf12c0677910d54b848;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git make Linux bootable on ARM again Commit 200b812d00 "Clear the exclusive monitor when returning from an exception" broke the vast majority of ARM systems in the wild which are still pre ARMv6. The kernel is crashing on the first occurrence of an exception due to the removal of the actual return instruction for them. Let's add it back. Signed-off-by: Nicolas Pitre Acked-by: Uwe Kleine-König Signed-off-by: Linus Torvalds --- diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S index e17e3c30d957..ac34c0d9384b 100644 --- a/arch/arm/kernel/entry-header.S +++ b/arch/arm/kernel/entry-header.S @@ -83,6 +83,8 @@ ldr r0, [sp] strex r1, r2, [sp] @ clear the exclusive monitor ldmib sp, {r1 - pc}^ @ load r1 - pc, cpsr +#else + ldmia sp, {r0 - pc}^ @ load r0 - pc, cpsr #endif .endm