1 files changed, 0 insertions, 94 deletions
diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c
index 3370e62e43d4..5251221e7a5a 100644
--- a/arch/powerpc/kernel/syscalls.c
+++ b/arch/powerpc/kernel/syscalls.c
@@ -42,100 +42,6 @@
 #include <asm/time.h>
 #include <asm/unistd.h>
-/*
- * sys_ipc() is the de-multiplexer for the SysV IPC calls..
- *
- * This is really horribly ugly.
- */
-int sys_ipc(uint call, int first, unsigned long second, long third,
-            void __user *ptr, long fifth)
-{
-        int version, ret;
-        version = call >> 16; /* hack for backward compatibility */
-        call &= 0xffff;
-        ret = -ENOSYS;
-        switch (call) {
-        case SEMOP:
-                ret = sys_semtimedop(first, (struct sembuf __user *)ptr,
-                                      (unsigned)second, NULL);
-                break;
-        case SEMTIMEDOP:
-                ret = sys_semtimedop(first, (struct sembuf __user *)ptr,
-                                      (unsigned)second,
-                                      (const struct timespec __user *) fifth);
-                break;
-        case SEMGET:
-                ret = sys_semget (first, (int)second, third);
-                break;
-        case SEMCTL: {
-                union semun fourth;
-                ret = -EINVAL;
-                if (!ptr)
-                        break;
-                if ((ret = get_user(fourth.__pad, (void __user * __user *)ptr)))
-                        break;
-                ret = sys_semctl(first, (int)second, third, fourth);
-                break;
-        }
-        case MSGSND:
-                ret = sys_msgsnd(first, (struct msgbuf __user *)ptr,
-                                 (size_t)second, third);
-                break;
-        case MSGRCV:
-                switch (version) {
-                case 0: {
-                        struct ipc_kludge tmp;
-                        ret = -EINVAL;
-                        if (!ptr)
-                                break;
-                        if ((ret = copy_from_user(&tmp,
-                                                (struct ipc_kludge __user *) ptr,
-                                                sizeof (tmp)) ? -EFAULT : 0))
-                                break;
-                        ret = sys_msgrcv(first, tmp.msgp, (size_t) second,
-                                          tmp.msgtyp, third);
-                        break;
-                }
-                default:
-                        ret = sys_msgrcv (first, (struct msgbuf __user *) ptr,
-                                          (size_t)second, fifth, third);
-                        break;
-                }
-                break;
-        case MSGGET:
-                ret = sys_msgget((key_t)first, (int)second);
-                break;
-        case MSGCTL:
-                ret = sys_msgctl(first, (int)second,
-                                  (struct msqid_ds __user *)ptr);
-                break;
-        case SHMAT: {
-                ulong raddr;
-                ret = do_shmat(first, (char __user *)ptr, (int)second, &raddr);
-                if (ret)
-                        break;
-                ret = put_user(raddr, (ulong __user *) third);
-                break;
-        }
-        case SHMDT:
-                ret = sys_shmdt((char __user *)ptr);
-                break;
-        case SHMGET:
-                ret = sys_shmget(first, (size_t)second, third);
-                break;
-        case SHMCTL:
-                ret = sys_shmctl(first, (int)second,
-                                 (struct shmid_ds __user *)ptr);
-                break;
-        }
-        return ret;
-}
 static inline unsigned long do_mmap2(unsigned long addr, size_t len,
                        unsigned long prot, unsigned long flags,
                        unsigned long fd, unsigned long off, int shift)

diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c index 3370e62e43d4..5251221e7a5a 100644 --- a/arch/powerpc/kernel/syscalls.c +++ b/arch/powerpc/kernel/syscalls.c
@@ -42,100 +42,6 @@
42	#include <asm/time.h>	42	#include <asm/time.h>
43	#include <asm/unistd.h>	43	#include <asm/unistd.h>
44		44
45	/*
46	* sys_ipc() is the de-multiplexer for the SysV IPC calls..
47	*
48	* This is really horribly ugly.
49	*/
50	int sys_ipc(uint call, int first, unsigned long second, long third,
51	void __user *ptr, long fifth)
52	{
53	int version, ret;
54
55	version = call >> 16; /* hack for backward compatibility */
56	call &= 0xffff;
57
58	ret = -ENOSYS;
59	switch (call) {
60	case SEMOP:
61	ret = sys_semtimedop(first, (struct sembuf __user *)ptr,
62	(unsigned)second, NULL);
63	break;
64	case SEMTIMEDOP:
65	ret = sys_semtimedop(first, (struct sembuf __user *)ptr,
66	(unsigned)second,
67	(const struct timespec __user *) fifth);
68	break;
69	case SEMGET:
70	ret = sys_semget (first, (int)second, third);
71	break;
72	case SEMCTL: {
73	union semun fourth;
74
75	ret = -EINVAL;
76	if (!ptr)
77	break;
78	if ((ret = get_user(fourth.__pad, (void __user * __user *)ptr)))
79	break;
80	ret = sys_semctl(first, (int)second, third, fourth);
81	break;
82	}
83	case MSGSND:
84	ret = sys_msgsnd(first, (struct msgbuf __user *)ptr,
85	(size_t)second, third);
86	break;
87	case MSGRCV:
88	switch (version) {
89	case 0: {
90	struct ipc_kludge tmp;
91
92	ret = -EINVAL;
93	if (!ptr)
94	break;
95	if ((ret = copy_from_user(&tmp,
96	(struct ipc_kludge __user *) ptr,
97	sizeof (tmp)) ? -EFAULT : 0))
98	break;
99	ret = sys_msgrcv(first, tmp.msgp, (size_t) second,
100	tmp.msgtyp, third);
101	break;
102	}
103	default:
104	ret = sys_msgrcv (first, (struct msgbuf __user *) ptr,
105	(size_t)second, fifth, third);
106	break;
107	}
108	break;
109	case MSGGET:
110	ret = sys_msgget((key_t)first, (int)second);
111	break;
112	case MSGCTL:
113	ret = sys_msgctl(first, (int)second,
114	(struct msqid_ds __user *)ptr);
115	break;
116	case SHMAT: {
117	ulong raddr;
118	ret = do_shmat(first, (char __user *)ptr, (int)second, &raddr);
119	if (ret)
120	break;
121	ret = put_user(raddr, (ulong __user *) third);
122	break;
123	}
124	case SHMDT:
125	ret = sys_shmdt((char __user *)ptr);
126	break;
127	case SHMGET:
128	ret = sys_shmget(first, (size_t)second, third);
129	break;
130	case SHMCTL:
131	ret = sys_shmctl(first, (int)second,
132	(struct shmid_ds __user *)ptr);
133	break;
134	}
135
136	return ret;
137	}
138
139	static inline unsigned long do_mmap2(unsigned long addr, size_t len,	45	static inline unsigned long do_mmap2(unsigned long addr, size_t len,
140	unsigned long prot, unsigned long flags,	46	unsigned long prot, unsigned long flags,
141	unsigned long fd, unsigned long off, int shift)	47	unsigned long fd, unsigned long off, int shift)