---

yaml --- r: 9546 b: refs/heads/master c: 2c3a054 h: refs/heads/master v: v3
git-mirror · Oct 2, 2005 · f327937 · f327937
1 parent b1f6b58
commit f327937
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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
 /*