make Linux bootable on ARM again

Commit 200b812 "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 <[email protected]> Acked-by: Uwe Kleine-König <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
blinkosm · Sep 26, 2009 · 9e6ec39 · 9e6ec39
1 parent 6d7f18f
commit 9e6ec39
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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