hwmon-vid: Add support for AMD family 10h CPUs

[linux-2.6-omap-h63xx.git] / arch / arm / mm / abort-ev6.S

diff --git a/arch/arm/mm/abort-ev6.S b/arch/arm/mm/abort-ev6.S
index 8f76f3df7b4cf03e949b51f2817e7f0c4af4b44a..8a7f65ba14b761cb81ceaa87689f1f0d9a91ed3f 100644 (file)
--- a/arch/arm/mm/abort-ev6.S
+++ b/arch/arm/mm/abort-ev6.S
@@ -20,6 +20,11 @@
  */
        .align  5
 ENTRY(v6_early_abort)
+#ifdef CONFIG_CPU_32v6K
+       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
 /*