1 files changed, 0 insertions, 137 deletions
diff --git a/arch/um/sys-i386/syscalls.c b/arch/um/sys-i386/syscalls.c
index 857ca0b3bdef..70ca357393b8 100644
--- a/arch/um/sys-i386/syscalls.c
+++ b/arch/um/sys-i386/syscalls.c
@@ -12,57 +12,6 @@
 #include "asm/unistd.h"
 /*
- * Perform the select(nd, in, out, ex, tv) and mmap() system
- * calls. Linux/i386 didn't use to be able to handle more than
- * 4 system call parameters, so these system calls used a memory
- * block for parameter passing..
- */
-struct mmap_arg_struct {
-        unsigned long addr;
-        unsigned long len;
-        unsigned long prot;
-        unsigned long flags;
-        unsigned long fd;
-        unsigned long offset;
-};
-extern int old_mmap(unsigned long addr, unsigned long len,
-                    unsigned long prot, unsigned long flags,
-                    unsigned long fd, unsigned long offset);
-long old_mmap_i386(struct mmap_arg_struct __user *arg)
-{
-        struct mmap_arg_struct a;
-        int err = -EFAULT;
-        if (copy_from_user(&a, arg, sizeof(a)))
-                goto out;
-        err = old_mmap(a.addr, a.len, a.prot, a.flags, a.fd, a.offset);
- out:
-        return err;
-}
-struct sel_arg_struct {
-        unsigned long n;
-        fd_set __user *inp;
-        fd_set __user *outp;
-        fd_set __user *exp;
-        struct timeval __user *tvp;
-};
-long old_select(struct sel_arg_struct __user *arg)
-{
-        struct sel_arg_struct a;
-        if (copy_from_user(&a, arg, sizeof(a)))
-                return -EFAULT;
-        /* sys_select() does the appropriate kernel locking */
-        return sys_select(a.n, a.inp, a.outp, a.exp, a.tvp);
-}
-/*
 * The prototype on i386 is:
 *
 *     int clone(int flags, void * child_stack, int * parent_tidptr, struct user_desc * newtls, int * child_tidptr)
@@ -85,92 +34,6 @@ long sys_clone(unsigned long clone_flags, unsigned long newsp,
        return ret;
 }
-/*
- * sys_ipc() is the de-multiplexer for the SysV IPC calls..
- *
- * This is really horribly ugly.
- */
-long sys_ipc (uint call, int first, int second,
-             int third, void __user *ptr, long fifth)
-{
-        int version, ret;
-        version = call >> 16; /* hack for backward compatibility */
-        call &= 0xffff;
-        switch (call) {
-        case SEMOP:
-                return sys_semtimedop(first, (struct sembuf __user *) ptr,
-                                      second, NULL);
-        case SEMTIMEDOP:
-                return sys_semtimedop(first, (struct sembuf __user *) ptr,
-                                      second,
-                                      (const struct timespec __user *) fifth);
-        case SEMGET:
-                return sys_semget (first, second, third);
-        case SEMCTL: {
-                union semun fourth;
-                if (!ptr)
-                        return -EINVAL;
-                if (get_user(fourth.__pad, (void __user * __user *) ptr))
-                        return -EFAULT;
-                return sys_semctl (first, second, third, fourth);
-        }
-        case MSGSND:
-                return sys_msgsnd (first, (struct msgbuf *) ptr,
-                                   second, third);
-        case MSGRCV:
-                switch (version) {
-                case 0: {
-                        struct ipc_kludge tmp;
-                        if (!ptr)
-                                return -EINVAL;
-                        if (copy_from_user(&tmp,
-                                           (struct ipc_kludge *) ptr,
-                                           sizeof (tmp)))
-                                return -EFAULT;
-                        return sys_msgrcv (first, tmp.msgp, second,
-                                           tmp.msgtyp, third);
-                }
-                default:
-                        panic("msgrcv with version != 0");
-                        return sys_msgrcv (first,
-                                           (struct msgbuf *) ptr,
-                                           second, fifth, third);
-                }
-        case MSGGET:
-                return sys_msgget ((key_t) first, second);
-        case MSGCTL:
-                return sys_msgctl (first, second, (struct msqid_ds *) ptr);
-        case SHMAT:
-                switch (version) {
-                default: {
-                        ulong raddr;
-                        ret = do_shmat (first, (char *) ptr, second, &raddr);
-                        if (ret)
-                                return ret;
-                        return put_user (raddr, (ulong *) third);
-                }
-                case 1: /* iBCS2 emulator entry point */
-                        if (!segment_eq(get_fs(), get_ds()))
-                                return -EINVAL;
-                        return do_shmat (first, (char *) ptr, second, (ulong *) third);
-                }
-        case SHMDT:
-                return sys_shmdt ((char *)ptr);
-        case SHMGET:
-                return sys_shmget (first, second, third);
-        case SHMCTL:
-                return sys_shmctl (first, second,
-                                   (struct shmid_ds *) ptr);
-        default:
-                return -ENOSYS;
-        }
-}
 long sys_sigaction(int sig, const struct old_sigaction __user *act,
                         struct old_sigaction __user *oact)
 {

diff --git a/arch/um/sys-i386/syscalls.c b/arch/um/sys-i386/syscalls.c index 857ca0b3bdef..70ca357393b8 100644 --- a/arch/um/sys-i386/syscalls.c +++ b/arch/um/sys-i386/syscalls.c
@@ -12,57 +12,6 @@
12	#include "asm/unistd.h"	12	#include "asm/unistd.h"
13		13
14	/*	14	/*
15	* Perform the select(nd, in, out, ex, tv) and mmap() system
16	* calls. Linux/i386 didn't use to be able to handle more than
17	* 4 system call parameters, so these system calls used a memory
18	* block for parameter passing..
19	*/
20
21	struct mmap_arg_struct {
22	unsigned long addr;
23	unsigned long len;
24	unsigned long prot;
25	unsigned long flags;
26	unsigned long fd;
27	unsigned long offset;
28	};
29
30	extern int old_mmap(unsigned long addr, unsigned long len,
31	unsigned long prot, unsigned long flags,
32	unsigned long fd, unsigned long offset);
33
34	long old_mmap_i386(struct mmap_arg_struct __user *arg)
35	{
36	struct mmap_arg_struct a;
37	int err = -EFAULT;
38
39	if (copy_from_user(&a, arg, sizeof(a)))
40	goto out;
41
42	err = old_mmap(a.addr, a.len, a.prot, a.flags, a.fd, a.offset);
43	out:
44	return err;
45	}
46
47	struct sel_arg_struct {
48	unsigned long n;
49	fd_set __user *inp;
50	fd_set __user *outp;
51	fd_set __user *exp;
52	struct timeval __user *tvp;
53	};
54
55	long old_select(struct sel_arg_struct __user *arg)
56	{
57	struct sel_arg_struct a;
58
59	if (copy_from_user(&a, arg, sizeof(a)))
60	return -EFAULT;
61	/* sys_select() does the appropriate kernel locking */
62	return sys_select(a.n, a.inp, a.outp, a.exp, a.tvp);
63	}
64
65	/*
66	* The prototype on i386 is:	15	* The prototype on i386 is:
67	*	16	*
68	* int clone(int flags, void * child_stack, int * parent_tidptr, struct user_desc * newtls, int * child_tidptr)	17	* int clone(int flags, void * child_stack, int * parent_tidptr, struct user_desc * newtls, int * child_tidptr)
@@ -85,92 +34,6 @@ long sys_clone(unsigned long clone_flags, unsigned long newsp,
85	return ret;	34	return ret;
86	}	35	}
87		36
88	/*
89	* sys_ipc() is the de-multiplexer for the SysV IPC calls..
90	*
91	* This is really horribly ugly.
92	*/
93	long sys_ipc (uint call, int first, int second,
94	int third, void __user *ptr, long fifth)
95	{
96	int version, ret;
97
98	version = call >> 16; /* hack for backward compatibility */
99	call &= 0xffff;
100
101	switch (call) {
102	case SEMOP:
103	return sys_semtimedop(first, (struct sembuf __user *) ptr,
104	second, NULL);
105	case SEMTIMEDOP:
106	return sys_semtimedop(first, (struct sembuf __user *) ptr,
107	second,
108	(const struct timespec __user *) fifth);
109	case SEMGET:
110	return sys_semget (first, second, third);
111	case SEMCTL: {
112	union semun fourth;
113	if (!ptr)
114	return -EINVAL;
115	if (get_user(fourth.__pad, (void __user * __user *) ptr))
116	return -EFAULT;
117	return sys_semctl (first, second, third, fourth);
118	}
119
120	case MSGSND:
121	return sys_msgsnd (first, (struct msgbuf *) ptr,
122	second, third);
123	case MSGRCV:
124	switch (version) {
125	case 0: {
126	struct ipc_kludge tmp;
127	if (!ptr)
128	return -EINVAL;
129
130	if (copy_from_user(&tmp,
131	(struct ipc_kludge *) ptr,
132	sizeof (tmp)))
133	return -EFAULT;
134	return sys_msgrcv (first, tmp.msgp, second,
135	tmp.msgtyp, third);
136	}
137	default:
138	panic("msgrcv with version != 0");
139	return sys_msgrcv (first,
140	(struct msgbuf *) ptr,
141	second, fifth, third);
142	}
143	case MSGGET:
144	return sys_msgget ((key_t) first, second);
145	case MSGCTL:
146	return sys_msgctl (first, second, (struct msqid_ds *) ptr);
147
148	case SHMAT:
149	switch (version) {
150	default: {
151	ulong raddr;
152	ret = do_shmat (first, (char *) ptr, second, &raddr);
153	if (ret)
154	return ret;
155	return put_user (raddr, (ulong *) third);
156	}
157	case 1: /* iBCS2 emulator entry point */
158	if (!segment_eq(get_fs(), get_ds()))
159	return -EINVAL;
160	return do_shmat (first, (char ) ptr, second, (ulong ) third);
161	}
162	case SHMDT:
163	return sys_shmdt ((char *)ptr);
164	case SHMGET:
165	return sys_shmget (first, second, third);
166	case SHMCTL:
167	return sys_shmctl (first, second,
168	(struct shmid_ds *) ptr);
169	default:
170	return -ENOSYS;
171	}
172	}
173
174	long sys_sigaction(int sig, const struct old_sigaction __user *act,	37	long sys_sigaction(int sig, const struct old_sigaction __user *act,
175	struct old_sigaction __user *oact)	38	struct old_sigaction __user *oact)
176	{	39	{