diff options
| author | Ingo Molnar | 2013-08-29 12:02:08 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2013-08-29 12:02:08 +0200 |
| commit | aee2bce3cfdcb9bf2c51c24496ee776e8202ed11 (patch) | |
| tree | 66ff8e345cf693cfb39383f25ad796e2f59ab6ad /kernel/fork.c | |
| 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 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 403d2bb8a968..e23bb19e2a3e 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1679,6 +1679,12 @@ SYSCALL_DEFINE5(clone, unsigned long, newsp, unsigned long, clone_flags, int __user *, parent_tidptr, int __user *, child_tidptr, int, tls_val) +#elif defined(CONFIG_CLONE_BACKWARDS3) +SYSCALL_DEFINE6(clone, unsigned long, clone_flags, unsigned long, newsp, + int, stack_size, + int __user *, parent_tidptr, + int __user *, child_tidptr, + int, tls_val) #else SYSCALL_DEFINE5(clone, unsigned long, clone_flags, unsigned long, newsp, int __user *, parent_tidptr, |