diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-09-23 16:49:58 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-09-23 16:49:58 -0400 |
| commit | 73394322a4bf4108847ba3c2eee33a81b1b44450 (patch) | |
| tree | 8f87725077eb63534d5ec0ccad118ab71f954a0c | |
| parent | e484585ec3ee66cd07a627d3a9e2364640a3807f (diff) | |
[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>
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 7152bfbee581..93b5e8e5292e 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S | |||
| @@ -537,7 +537,7 @@ ENTRY(__switch_to) | |||
| 537 | #ifdef CONFIG_CPU_MPCORE | 537 | #ifdef CONFIG_CPU_MPCORE |
| 538 | clrex | 538 | clrex |
| 539 | #else | 539 | #else |
| 540 | strex r3, r4, [ip] @ Clear exclusive monitor | 540 | strex r5, r4, [ip] @ Clear exclusive monitor |
| 541 | #endif | 541 | #endif |
| 542 | #endif | 542 | #endif |
| 543 | #if defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_IWMMXT) | 543 | #if defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_IWMMXT) |