2 files changed, 1 insertions, 88 deletions
diff --git a/arch/mn10300/include/asm/unistd.h b/arch/mn10300/include/asm/unistd.h
index d13a56e99ba..9d056f51592 100644
--- a/arch/mn10300/include/asm/unistd.h
+++ b/arch/mn10300/include/asm/unistd.h
@@ -363,6 +363,7 @@
 #define __ARCH_WANT_STAT64
 #define __ARCH_WANT_SYS_ALARM
 #define __ARCH_WANT_SYS_GETHOSTNAME
+#define __ARCH_WANT_SYS_IPC
 #define __ARCH_WANT_SYS_PAUSE
 #define __ARCH_WANT_SYS_SGETMASK
 #define __ARCH_WANT_SYS_SIGNAL
diff --git a/arch/mn10300/kernel/sys_mn10300.c b/arch/mn10300/kernel/sys_mn10300.c
index bef69d6daf1..815f1355fad 100644
--- a/arch/mn10300/kernel/sys_mn10300.c
+++ b/arch/mn10300/kernel/sys_mn10300.c
@@ -31,91 +31,3 @@ asmlinkage long old_mmap(unsigned long addr, unsigned long len,
                return -EINVAL;
        return sys_mmap_pgoff(addr, len, prot, flags, fd, offset >> PAGE_SHIFT);
 }
-/*
- * sys_ipc() is the de-multiplexer for the SysV IPC calls..
- *
- * This is really horribly ugly.
- */
-asmlinkage 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 __user *) 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 __user *) ptr,
-                                           sizeof(tmp)))
-                                return -EFAULT;
-                        return sys_msgrcv(first, tmp.msgp, second,
-                                          tmp.msgtyp, third);
-                }
-                default:
-                        return sys_msgrcv(first,
-                                          (struct msgbuf __user *) ptr,
-                                           second, fifth, third);
-                }
-        case MSGGET:
-                return sys_msgget((key_t) first, second);
-        case MSGCTL:
-                return sys_msgctl(first, second,
-                                   (struct msqid_ds __user *) ptr);
-        case SHMAT:
-                switch (version) {
-                default: {
-                        ulong raddr;
-                        ret = do_shmat(first, (char __user *) 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 __user *) ptr, second,
-                                        (ulong *) third);
-                }
-        case SHMDT:
-                return sys_shmdt((char __user *)ptr);
-        case SHMGET:
-                return sys_shmget(first, second, third);
-        case SHMCTL:
-                return sys_shmctl(first, second,
-                                  (struct shmid_ds __user *) ptr);
-        default:
-                return -EINVAL;
-        }
-}

diff --git a/arch/mn10300/include/asm/unistd.h b/arch/mn10300/include/asm/unistd.h index d13a56e99ba..9d056f51592 100644 --- a/arch/mn10300/include/asm/unistd.h +++ b/arch/mn10300/include/asm/unistd.h
@@ -363,6 +363,7 @@
363	#define __ARCH_WANT_STAT64	363	#define __ARCH_WANT_STAT64
364	#define __ARCH_WANT_SYS_ALARM	364	#define __ARCH_WANT_SYS_ALARM
365	#define __ARCH_WANT_SYS_GETHOSTNAME	365	#define __ARCH_WANT_SYS_GETHOSTNAME
		366	#define __ARCH_WANT_SYS_IPC
366	#define __ARCH_WANT_SYS_PAUSE	367	#define __ARCH_WANT_SYS_PAUSE
367	#define __ARCH_WANT_SYS_SGETMASK	368	#define __ARCH_WANT_SYS_SGETMASK
368	#define __ARCH_WANT_SYS_SIGNAL	369	#define __ARCH_WANT_SYS_SIGNAL


diff --git a/arch/mn10300/kernel/sys_mn10300.c b/arch/mn10300/kernel/sys_mn10300.c index bef69d6daf1..815f1355fad 100644 --- a/arch/mn10300/kernel/sys_mn10300.c +++ b/arch/mn10300/kernel/sys_mn10300.c
@@ -31,91 +31,3 @@ asmlinkage long old_mmap(unsigned long addr, unsigned long len,
31	return -EINVAL;	31	return -EINVAL;
32	return sys_mmap_pgoff(addr, len, prot, flags, fd, offset >> PAGE_SHIFT);	32	return sys_mmap_pgoff(addr, len, prot, flags, fd, offset >> PAGE_SHIFT);
33	}	33	}
34
35	/*
36	* sys_ipc() is the de-multiplexer for the SysV IPC calls..
37	*
38	* This is really horribly ugly.
39	*/
40	asmlinkage long sys_ipc(uint call, int first, int second,
41	int third, void __user *ptr, long fifth)
42	{
43	int version, ret;
44
45	version = call >> 16; /* hack for backward compatibility */
46	call &= 0xffff;
47
48	switch (call) {
49	case SEMOP:
50	return sys_semtimedop(first, (struct sembuf __user *)ptr,
51	second, NULL);
52	case SEMTIMEDOP:
53	return sys_semtimedop(first, (struct sembuf __user *)ptr,
54	second,
55	(const struct timespec __user *)fifth);
56	case SEMGET:
57	return sys_semget(first, second, third);
58	case SEMCTL: {
59	union semun fourth;
60	if (!ptr)
61	return -EINVAL;
62	if (get_user(fourth.__pad, (void __user * __user *) ptr))
63	return -EFAULT;
64	return sys_semctl(first, second, third, fourth);
65	}
66
67	case MSGSND:
68	return sys_msgsnd(first, (struct msgbuf __user *) ptr,
69	second, third);
70	case MSGRCV:
71	switch (version) {
72	case 0: {
73	struct ipc_kludge tmp;
74	if (!ptr)
75	return -EINVAL;
76
77	if (copy_from_user(&tmp,
78	(struct ipc_kludge __user *) ptr,
79	sizeof(tmp)))
80	return -EFAULT;
81	return sys_msgrcv(first, tmp.msgp, second,
82	tmp.msgtyp, third);
83	}
84	default:
85	return sys_msgrcv(first,
86	(struct msgbuf __user *) ptr,
87	second, fifth, third);
88	}
89	case MSGGET:
90	return sys_msgget((key_t) first, second);
91	case MSGCTL:
92	return sys_msgctl(first, second,
93	(struct msqid_ds __user *) ptr);
94
95	case SHMAT:
96	switch (version) {
97	default: {
98	ulong raddr;
99	ret = do_shmat(first, (char __user *) ptr, second,
100	&raddr);
101	if (ret)
102	return ret;
103	return put_user(raddr, (ulong *) third);
104	}
105	case 1: /* iBCS2 emulator entry point */
106	if (!segment_eq(get_fs(), get_ds()))
107	return -EINVAL;
108	return do_shmat(first, (char __user *) ptr, second,
109	(ulong *) third);
110	}
111	case SHMDT:
112	return sys_shmdt((char __user *)ptr);
113	case SHMGET:
114	return sys_shmget(first, second, third);
115	case SHMCTL:
116	return sys_shmctl(first, second,
117	(struct shmid_ds __user *) ptr);
118	default:
119	return -EINVAL;
120	}
121	}