Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / blackfin / mach-common / interrupt.S

diff --git a/arch/blackfin/mach-common/interrupt.S b/arch/blackfin/mach-common/interrupt.S
index cee62cf..2df37db 100644 (file)
--- a/arch/blackfin/mach-common/interrupt.S
+++ b/arch/blackfin/mach-common/interrupt.S
@@ -116,7 +116,24 @@ __common_int_entry:
        cc = r0 == 0;
        if cc jump .Lcommon_restore_context;
 #else /* CONFIG_IPIPE */
+
+#ifdef CONFIG_PREEMPT
+       r7 = sp;
+       r4.l = lo(ALIGN_PAGE_MASK);
+       r4.h = hi(ALIGN_PAGE_MASK);
+       r7 = r7 & r4;
+       p5 = r7;
+       r7 = [p5 + TI_PREEMPT]; /* get preempt count */
+       r7 += 1;                /* increment it */
+       [p5 + TI_PREEMPT] = r7;
+#endif
        pseudo_long_call _do_irq, p2;
+
+#ifdef CONFIG_PREEMPT
+       r7 += -1;
+       [p5 + TI_PREEMPT] = r7; /* restore preempt count */
+#endif
+
        SP += 12;
 #endif /* CONFIG_IPIPE */
        pseudo_long_call _return_from_int, p2;