1 files changed, 0 insertions, 129 deletions
diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c
index ae4027bd01bd..4350f75e578c 100644
--- a/arch/arm/kernel/sys_arm.c
+++ b/arch/arm/kernel/sys_arm.c
@@ -28,135 +28,6 @@
 #include <linux/ipc.h>
 #include <linux/uaccess.h>
-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)
-{
-        int error = -EFAULT;
-        struct mmap_arg_struct a;
-        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;
-}
-/*
- * Perform the select(nd, in, out, ex, tv) and mmap() system
- * calls.
- */
-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);
-}
-#if !defined(CONFIG_AEABI) || defined(CONFIG_OABI_COMPAT)
-/*
- * 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;
-        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 __user *)third);
-                }
-                case 1: /* Of course, we don't support iBCS2! */
-                        return -EINVAL;
-                }
-        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;
-        }
-}
-#endif
 /* Fork a new task - this creates a new program thread.
 * This is called indirectly via a small wrapper
 */

diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c index ae4027bd01bd..4350f75e578c 100644 --- a/arch/arm/kernel/sys_arm.c +++ b/arch/arm/kernel/sys_arm.c
@@ -28,135 +28,6 @@
28	#include <linux/ipc.h>	28	#include <linux/ipc.h>
29	#include <linux/uaccess.h>	29	#include <linux/uaccess.h>
30		30
31	struct mmap_arg_struct {
32	unsigned long addr;
33	unsigned long len;
34	unsigned long prot;
35	unsigned long flags;
36	unsigned long fd;
37	unsigned long offset;
38	};
39
40	asmlinkage int old_mmap(struct mmap_arg_struct __user *arg)
41	{
42	int error = -EFAULT;
43	struct mmap_arg_struct a;
44
45	if (copy_from_user(&a, arg, sizeof(a)))
46	goto out;
47
48	error = -EINVAL;
49	if (a.offset & ~PAGE_MASK)
50	goto out;
51
52	error = sys_mmap_pgoff(a.addr, a.len, a.prot, a.flags, a.fd, a.offset >> PAGE_SHIFT);
53	out:
54	return error;
55	}
56
57	/*
58	* Perform the select(nd, in, out, ex, tv) and mmap() system
59	* calls.
60	*/
61
62	struct sel_arg_struct {
63	unsigned long n;
64	fd_set __user inp, outp, *exp;
65	struct timeval __user *tvp;
66	};
67
68	asmlinkage int old_select(struct sel_arg_struct __user *arg)
69	{
70	struct sel_arg_struct a;
71
72	if (copy_from_user(&a, arg, sizeof(a)))
73	return -EFAULT;
74	/* sys_select() does the appropriate kernel locking */
75	return sys_select(a.n, a.inp, a.outp, a.exp, a.tvp);
76	}
77
78	#if !defined(CONFIG_AEABI) \|\| defined(CONFIG_OABI_COMPAT)
79	/*
80	* sys_ipc() is the de-multiplexer for the SysV IPC calls..
81	*
82	* This is really horribly ugly.
83	*/
84	asmlinkage int sys_ipc(uint call, int first, int second, int third,
85	void __user *ptr, long fifth)
86	{
87	int version, ret;
88
89	version = call >> 16; /* hack for backward compatibility */
90	call &= 0xffff;
91
92	switch (call) {
93	case SEMOP:
94	return sys_semtimedop (first, (struct sembuf __user *)ptr, second, NULL);
95	case SEMTIMEDOP:
96	return sys_semtimedop(first, (struct sembuf __user *)ptr, second,
97	(const struct timespec __user *)fifth);
98
99	case SEMGET:
100	return sys_semget (first, second, third);
101	case SEMCTL: {
102	union semun fourth;
103	if (!ptr)
104	return -EINVAL;
105	if (get_user(fourth.__pad, (void __user * __user *) ptr))
106	return -EFAULT;
107	return sys_semctl (first, second, third, fourth);
108	}
109
110	case MSGSND:
111	return sys_msgsnd(first, (struct msgbuf __user *) ptr,
112	second, third);
113	case MSGRCV:
114	switch (version) {
115	case 0: {
116	struct ipc_kludge tmp;
117	if (!ptr)
118	return -EINVAL;
119	if (copy_from_user(&tmp,(struct ipc_kludge __user *)ptr,
120	sizeof (tmp)))
121	return -EFAULT;
122	return sys_msgrcv (first, tmp.msgp, second,
123	tmp.msgtyp, third);
124	}
125	default:
126	return sys_msgrcv (first,
127	(struct msgbuf __user *) ptr,
128	second, fifth, third);
129	}
130	case MSGGET:
131	return sys_msgget ((key_t) first, second);
132	case MSGCTL:
133	return sys_msgctl(first, second, (struct msqid_ds __user *)ptr);
134
135	case SHMAT:
136	switch (version) {
137	default: {
138	ulong raddr;
139	ret = do_shmat(first, (char __user *)ptr, second, &raddr);
140	if (ret)
141	return ret;
142	return put_user(raddr, (ulong __user *)third);
143	}
144	case 1: /* Of course, we don't support iBCS2! */
145	return -EINVAL;
146	}
147	case SHMDT:
148	return sys_shmdt ((char __user *)ptr);
149	case SHMGET:
150	return sys_shmget (first, second, third);
151	case SHMCTL:
152	return sys_shmctl (first, second,
153	(struct shmid_ds __user *) ptr);
154	default:
155	return -ENOSYS;
156	}
157	}
158	#endif
159
160	/* Fork a new task - this creates a new program thread.	31	/* Fork a new task - this creates a new program thread.
161	* This is called indirectly via a small wrapper	32	* This is called indirectly via a small wrapper
162	*/	33	*/