Merge master.kernel.org:/home/rmk/linux-2.6-arm

7f28f394 · Linus Torvalds · dbdb9045 · 73394322 · 7f28f394
Commit 7f28f394 authored Sep 23, 2005 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

arch/arm/kernel/entry-armv.S arch/arm/kernel/entry-armv.S +1 -1

No files found.
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -537,7 +537,7 @@ ENTRY(__switch_to)
 #ifdef CONFIG_CPU_MPCORE
 	clrex
 #else
-	strex	r3, r4, [ip]			@ Clear exclusive monitor
+	strex	r5, r4, [ip]			@ Clear exclusive monitor
 #endif
 #endif
 #if defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_IWMMXT)