diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2012-09-10 16:11:46 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2012-10-17 14:41:51 +0100 |
| commit | 6a872777ffff6184f4ac10bd71d926d5e6f2491e (patch) | |
| tree | 81d85fc98bda389e61481d4963f2af554b1a0ffe /arch/arm64/include | |
| parent | 59dc67b0cc35cd93c3f4869fdd0d6cfb2a26ecbc (diff) | |
| download | linux-3.10-6a872777ffff6184f4ac10bd71d926d5e6f2491e.tar.gz linux-3.10-6a872777ffff6184f4ac10bd71d926d5e6f2491e.tar.bz2 linux-3.10-6a872777ffff6184f4ac10bd71d926d5e6f2491e.zip | |
arm64: Use generic sys_execve() implementation
This patch converts the arm64 port to use the generic sys_execve()
implementation removing the arm64-specific (compat_)sys_execve_wrapper()
functions.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/include')
| -rw-r--r-- | arch/arm64/include/asm/syscalls.h | 3 | ||||
| -rw-r--r-- | arch/arm64/include/asm/unistd.h | 1 | ||||
| -rw-r--r-- | arch/arm64/include/asm/unistd32.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm64/include/asm/syscalls.h b/arch/arm64/include/asm/syscalls.h index 09ff33572aa..81680a0ae91 100644 --- a/arch/arm64/include/asm/syscalls.h +++ b/arch/arm64/include/asm/syscalls.h @@ -23,9 +23,6 @@ /* * System call wrappers implemented in kernel/entry.S. */ -asmlinkage long sys_execve_wrapper(const char __user *filename, - const char __user *const __user *argv, - const char __user *const __user *envp); asmlinkage long sys_clone_wrapper(unsigned long clone_flags, unsigned long newsp, void __user *parent_tid, diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h index 63f853f8b71..b40dc6b6984 100644 --- a/arch/arm64/include/asm/unistd.h +++ b/arch/arm64/include/asm/unistd.h @@ -26,4 +26,5 @@ #define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND #define __ARCH_WANT_COMPAT_SYS_SENDFILE #endif +#define __ARCH_WANT_SYS_EXECVE #include <uapi/asm/unistd.h> diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h index 6d909faebf2..9035e6add3e 100644 --- a/arch/arm64/include/asm/unistd32.h +++ b/arch/arm64/include/asm/unistd32.h @@ -32,7 +32,7 @@ __SYSCALL(7, sys_ni_syscall) /* 7 was sys_waitpid */ __SYSCALL(8, sys_creat) __SYSCALL(9, sys_link) __SYSCALL(10, sys_unlink) -__SYSCALL(11, compat_sys_execve_wrapper) +__SYSCALL(11, compat_sys_execve) __SYSCALL(12, sys_chdir) __SYSCALL(13, sys_ni_syscall) /* 13 was sys_time */ __SYSCALL(14, sys_mknod) |