OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e484585
)
[ARM] Fix context switch with ARMv6 + TLS
author
Russell King
<rmk@dyn-67.arm.linux.org.uk>
Fri, 23 Sep 2005 20:49:58 +0000
(21:49 +0100)
committer
Russell 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
patch
|
blob
|
history
diff --git
a/arch/arm/kernel/entry-armv.S
b/arch/arm/kernel/entry-armv.S
index
7152bfb
..
93b5e8e
100644
(file)
--- 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 r
3
, r4, [ip] @ Clear exclusive monitor
+ strex r
5
, r4, [ip] @ Clear exclusive monitor
#endif
#endif
#if defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_IWMMXT)