1 files changed, 9 insertions, 0 deletions

diff --git a/arch/blackfin/mach-common/interrupt.S b/arch/blackfin/mach-common/interrupt.S
index 647f0f522910..4a2ec7a9675a 100644
--- a/arch/blackfin/mach-common/interrupt.S
+++ b/arch/blackfin/mach-common/interrupt.S
@@ -179,7 +179,16 @@ ENTRY(_evt_ivhw)
         call _trap_c;
         SP += 12;
 
+#ifdef EBIU_ERRMST
+        /* make sure EBIU_ERRMST is clear */
+        p0.l = LO(EBIU_ERRMST);
+        p0.h = HI(EBIU_ERRMST);
+        r0.l = (CORE_ERROR | CORE_MERROR);
+        w[p0] = r0.l;
+#endif
+
         call _ret_from_exception;
+
 .Lcommon_restore_all_sys:
         RESTORE_ALL_SYS
         rti;