From f327937384f41b6dc4cd6230aa375697cf44a4fd Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Sun, 2 Oct 2005 22:34:35 +0100
Subject: [PATCH] --- yaml --- r: 9546 b: refs/heads/master c:
 2c3a0540999ac9bd7147fb98833224a58cdaf217 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/arm/mm/abort-ev6.S | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 98b885faeab5..99aaadac8c4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 487fd4eb1445407c9760af08b0b34c3f4cdb4afc
+refs/heads/master: 2c3a0540999ac9bd7147fb98833224a58cdaf217
diff --git a/trunk/arch/arm/mm/abort-ev6.S b/trunk/arch/arm/mm/abort-ev6.S
index 8f76f3df7b4c..dbd346033122 100644
--- a/trunk/arch/arm/mm/abort-ev6.S
+++ b/trunk/arch/arm/mm/abort-ev6.S
@@ -20,6 +20,11 @@
  */
 	.align	5
 ENTRY(v6_early_abort)
+#ifdef CONFIG_CPU_MPCORE
+	clrex
+#else
+	strex	r0, r1, [sp]			@ Clear the exclusive monitor
+#endif
 	mrc	p15, 0, r1, c5, c0, 0		@ get FSR
 	mrc	p15, 0, r0, c6, c0, 0		@ get FAR
 /*