diff --git a/[refs] b/[refs]
index 54c0a0410157..4e29c6f36e2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc9afb997f3e871d1c289258d59b48db30984950
+refs/heads/master: 70f47202320623270f327e249df0121c09e45c09
diff --git a/trunk/arch/blackfin/mach-common/interrupt.S b/trunk/arch/blackfin/mach-common/interrupt.S
index ae7fc88ab6a0..29fbf67f47fa 100644
--- a/trunk/arch/blackfin/mach-common/interrupt.S
+++ b/trunk/arch/blackfin/mach-common/interrupt.S
@@ -276,7 +276,15 @@ ENTRY(___ipipe_call_irqtail)
 	( r7:4, p5:3 ) = [sp++];
 	rets = [sp++];
 
-	r0 = 0x401f (z);
+#ifdef CONFIG_DEBUG_HWERR
+	/* enable irq14 & hwerr interrupt, until we transition to _evt_evt14 */
+	r0 = (EVT_IVG14 | EVT_IVHW | \
+		EVT_IRPTEN | EVT_EVX | EVT_NMI | EVT_RST | EVT_EMU);
+#else
+	/* Only enable irq14 interrupt, until we transition to _evt_evt14 */
+	r0 = (EVT_IVG14 | \
+		EVT_IRPTEN | EVT_EVX | EVT_NMI | EVT_RST | EVT_EMU);
+#endif
 	sti r0;
 	raise 14;		/* Branches to _evt_evt14 */
 2: