]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
[ARM] Fix context switch with ARMv6 + TLS
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 23 Sep 2005 20:49:58 +0000 (21:49 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 23 Sep 2005 20:49:58 +0000 (21:49 +0100)
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>
arch/arm/kernel/entry-armv.S

index 7152bfbee581ea4fa83769bd323564a6249782f7..93b5e8e5292effd86be569c757670a190a38369e 100644 (file)
@@ -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)