summaryrefslogtreecommitdiffstats
path: root/arch/cris/arch-v10/kernel/entry.S
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-10-03 20:46:55 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2012-10-15 05:12:25 +0200
commit69b58a67213506f98835b0ee8cf24324f59a1442 (patch)
tree554e56ac841e958398b0967784db8628dbbf48a3 /arch/cris/arch-v10/kernel/entry.S
parentLinux 3.7-rc1 (diff)
downloadlinux-69b58a67213506f98835b0ee8cf24324f59a1442.tar.xz
linux-69b58a67213506f98835b0ee8cf24324f59a1442.zip
cris: switch to generic kernel_thread()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/cris/arch-v10/kernel/entry.S')
-rw-r--r--arch/cris/arch-v10/kernel/entry.S10
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/cris/arch-v10/kernel/entry.S b/arch/cris/arch-v10/kernel/entry.S
index 592fbe9dfb62..b8e39e00acb2 100644
--- a/arch/cris/arch-v10/kernel/entry.S
+++ b/arch/cris/arch-v10/kernel/entry.S
@@ -35,6 +35,7 @@
.globl system_call
.globl ret_from_intr
.globl ret_from_fork
+ .globl ret_from_kernel_thread
.globl resume
.globl multiple_interrupt
.globl hwbreakpoint
@@ -81,7 +82,14 @@ ret_from_fork:
jsr schedule_tail
ba ret_from_sys_call
nop
-
+
+ret_from_kernel_thread:
+ jsr schedule_tail
+ move.d $r2, $r10 ; argument is here
+ jsr $r1 ; call the payload
+ moveq 0, $r10
+ jsr sys_exit ; never returns
+
ret_from_intr:
;; check for resched if preemptive kernel or if we're going back to user-mode
;; this test matches the user_regs(regs) macro