diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-09-18 22:33:44 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-10-01 00:53:11 -0400 |
commit | 019f96a345b6e23d4e0bc2c136ec5f7500b95834 (patch) | |
tree | 25fe5b25d9312962b589f8e02778008414b3e75b /arch/frv/include | |
parent | 460dabab73f2f60198c37ed7bf6d192d23eaa286 (diff) |
frv: switch to generic kernel_execve
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/frv/include')
-rw-r--r-- | arch/frv/include/asm/processor.h | 8 | ||||
-rw-r--r-- | arch/frv/include/asm/unistd.h | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/frv/include/asm/processor.h b/arch/frv/include/asm/processor.h index dccb9d162318..cc86e07a4119 100644 --- a/arch/frv/include/asm/processor.h +++ b/arch/frv/include/asm/processor.h | |||
@@ -92,14 +92,12 @@ extern struct task_struct *__kernel_current_task; | |||
92 | 92 | ||
93 | /* | 93 | /* |
94 | * do necessary setup to start up a newly executed thread. | 94 | * do necessary setup to start up a newly executed thread. |
95 | * - need to discard the frame stacked by init() invoking the execve syscall | ||
96 | */ | 95 | */ |
97 | #define start_thread(_regs, _pc, _usp) \ | 96 | #define start_thread(_regs, _pc, _usp) \ |
98 | do { \ | 97 | do { \ |
99 | __frame = __kernel_frame0_ptr; \ | 98 | _regs->pc = (_pc); \ |
100 | __frame->pc = (_pc); \ | 99 | _regs->psr &= ~PSR_S; \ |
101 | __frame->psr &= ~PSR_S; \ | 100 | _regs->sp = (_usp); \ |
102 | __frame->sp = (_usp); \ | ||
103 | } while(0) | 101 | } while(0) |
104 | 102 | ||
105 | /* Free all resources held by a thread. */ | 103 | /* Free all resources held by a thread. */ |
diff --git a/arch/frv/include/asm/unistd.h b/arch/frv/include/asm/unistd.h index 24b64034866c..b6b07e55e473 100644 --- a/arch/frv/include/asm/unistd.h +++ b/arch/frv/include/asm/unistd.h | |||
@@ -373,6 +373,7 @@ | |||
373 | #define __ARCH_WANT_SYS_RT_SIGACTION | 373 | #define __ARCH_WANT_SYS_RT_SIGACTION |
374 | #define __ARCH_WANT_SYS_RT_SIGSUSPEND | 374 | #define __ARCH_WANT_SYS_RT_SIGSUSPEND |
375 | #define __ARCH_WANT_SYS_EXECVE | 375 | #define __ARCH_WANT_SYS_EXECVE |
376 | #define __ARCH_WANT_KERNEL_EXECVE | ||
376 | 377 | ||
377 | /* | 378 | /* |
378 | * "Conditional" syscalls | 379 | * "Conditional" syscalls |