diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-28 23:04:26 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-28 23:43:27 -0500 |
commit | 24465a40ba452bd81fdc9eecb2d75bb903aafdf6 (patch) | |
tree | 859765acda3c65273fce6601029a7c4d8002c41d /include | |
parent | 1ea2a0160588582cd8414a8026d5b54f1705dfa1 (diff) |
take sys_fork/sys_vfork/sys_clone prototypes to linux/syscalls.h
now it can be done...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-generic/syscalls.h | 12 | ||||
-rw-r--r-- | include/linux/syscalls.h | 10 |
2 files changed, 10 insertions, 12 deletions
diff --git a/include/asm-generic/syscalls.h b/include/asm-generic/syscalls.h index 77960333b1a1..58f466ff00d3 100644 --- a/include/asm-generic/syscalls.h +++ b/include/asm-generic/syscalls.h | |||
@@ -8,18 +8,6 @@ | |||
8 | * Calling conventions for these system calls can differ, so | 8 | * Calling conventions for these system calls can differ, so |
9 | * it's possible to override them. | 9 | * it's possible to override them. |
10 | */ | 10 | */ |
11 | #ifndef sys_clone | ||
12 | asmlinkage long sys_clone(unsigned long clone_flags, unsigned long newsp, | ||
13 | void __user *parent_tid, void __user *child_tid); | ||
14 | #endif | ||
15 | |||
16 | #ifndef sys_fork | ||
17 | asmlinkage long sys_fork(void); | ||
18 | #endif | ||
19 | |||
20 | #ifndef sys_vfork | ||
21 | asmlinkage long sys_vfork(void); | ||
22 | #endif | ||
23 | 11 | ||
24 | #ifndef sys_mmap2 | 12 | #ifndef sys_mmap2 |
25 | asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, | 13 | asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, |
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 526deb333b91..91835e7f364d 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
@@ -836,6 +836,16 @@ int kernel_execve(const char *filename, const char *const argv[], const char *co | |||
836 | (const char __user *const __user *)envp) | 836 | (const char __user *const __user *)envp) |
837 | #endif | 837 | #endif |
838 | 838 | ||
839 | asmlinkage long sys_fork(void); | ||
840 | asmlinkage long sys_vfork(void); | ||
841 | #ifdef CONFIG_CLONE_BACKWARDS | ||
842 | asmlinkage long sys_clone(unsigned long, unsigned long, int __user *, int, | ||
843 | int __user *); | ||
844 | #else | ||
845 | asmlinkage long sys_clone(unsigned long, unsigned long, int __user *, | ||
846 | int __user *, int); | ||
847 | #endif | ||
848 | |||
839 | asmlinkage long sys_execve(const char __user *filename, | 849 | asmlinkage long sys_execve(const char __user *filename, |
840 | const char __user *const __user *argv, | 850 | const char __user *const __user *argv, |
841 | const char __user *const __user *envp); | 851 | const char __user *const __user *envp); |