3 files changed, 34 insertions, 0 deletions

diff --git a/arch/blackfin/include/asm/context.S b/arch/blackfin/include/asm/context.S
index fada8e974a7..1f9060395a0 100644
--- a/arch/blackfin/include/asm/context.S
+++ b/arch/blackfin/include/asm/context.S
@@ -73,6 +73,11 @@
 #else
         cli r0;
 #endif
+#ifdef CONFIG_TRACE_IRQFLAGS
+        sp += -12;
+        call _trace_hardirqs_off;
+        sp += 12;
+#endif
         [--sp] = RETI;  /*orig_pc*/
         /* Clear all L registers.  */
         r0 = 0 (x);
@@ -279,6 +284,13 @@
         RETN = [sp++];
         RETX = [sp++];
         RETI = [sp++];
+
+#ifdef CONFIG_TRACE_IRQFLAGS
+        sp += -12;
+        call _trace_hardirqs_on;
+        sp += 12;
+#endif
+
         RETS = [sp++];
 
 #ifdef CONFIG_SMP
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S
index ccfa7c490ff..1fa414f7852 100644
--- a/arch/blackfin/mach-common/entry.S
+++ b/arch/blackfin/mach-common/entry.S
@@ -966,6 +966,13 @@ ENTRY(_evt_evt14)
 #else
         cli r0;
 #endif
+#ifdef CONFIG_TRACE_IRQFLAGS
+        [--sp] = rets;
+        sp += -12;
+        call _trace_hardirqs_off;
+        sp += 12;
+        rets = [sp++];
+#endif
         [--sp] = RETI;
         SP += 4;
         rts;
@@ -989,6 +996,14 @@ ENTRY(_schedule_and_signal_from_int)
         p1 = rets;
         [sp + PT_RESERVED] = p1;
 
+#ifdef CONFIG_TRACE_IRQFLAGS
+        /* trace_hardirqs_on() checks if all irqs are disabled. But here IRQ 15
+         * is turned on, so disable all irqs. */
+        cli r0;
+        sp += -12;
+        call _trace_hardirqs_on;
+        sp += 12;
+#endif
 #ifdef CONFIG_SMP
         GET_PDA(p0, r0);        /* Fetch current PDA (can't migrate to other CPU here) */
         r0 = [p0 + PDA_IRQFLAGS];
diff --git a/arch/blackfin/mach-common/interrupt.S b/arch/blackfin/mach-common/interrupt.S
index df984960cf9..0a0c088ead8 100644
--- a/arch/blackfin/mach-common/interrupt.S
+++ b/arch/blackfin/mach-common/interrupt.S
@@ -88,6 +88,13 @@ __common_int_entry:
 #else
         cli r1;
 #endif
+#ifdef CONFIG_TRACE_IRQFLAGS
+        [--sp] = r0;
+        sp += -12;
+        call _trace_hardirqs_off;
+        sp += 12;
+        r0 = [sp++];
+#endif
         [--sp] = RETI;  /* orig_pc */
         /* Clear all L registers.  */
         r1 = 0 (x);