1 files changed, 0 insertions, 131 deletions
diff --git a/arch/m68k/kernel/sys_m68k.c b/arch/m68k/kernel/sys_m68k.c
index e3ad2d671973..77896692eb0a 100644
--- a/arch/m68k/kernel/sys_m68k.c
+++ b/arch/m68k/kernel/sys_m68k.c
@@ -46,137 +46,6 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
        return sys_mmap_pgoff(addr, len, prot, flags, fd, pgoff);
 }
-/*
- * Perform the select(nd, in, out, ex, tv) and mmap() system
- * calls. Linux/m68k cloned Linux/i386, which 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;
-};
-asmlinkage int old_mmap(struct mmap_arg_struct __user *arg)
-{
-        struct mmap_arg_struct a;
-        int error = -EFAULT;
-        if (copy_from_user(&a, arg, sizeof(a)))
-                goto out;
-        error = -EINVAL;
-        if (a.offset & ~PAGE_MASK)
-                goto out;
-        error = sys_mmap_pgoff(a.addr, a.len, a.prot, a.flags, a.fd,
-                               a.offset >> PAGE_SHIFT);
-out:
-        return error;
-}
-struct sel_arg_struct {
-        unsigned long n;
-        fd_set __user *inp, *outp, *exp;
-        struct timeval __user *tvp;
-};
-asmlinkage int 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);
-}
-/*
- * sys_ipc() is the de-multiplexer for the SysV IPC calls..
- *
- * This is really horribly ugly.
- */
-asmlinkage int 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;
-        if (call <= SEMCTL)
-                switch (call) {
-                case SEMOP:
-                        return sys_semop (first, ptr, second);
-                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);
-                        }
-                default:
-                        return -ENOSYS;
-                }
-        if (call <= MSGCTL)
-                switch (call) {
-                case MSGSND:
-                        return sys_msgsnd (first, ptr, second, third);
-                case MSGRCV:
-                        switch (version) {
-                        case 0: {
-                                struct ipc_kludge tmp;
-                                if (!ptr)
-                                        return -EINVAL;
-                                if (copy_from_user (&tmp, ptr, sizeof (tmp)))
-                                        return -EFAULT;
-                                return sys_msgrcv (first, tmp.msgp, second,
-                                                   tmp.msgtyp, third);
-                                }
-                        default:
-                                return sys_msgrcv (first, ptr,
-                                                   second, fifth, third);
-                        }
-                case MSGGET:
-                        return sys_msgget ((key_t) first, second);
-                case MSGCTL:
-                        return sys_msgctl (first, second, ptr);
-                default:
-                        return -ENOSYS;
-                }
-        if (call <= SHMCTL)
-                switch (call) {
-                case SHMAT:
-                        switch (version) {
-                        default: {
-                                ulong raddr;
-                                ret = do_shmat (first, ptr, second, &raddr);
-                                if (ret)
-                                        return ret;
-                                return put_user (raddr, (ulong __user *) third);
-                        }
-                        }
-                case SHMDT:
-                        return sys_shmdt (ptr);
-                case SHMGET:
-                        return sys_shmget (first, second, third);
-                case SHMCTL:
-                        return sys_shmctl (first, second, ptr);
-                default:
-                        return -ENOSYS;
-                }
-        return -EINVAL;
-}
 /* Convert virtual (user) address VADDR to physical address PADDR */
 #define virt_to_phys_040(vaddr)                                         \
 ({                                                                      \

diff --git a/arch/m68k/kernel/sys_m68k.c b/arch/m68k/kernel/sys_m68k.c index e3ad2d671973..77896692eb0a 100644 --- a/arch/m68k/kernel/sys_m68k.c +++ b/arch/m68k/kernel/sys_m68k.c
@@ -46,137 +46,6 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
46	return sys_mmap_pgoff(addr, len, prot, flags, fd, pgoff);	46	return sys_mmap_pgoff(addr, len, prot, flags, fd, pgoff);
47	}	47	}
48		48
49	/*
50	* Perform the select(nd, in, out, ex, tv) and mmap() system
51	* calls. Linux/m68k cloned Linux/i386, which didn't use to be able to
52	* handle more than 4 system call parameters, so these system calls
53	* used a memory block for parameter passing..
54	*/
55
56	struct mmap_arg_struct {
57	unsigned long addr;
58	unsigned long len;
59	unsigned long prot;
60	unsigned long flags;
61	unsigned long fd;
62	unsigned long offset;
63	};
64
65	asmlinkage int old_mmap(struct mmap_arg_struct __user *arg)
66	{
67	struct mmap_arg_struct a;
68	int error = -EFAULT;
69
70	if (copy_from_user(&a, arg, sizeof(a)))
71	goto out;
72
73	error = -EINVAL;
74	if (a.offset & ~PAGE_MASK)
75	goto out;
76
77	error = sys_mmap_pgoff(a.addr, a.len, a.prot, a.flags, a.fd,
78	a.offset >> PAGE_SHIFT);
79	out:
80	return error;
81	}
82
83	struct sel_arg_struct {
84	unsigned long n;
85	fd_set __user inp, outp, *exp;
86	struct timeval __user *tvp;
87	};
88
89	asmlinkage int old_select(struct sel_arg_struct __user *arg)
90	{
91	struct sel_arg_struct a;
92
93	if (copy_from_user(&a, arg, sizeof(a)))
94	return -EFAULT;
95	/* sys_select() does the appropriate kernel locking */
96	return sys_select(a.n, a.inp, a.outp, a.exp, a.tvp);
97	}
98
99	/*
100	* sys_ipc() is the de-multiplexer for the SysV IPC calls..
101	*
102	* This is really horribly ugly.
103	*/
104	asmlinkage int sys_ipc (uint call, int first, int second,
105	int third, void __user *ptr, long fifth)
106	{
107	int version, ret;
108
109	version = call >> 16; /* hack for backward compatibility */
110	call &= 0xffff;
111
112	if (call <= SEMCTL)
113	switch (call) {
114	case SEMOP:
115	return sys_semop (first, ptr, second);
116	case SEMGET:
117	return sys_semget (first, second, third);
118	case SEMCTL: {
119	union semun fourth;
120	if (!ptr)
121	return -EINVAL;
122	if (get_user(fourth.__pad, (void __user __user ) ptr))
123	return -EFAULT;
124	return sys_semctl (first, second, third, fourth);
125	}
126	default:
127	return -ENOSYS;
128	}
129	if (call <= MSGCTL)
130	switch (call) {
131	case MSGSND:
132	return sys_msgsnd (first, ptr, second, third);
133	case MSGRCV:
134	switch (version) {
135	case 0: {
136	struct ipc_kludge tmp;
137	if (!ptr)
138	return -EINVAL;
139	if (copy_from_user (&tmp, ptr, sizeof (tmp)))
140	return -EFAULT;
141	return sys_msgrcv (first, tmp.msgp, second,
142	tmp.msgtyp, third);
143	}
144	default:
145	return sys_msgrcv (first, ptr,
146	second, fifth, third);
147	}
148	case MSGGET:
149	return sys_msgget ((key_t) first, second);
150	case MSGCTL:
151	return sys_msgctl (first, second, ptr);
152	default:
153	return -ENOSYS;
154	}
155	if (call <= SHMCTL)
156	switch (call) {
157	case SHMAT:
158	switch (version) {
159	default: {
160	ulong raddr;
161	ret = do_shmat (first, ptr, second, &raddr);
162	if (ret)
163	return ret;
164	return put_user (raddr, (ulong __user *) third);
165	}
166	}
167	case SHMDT:
168	return sys_shmdt (ptr);
169	case SHMGET:
170	return sys_shmget (first, second, third);
171	case SHMCTL:
172	return sys_shmctl (first, second, ptr);
173	default:
174	return -ENOSYS;
175	}
176
177	return -EINVAL;
178	}
179
180	/* Convert virtual (user) address VADDR to physical address PADDR */	49	/* Convert virtual (user) address VADDR to physical address PADDR */
181	#define virt_to_phys_040(vaddr) \	50	#define virt_to_phys_040(vaddr) \
182	({ \	51	({ \