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

[karo-tx-linux.git] / arch / mips / kernel / entry.S

diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S
index 9b00362f32f6d95d4577817bbd39757f880d0639..e5786858cdb6808f24993930c899d89f3ab3bfa5 100644 (file)
--- a/arch/mips/kernel/entry.S
+++ b/arch/mips/kernel/entry.S
@@ -70,6 +70,12 @@ need_resched:
        b       need_resched
 #endif
 
+FEXPORT(ret_from_kernel_thread)
+       jal     schedule_tail           # a0 = struct task_struct *prev
+       move    a0, s1
+       jal     s0
+       j       syscall_exit
+
 FEXPORT(ret_from_fork)
        jal     schedule_tail           # a0 = struct task_struct *prev