diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
| commit | 53279f36dccffc26ff536003fd6bb97cc21c3b82 (patch) | |
| tree | 9d16e497c0e4158c7c054c479bd0e9ff0388d7bb /include/linux/syscalls.h | |
| parent | a6e8c0a25377e27958b11b20e1927885ae7c9857 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
Diffstat (limited to 'include/linux/syscalls.h')
| -rw-r--r-- | include/linux/syscalls.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 19439c75c5b2..727f0cd73921 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
| @@ -827,7 +827,15 @@ asmlinkage long sys_fanotify_mark(int fanotify_fd, unsigned int flags, | |||
| 827 | const char __user *pathname); | 827 | const char __user *pathname); |
| 828 | asmlinkage long sys_syncfs(int fd); | 828 | asmlinkage long sys_syncfs(int fd); |
| 829 | 829 | ||
| 830 | #ifndef CONFIG_GENERIC_KERNEL_EXECVE | ||
| 830 | int kernel_execve(const char *filename, const char *const argv[], const char *const envp[]); | 831 | int kernel_execve(const char *filename, const char *const argv[], const char *const envp[]); |
| 832 | #else | ||
| 833 | #define kernel_execve(filename, argv, envp) \ | ||
| 834 | do_execve(filename, \ | ||
| 835 | (const char __user *const __user *)argv, \ | ||
| 836 | (const char __user *const __user *)envp, \ | ||
| 837 | current_pt_regs()) | ||
| 838 | #endif | ||
| 831 | 839 | ||
| 832 | 840 | ||
| 833 | asmlinkage long sys_perf_event_open( | 841 | asmlinkage long sys_perf_event_open( |