From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Fri, 23 Sep 2005 20:49:58 +0000 (+0100)
Subject: [ARM] Fix context switch with ARMv6 + TLS
X-Git-Tag: v2.6.14-rc3~51^2~7^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=73394322a4bf4108847ba3c2eee33a81b1b44450;p=linux-2.6-omap-h63xx.git

[ARM] Fix context switch with ARMv6 + TLS

We accidentally corrupted the TLS value when clearing out the ARMv6
exclusive monitor.  Avoid doing so.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 7152bfbee58..93b5e8e5292 100644
--- 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)