diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-06 00:19:06 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-06 00:19:06 +0100 |
| commit | b4874a3d298606c20118d1ead73235439bbc2823 (patch) | |
| tree | 0b6122df3a52650c7861c8e505c01fc381bc43e8 /arch/x86/um/syscalls_64.c | |
| parent | ceaa1a13c0e53242555fa45887d82339a3f93c78 (diff) | |
| parent | 8ef102c6b4bc996ff96ca52b34775fe931ec90c9 (diff) | |
Merge branch 'fixes' into for-linus
Diffstat (limited to 'arch/x86/um/syscalls_64.c')
| -rw-r--r-- | arch/x86/um/syscalls_64.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/arch/x86/um/syscalls_64.c b/arch/x86/um/syscalls_64.c index f3d82bb6e15a..adb08eb5c22a 100644 --- a/arch/x86/um/syscalls_64.c +++ b/arch/x86/um/syscalls_64.c @@ -5,12 +5,9 @@ * Licensed under the GPL */ -#include "linux/linkage.h" -#include "linux/personality.h" -#include "linux/utsname.h" -#include "asm/prctl.h" /* XXX This should get the constants from libc */ -#include "asm/uaccess.h" -#include "os.h" +#include <linux/sched.h> +#include <asm/prctl.h> /* XXX This should get the constants from libc */ +#include <os.h> long arch_prctl(struct task_struct *task, int code, unsigned long __user *addr) { @@ -79,20 +76,6 @@ long sys_arch_prctl(int code, unsigned long addr) return arch_prctl(current, code, (unsigned long __user *) addr); } -long sys_clone(unsigned long clone_flags, unsigned long newsp, - void __user *parent_tid, void __user *child_tid) -{ - long ret; - - if (!newsp) - newsp = UPT_SP(¤t->thread.regs.regs); - current->thread.forking = 1; - ret = do_fork(clone_flags, newsp, ¤t->thread.regs, 0, parent_tid, - child_tid); - current->thread.forking = 0; - return ret; -} - void arch_switch_to(struct task_struct *to) { if ((to->thread.arch.fs == 0) || (to->mm == NULL)) |