1 files changed, 0 insertions, 89 deletions
diff --git a/arch/frv/kernel/sys_frv.c b/arch/frv/kernel/sys_frv.c
index 1d3d4c9e2521..9c4980825bbb 100644
--- a/arch/frv/kernel/sys_frv.c
+++ b/arch/frv/kernel/sys_frv.c
@@ -42,92 +42,3 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
        return sys_mmap_pgoff(addr, len, prot, flags, fd,
                              pgoff >> (PAGE_SHIFT - 12));
 }
-/*
- * sys_ipc() is the de-multiplexer for the SysV IPC calls..
- *
- * This is really horribly ugly.
- */
-asmlinkage long sys_ipc(unsigned long call,
-                        unsigned long first,
-                        unsigned long second,
-                        unsigned long third,
-                        void __user *ptr,
-                        unsigned 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 *) 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 __user *) third);
-                }
-                case 1: /* iBCS2 emulator entry point */
-                        if (!segment_eq(get_fs(), get_ds()))
-                                return -EINVAL;
-                        /* The "(ulong *) third" is valid _only_ because of the kernel segment thing */
-                        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 -ENOSYS;
-        }
-}

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