aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-08-18 04:01:47 -0400
committerH. Peter Anvin <hpa@zytor.com>2008-10-23 01:55:21 -0400
commitff64b4c18624ca545dd360c4fa65334d19ee7b6f (patch)
tree3246f0d97bb73e16337985b7a5525b23ee7ada4b /arch/um
parent6a0eec8224db1191876770f7cac31f2a2637a6f5 (diff)
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>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/include/asm/unistd.h41
-rw-r--r--arch/um/kernel/exec.c1
-rw-r--r--arch/um/kernel/internal.h1
-rw-r--r--arch/um/kernel/syscall.c1
-rw-r--r--arch/um/sys-i386/syscalls.c1
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 38bd9d94ee46..000000000000
--- a/arch/um/include/asm/unistd.h
+++ /dev/null
@@ -1,41 +0,0 @@
1/*
2 * Copyright (C) 2000 - 2004 Jeff Dike (jdike@karaya.com)
3 * Licensed under the GPL
4 */
5
6#ifndef _UM_UNISTD_H_
7#define _UM_UNISTD_H_
8
9#include <linux/syscalls.h>
10#include "linux/resource.h"
11#include "asm/uaccess.h"
12
13extern int um_execve(const char *file, char *const argv[], char *const env[]);
14
15#ifdef __KERNEL__
16/* We get __ARCH_WANT_OLD_STAT and __ARCH_WANT_STAT64 from the base arch */
17#define __ARCH_WANT_OLD_READDIR
18#define __ARCH_WANT_SYS_ALARM
19#define __ARCH_WANT_SYS_GETHOSTNAME
20#define __ARCH_WANT_SYS_PAUSE
21#define __ARCH_WANT_SYS_SGETMASK
22#define __ARCH_WANT_SYS_SIGNAL
23#define __ARCH_WANT_SYS_TIME
24#define __ARCH_WANT_SYS_UTIME
25#define __ARCH_WANT_SYS_WAITPID
26#define __ARCH_WANT_SYS_SOCKETCALL
27#define __ARCH_WANT_SYS_FADVISE64
28#define __ARCH_WANT_SYS_GETPGRP
29#define __ARCH_WANT_SYS_LLSEEK
30#define __ARCH_WANT_SYS_NICE
31#define __ARCH_WANT_SYS_OLD_GETRLIMIT
32#define __ARCH_WANT_SYS_OLDUMOUNT
33#define __ARCH_WANT_SYS_SIGPENDING
34#define __ARCH_WANT_SYS_SIGPROCMASK
35#define __ARCH_WANT_SYS_RT_SIGACTION
36#define __ARCH_WANT_SYS_RT_SIGSUSPEND
37#endif
38
39#include "asm/arch/unistd.h"
40
41#endif /* _UM_UNISTD_H_*/
diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c
index 598711c62c82..fda30d21fb90 100644
--- a/arch/um/kernel/exec.c
+++ b/arch/um/kernel/exec.c
@@ -15,6 +15,7 @@
15#include "mem_user.h" 15#include "mem_user.h"
16#include "skas.h" 16#include "skas.h"
17#include "os.h" 17#include "os.h"
18#include "internal.h"
18 19
19void flush_thread(void) 20void flush_thread(void)
20{ 21{
diff --git a/arch/um/kernel/internal.h b/arch/um/kernel/internal.h
new file mode 100644
index 000000000000..3bda43c7a786
--- /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 128ee85bc8d9..c4df705b8359 100644
--- a/arch/um/kernel/syscall.c
+++ b/arch/um/kernel/syscall.c
@@ -12,6 +12,7 @@
12#include "asm/mman.h" 12#include "asm/mman.h"
13#include "asm/uaccess.h" 13#include "asm/uaccess.h"
14#include "asm/unistd.h" 14#include "asm/unistd.h"
15#include "internal.h"
15 16
16long sys_fork(void) 17long sys_fork(void)
17{ 18{
diff --git a/arch/um/sys-i386/syscalls.c b/arch/um/sys-i386/syscalls.c
index e2d142684412..857ca0b3bdef 100644
--- a/arch/um/sys-i386/syscalls.c
+++ b/arch/um/sys-i386/syscalls.c
@@ -6,6 +6,7 @@
6#include "linux/sched.h" 6#include "linux/sched.h"
7#include "linux/shm.h" 7#include "linux/shm.h"
8#include "linux/ipc.h" 8#include "linux/ipc.h"
9#include "linux/syscalls.h"
9#include "asm/mman.h" 10#include "asm/mman.h"
10#include "asm/uaccess.h" 11#include "asm/uaccess.h"
11#include "asm/unistd.h" 12#include "asm/unistd.h"