Merge branch 'linus' into tracing-v28-for-linus-v3

Conflicts:
	init/main.c
	kernel/module.c
	scripts/bootgraph.pl

1 files changed, 10 insertions, 1 deletions

diff --git a/arch/blackfin/mach-common/interrupt.S b/arch/blackfin/mach-common/interrupt.S
index b27e59d32401..4a2ec7a9675a 100644
--- a/arch/blackfin/mach-common/interrupt.S
+++ b/arch/blackfin/mach-common/interrupt.S
@@ -143,7 +143,7 @@ ENTRY(_evt_ivhw)
         fp = 0;
 #endif
 
-#if ANOMALY_05000283
+#if ANOMALY_05000283 || ANOMALY_05000315
         cc = r7 == r7;
         p5.h = HI(CHIPID);
         p5.l = LO(CHIPID);
@@ -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;