diff options
author | Mark Salter <msalter@redhat.com> | 2012-09-21 12:26:38 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-10-01 00:59:08 -0400 |
commit | 39fcf44099dd64679c232c4a7bb81cf469e4e43c (patch) | |
tree | 52e3e19d2211b7640cc6595746a5fd7474389f9f /arch/c6x/kernel | |
parent | 46f15067c020a0ce712cb2d3ef38c0589a521c15 (diff) |
c6x: switch to generic kernel_execve
Signed-off-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.S | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/c6x/kernel/entry.S b/arch/c6x/kernel/entry.S index 6e6bd9d3d9cc..32e3683da718 100644 --- a/arch/c6x/kernel/entry.S +++ b/arch/c6x/kernel/entry.S | |||
@@ -420,6 +420,12 @@ ENTRY(ret_from_kernel_thread) | |||
420 | BNOP .S2 B11,5 /* jump to sys_exit */ | 420 | BNOP .S2 B11,5 /* jump to sys_exit */ |
421 | ENDPROC(ret_from_kernel_thread) | 421 | ENDPROC(ret_from_kernel_thread) |
422 | 422 | ||
423 | ENTRY(ret_from_kernel_execve) | ||
424 | GET_THREAD_INFO A12 | ||
425 | BNOP .S2 syscall_exit,4 | ||
426 | ADD .D2X A4,-8,SP | ||
427 | ENDPROC(ret_from_kernel_execve) | ||
428 | |||
423 | ;; | 429 | ;; |
424 | ;; These are the interrupt handlers, responsible for calling __do_IRQ() | 430 | ;; These are the interrupt handlers, responsible for calling __do_IRQ() |
425 | ;; int6 is used for syscalls (see _system_call entry) | 431 | ;; int6 is used for syscalls (see _system_call entry) |
@@ -613,13 +619,6 @@ ENTRY(sys_sigaltstack) | |||
613 | NOP 4 | 619 | NOP 4 |
614 | ENDPROC(sys_sigaltstack) | 620 | ENDPROC(sys_sigaltstack) |
615 | 621 | ||
616 | ;; kernel_execve | ||
617 | ENTRY(kernel_execve) | ||
618 | MVK .S2 __NR_execve,B0 | ||
619 | SWE | ||
620 | BNOP .S2 B3,5 | ||
621 | ENDPROC(kernel_execve) | ||
622 | |||
623 | ;; | 622 | ;; |
624 | ;; Special system calls | 623 | ;; Special system calls |
625 | ;; return address is in B3 | 624 | ;; return address is in B3 |