diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-08-18 04:01:47 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-10-22 22:55:21 -0700 |
| commit | ff64b4c18624ca545dd360c4fa65334d19ee7b6f (patch) | |
| tree | 3246f0d97bb73e16337985b7a5525b23ee7ada4b | |
| parent | 6a0eec8224db1191876770f7cac31f2a2637a6f5 (diff) | |
| download | op-kernel-dev-ff64b4c18624ca545dd360c4fa65334d19ee7b6f.zip op-kernel-dev-ff64b4c18624ca545dd360c4fa65334d19ee7b6f.tar.gz | |
x86, um: get rid of uml unistd.h
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| -rw-r--r-- | arch/um/include/asm/unistd.h | 41 | ||||
| -rw-r--r-- | arch/um/kernel/exec.c | 1 | ||||
| -rw-r--r-- | arch/um/kernel/internal.h | 1 | ||||
| -rw-r--r-- | arch/um/kernel/syscall.c | 1 | ||||
| -rw-r--r-- | arch/um/sys-i386/syscalls.c | 1 |
5 files changed, 4 insertions, 41 deletions
diff --git a/arch/um/include/asm/unistd.h b/arch/um/include/asm/unistd.h deleted file mode 100644 index 38bd9d9..0000000 --- a/arch/um/include/asm/unistd.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2000 - 2004 Jeff Dike (jdike@karaya.com) - * Licensed under the GPL - */ - -#ifndef _UM_UNISTD_H_ -#define _UM_UNISTD_H_ - -#include <linux/syscalls.h> -#include "linux/resource.h" -#include "asm/uaccess.h" - -extern int um_execve(const char *file, char *const argv[], char *const env[]); - -#ifdef __KERNEL__ -/* We get __ARCH_WANT_OLD_STAT and __ARCH_WANT_STAT64 from the base arch */ -#define __ARCH_WANT_OLD_READDIR -#define __ARCH_WANT_SYS_ALARM -#define __ARCH_WANT_SYS_GETHOSTNAME -#define __ARCH_WANT_SYS_PAUSE -#define __ARCH_WANT_SYS_SGETMASK -#define __ARCH_WANT_SYS_SIGNAL -#define __ARCH_WANT_SYS_TIME -#define __ARCH_WANT_SYS_UTIME -#define __ARCH_WANT_SYS_WAITPID -#define __ARCH_WANT_SYS_SOCKETCALL -#define __ARCH_WANT_SYS_FADVISE64 -#define __ARCH_WANT_SYS_GETPGRP -#define __ARCH_WANT_SYS_LLSEEK -#define __ARCH_WANT_SYS_NICE -#define __ARCH_WANT_SYS_OLD_GETRLIMIT -#define __ARCH_WANT_SYS_OLDUMOUNT -#define __ARCH_WANT_SYS_SIGPENDING -#define __ARCH_WANT_SYS_SIGPROCMASK -#define __ARCH_WANT_SYS_RT_SIGACTION -#define __ARCH_WANT_SYS_RT_SIGSUSPEND -#endif - -#include "asm/arch/unistd.h" - -#endif /* _UM_UNISTD_H_*/ diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c index 598711c..fda30d2 100644 --- a/arch/um/kernel/exec.c +++ b/arch/um/kernel/exec.c @@ -15,6 +15,7 @@ #include "mem_user.h" #include "skas.h" #include "os.h" +#include "internal.h" void flush_thread(void) { diff --git a/arch/um/kernel/internal.h b/arch/um/kernel/internal.h new file mode 100644 index 0000000..3bda43c --- /dev/null +++ b/arch/um/kernel/internal.h @@ -0,0 +1 @@ +extern long um_execve(char *file, char __user *__user *argv, char __user *__user *env); diff --git a/arch/um/kernel/syscall.c b/arch/um/kernel/syscall.c index 128ee85..c4df705 100644 --- a/arch/um/kernel/syscall.c +++ b/arch/um/kernel/syscall.c @@ -12,6 +12,7 @@ #include "asm/mman.h" #include "asm/uaccess.h" #include "asm/unistd.h" +#include "internal.h" long sys_fork(void) { diff --git a/arch/um/sys-i386/syscalls.c b/arch/um/sys-i386/syscalls.c index e2d1426..857ca0b 100644 --- a/arch/um/sys-i386/syscalls.c +++ b/arch/um/sys-i386/syscalls.c @@ -6,6 +6,7 @@ #include "linux/sched.h" #include "linux/shm.h" #include "linux/ipc.h" +#include "linux/syscalls.h" #include "asm/mman.h" #include "asm/uaccess.h" #include "asm/unistd.h" |
