Merge branch 'printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-omap-h63xx.git] / arch / blackfin / kernel / entry.S

diff --git a/arch/blackfin/kernel/entry.S b/arch/blackfin/kernel/entry.S
index faea88ebb2efd553327e3ff48f57829f63a5ae20..a9cfba9946b5f8520d9366ad406357707a8b1c46 100644 (file)
--- a/arch/blackfin/kernel/entry.S
+++ b/arch/blackfin/kernel/entry.S
@@ -30,6 +30,7 @@
 #include <linux/linkage.h>
 #include <asm/thread_info.h>
 #include <asm/errno.h>
+#include <asm/blackfin.h>
 #include <asm/asm-offsets.h>
 
 #include <asm/context.S>
@@ -41,6 +42,10 @@
 #endif
 
 ENTRY(_ret_from_fork)
+#ifdef CONFIG_IPIPE
+       [--sp] = reti;          /* IRQs on. */
+       SP += 4;
+#endif /* CONFIG_IPIPE */
        SP += -12;
        call _schedule_tail;
        SP += 12;