Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[~andy/linux] / arch / m32r / kernel / entry.S

diff --git a/arch/m32r/kernel/entry.S b/arch/m32r/kernel/entry.S
index 225412bc227e690bcb313743dd16f58fca5c4115..0c01543f10cd9c1ad53c9453294d185fc18730cd 100644 (file)
--- a/arch/m32r/kernel/entry.S
+++ b/arch/m32r/kernel/entry.S
@@ -125,6 +125,15 @@
        and     \reg, sp
        .endm
 
+ENTRY(ret_from_kernel_thread)
+       pop     r0
+       bl      schedule_tail
+       GET_THREAD_INFO(r8)
+       ld      r0, R0(r8)
+       ld      r1, R1(r8)
+       jl      r1
+       bra     syscall_exit
+
 ENTRY(ret_from_fork)
        pop     r0
        bl      schedule_tail