From 9445d5b69557118b36ed9b3bdf351a311da83a28 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Wed, 10 Aug 2005 14:52:52 +0100
Subject: [PATCH] --- yaml --- r: 5763 b: refs/heads/master c:
 b876386ee47e3ac9375a36e9107b8bd32e0599fc h: refs/heads/master i:   5761:
 e2670a669826bba7651c8ba4b6c44b3c90e9d5da   5759:
 5803bb47f625da76e9fcf8e6d5baaec32376963a v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/kernel/entry-armv.S | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 586b32c1c2a3..f5136bdc6ead 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c4ee4e2520775896efc6ab850c4c27971fbcf2a
+refs/heads/master: b876386ee47e3ac9375a36e9107b8bd32e0599fc
diff --git a/trunk/arch/arm/kernel/entry-armv.S b/trunk/arch/arm/kernel/entry-armv.S
index 39a6c1b0b9a3..7152bfbee581 100644
--- a/trunk/arch/arm/kernel/entry-armv.S
+++ b/trunk/arch/arm/kernel/entry-armv.S
@@ -533,6 +533,13 @@ ENTRY(__switch_to)
 	ldr	r3, [r2, #TI_TP_VALUE]
 	stmia	ip!, {r4 - sl, fp, sp, lr}	@ Store most regs on stack
 	ldr	r6, [r2, #TI_CPU_DOMAIN]!
+#if __LINUX_ARM_ARCH__ >= 6
+#ifdef CONFIG_CPU_MPCORE
+	clrex
+#else
+	strex	r3, r4, [ip]			@ Clear exclusive monitor
+#endif
+#endif
 #if defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_IWMMXT)
 	mra	r4, r5, acc0
 	stmia   ip, {r4, r5}