summaryrefslogtreecommitdiffstats
path: root/arch/c6x/kernel
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-10-13 02:35:21 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-10-15 12:51:17 -0400
commit5e7d7333914ed5a01d70d5859068faf03b6779f2 (patch)
tree0c70a1743566664363af2245a3c8a03a55289679 /arch/c6x/kernel
parentddffeb8c4d0331609ef2581d84de4d763607bd37 (diff)
downloadlinux-stable-5e7d7333914ed5a01d70d5859068faf03b6779f2.tar.gz
linux-stable-5e7d7333914ed5a01d70d5859068faf03b6779f2.tar.bz2
linux-stable-5e7d7333914ed5a01d70d5859068faf03b6779f2.zip
c6x: switch to saner kernel_execve() semantics
ACKed-by: Mark Salter <msalter@redhat.com> Tested-by: Mark Salter <msalter@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/c6x/kernel')
-rw-r--r--arch/c6x/kernel/entry.S12
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/c6x/kernel/entry.S b/arch/c6x/kernel/entry.S
index 5449c36018fe..75f6f36472cf 100644
--- a/arch/c6x/kernel/entry.S
+++ b/arch/c6x/kernel/entry.S
@@ -413,19 +413,9 @@ ENTRY(ret_from_kernel_thread)
0:
B .S2 B10 /* call fn */
LDW .D2T1 *+SP(REGS_A1+8),A4 /* get arg */
- MVKL .S2 sys_exit,B11
- MVKH .S2 sys_exit,B11
- ADDKPC .S2 0f,B3,1
-0:
- BNOP .S2 B11,5 /* jump to sys_exit */
+ ADDKPC .S2 ret_from_fork_2,B3,3
ENDPROC(ret_from_kernel_thread)
-ENTRY(ret_from_kernel_execve)
- GET_THREAD_INFO A12
- BNOP .S2 syscall_exit,4
- ADD .D2X A4,-8,SP
-ENDPROC(ret_from_kernel_execve)
-
;;
;; These are the interrupt handlers, responsible for calling __do_IRQ()
;; int6 is used for syscalls (see _system_call entry)