1 files changed, 0 insertions, 86 deletions
diff --git a/arch/um/sys-i386/syscalls.c b/arch/um/sys-i386/syscalls.c
index d0aa8f125ee6..70ca357393b8 100644
--- a/arch/um/sys-i386/syscalls.c
+++ b/arch/um/sys-i386/syscalls.c
@@ -34,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 d0aa8f125ee6..70ca357393b8 100644 --- a/arch/um/sys-i386/syscalls.c +++ b/arch/um/sys-i386/syscalls.c
@@ -34,92 +34,6 @@ long sys_clone(unsigned long clone_flags, unsigned long newsp,
34	return ret;	34	return ret;
35	}	35	}
36		36
37	/*
38	* sys_ipc() is the de-multiplexer for the SysV IPC calls..
39	*
40	* This is really horribly ugly.
41	*/
42	long sys_ipc (uint call, int first, int second,
43	int third, void __user *ptr, long fifth)
44	{
45	int version, ret;
46
47	version = call >> 16; /* hack for backward compatibility */
48	call &= 0xffff;
49
50	switch (call) {
51	case SEMOP:
52	return sys_semtimedop(first, (struct sembuf __user *) ptr,
53	second, NULL);
54	case SEMTIMEDOP:
55	return sys_semtimedop(first, (struct sembuf __user *) ptr,
56	second,
57	(const struct timespec __user *) fifth);
58	case SEMGET:
59	return sys_semget (first, second, third);
60	case SEMCTL: {
61	union semun fourth;
62	if (!ptr)
63	return -EINVAL;
64	if (get_user(fourth.__pad, (void __user * __user *) ptr))
65	return -EFAULT;
66	return sys_semctl (first, second, third, fourth);
67	}
68
69	case MSGSND:
70	return sys_msgsnd (first, (struct msgbuf *) ptr,
71	second, third);
72	case MSGRCV:
73	switch (version) {
74	case 0: {
75	struct ipc_kludge tmp;
76	if (!ptr)
77	return -EINVAL;
78
79	if (copy_from_user(&tmp,
80	(struct ipc_kludge *) ptr,
81	sizeof (tmp)))
82	return -EFAULT;
83	return sys_msgrcv (first, tmp.msgp, second,
84	tmp.msgtyp, third);
85	}
86	default:
87	panic("msgrcv with version != 0");
88	return sys_msgrcv (first,
89	(struct msgbuf *) ptr,
90	second, fifth, third);
91	}
92	case MSGGET:
93	return sys_msgget ((key_t) first, second);
94	case MSGCTL:
95	return sys_msgctl (first, second, (struct msqid_ds *) ptr);
96
97	case SHMAT:
98	switch (version) {
99	default: {
100	ulong raddr;
101	ret = do_shmat (first, (char *) ptr, second, &raddr);
102	if (ret)
103	return ret;
104	return put_user (raddr, (ulong *) third);
105	}
106	case 1: /* iBCS2 emulator entry point */
107	if (!segment_eq(get_fs(), get_ds()))
108	return -EINVAL;
109	return do_shmat (first, (char ) ptr, second, (ulong ) third);
110	}
111	case SHMDT:
112	return sys_shmdt ((char *)ptr);
113	case SHMGET:
114	return sys_shmget (first, second, third);
115	case SHMCTL:
116	return sys_shmctl (first, second,
117	(struct shmid_ds *) ptr);
118	default:
119	return -ENOSYS;
120	}
121	}
122
123	long sys_sigaction(int sig, const struct old_sigaction __user *act,	37	long sys_sigaction(int sig, const struct old_sigaction __user *act,
124	struct old_sigaction __user *oact)	38	struct old_sigaction __user *oact)
125	{	39	{