Merge branch 'topic/nomm' into for-linus

[pandora-kernel.git] / arch / blackfin / include / asm / context.S

diff --git a/arch/blackfin/include/asm/context.S b/arch/blackfin/include/asm/context.S
index 5dffaf5..1f90603 100644 (file)
--- a/arch/blackfin/include/asm/context.S
+++ b/arch/blackfin/include/asm/context.S
@@ -72,6 +72,11 @@
        sti r0;
 #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.  */
@@ -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
@@ -374,3 +386,13 @@
 
        (R7:0, P5:0) = [SP++];
 .endm
+
+.macro pseudo_long_call func:req, scratch:req
+#ifdef CONFIG_ROMKERNEL
+       \scratch\().l = \func;
+       \scratch\().h = \func;
+       call (\scratch);
+#else
+       call \func;
+#endif
+.endm