diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-16 22:27:38 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-16 22:27:38 -0500 |
| commit | 94b237b6b9d8e2afa304108b9387be67e878f3bc (patch) | |
| tree | 57d6cb6b9094a98b7dd026945b946b4d0c56bcd7 /include | |
| parent | 2482f8449d712e8049b2b1a3703a5fe50026d6f7 (diff) | |
| parent | 008f17948725c112a3422f72ed57fdc980e146a8 (diff) | |
Merge branch 'arch-tile' into no-rebases
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/compat.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h index d0ced1011f2f..d2db71077d93 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h | |||
| @@ -286,10 +286,8 @@ asmlinkage ssize_t compat_sys_pwritev(unsigned long fd, | |||
| 286 | 286 | ||
| 287 | int compat_do_execve(const char *filename, const compat_uptr_t __user *argv, | 287 | int compat_do_execve(const char *filename, const compat_uptr_t __user *argv, |
| 288 | const compat_uptr_t __user *envp, struct pt_regs *regs); | 288 | const compat_uptr_t __user *envp, struct pt_regs *regs); |
| 289 | #ifdef __ARCH_WANT_SYS_EXECVE | ||
| 290 | asmlinkage long compat_sys_execve(const char __user *filename, const compat_uptr_t __user *argv, | 289 | asmlinkage long compat_sys_execve(const char __user *filename, const compat_uptr_t __user *argv, |
| 291 | const compat_uptr_t __user *envp); | 290 | const compat_uptr_t __user *envp); |
| 292 | #endif | ||
| 293 | 291 | ||
| 294 | asmlinkage long compat_sys_select(int n, compat_ulong_t __user *inp, | 292 | asmlinkage long compat_sys_select(int n, compat_ulong_t __user *inp, |
| 295 | compat_ulong_t __user *outp, compat_ulong_t __user *exp, | 293 | compat_ulong_t __user *outp, compat_ulong_t __user *exp, |