diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-08-29 12:02:08 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-08-29 12:02:08 +0200 |
| commit | aee2bce3cfdcb9bf2c51c24496ee776e8202ed11 (patch) | |
| tree | 66ff8e345cf693cfb39383f25ad796e2f59ab6ad /include/linux/syscalls.h | |
| parent | 5ec4c599a52362896c3e7c6a31ba6145dca9c6f5 (diff) | |
| parent | c95389b4cd6a4b52af78bea706a274453e886251 (diff) | |
Merge branch 'linus' into perf/core
Pick up the latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/syscalls.h')
| -rw-r--r-- | include/linux/syscalls.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 4147d700a293..84662ecc7b51 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -802,9 +802,14 @@ asmlinkage long sys_vfork(void); asmlinkage long sys_clone(unsigned long, unsigned long, int __user *, int, int __user *); #else +#ifdef CONFIG_CLONE_BACKWARDS3 +asmlinkage long sys_clone(unsigned long, unsigned long, int, int __user *, + int __user *, int); +#else asmlinkage long sys_clone(unsigned long, unsigned long, int __user *, int __user *, int); #endif +#endif asmlinkage long sys_execve(const char __user *filename, const char __user *const __user *argv, |