1 files changed, 2 insertions, 153 deletions
diff --git a/arch/frv/kernel/sys_frv.c b/arch/frv/kernel/sys_frv.c
index 2b6b5289cdcc..9c4980825bbb 100644
--- a/arch/frv/kernel/sys_frv.c
+++ b/arch/frv/kernel/sys_frv.c
@@ -31,9 +31,6 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
                          unsigned long prot, unsigned long flags,
                          unsigned long fd, unsigned long pgoff)
 {
-        int error = -EBADF;
-        struct file * file = NULL;
        /* As with sparc32, make sure the shift for mmap2 is constant
           (12), no matter what PAGE_SIZE we have.... */
@@ -41,155 +38,7 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
           trying to map something we can't */
        if (pgoff & ((1 << (PAGE_SHIFT - 12)) - 1))
                return -EINVAL;
-        pgoff >>= PAGE_SHIFT - 12;
-        flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-        if (!(flags & MAP_ANONYMOUS)) {
-                file = fget(fd);
-                if (!file)
-                        goto out;
-        }
-        down_write(&current->mm->mmap_sem);
-        error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-        up_write(&current->mm->mmap_sem);
-        if (file)
-                fput(file);
-out:
-        return error;
-}
-#if 0 /* DAVIDM - do we want this */
-struct mmap_arg_struct64 {
-        __u32 addr;
-        __u32 len;
-        __u32 prot;
-        __u32 flags;
-        __u64 offset; /* 64 bits */
-        __u32 fd;
-};
-asmlinkage long sys_mmap64(struct mmap_arg_struct64 *arg)
-{
-        int error = -EFAULT;
-        struct file * file = NULL;
-        struct mmap_arg_struct64 a;
-        unsigned long pgoff;
-        if (copy_from_user(&a, arg, sizeof(a)))
-                return -EFAULT;
-        if ((long)a.offset & ~PAGE_MASK)
-                return -EINVAL;
-        pgoff = a.offset >> PAGE_SHIFT;
-        if ((a.offset >> PAGE_SHIFT) != pgoff)
-                return -EINVAL;
-        if (!(a.flags & MAP_ANONYMOUS)) {
-                error = -EBADF;
-                file = fget(a.fd);
-                if (!file)
-                        goto out;
-        }
-        a.flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-        down_write(&current->mm->mmap_sem);
-        error = do_mmap_pgoff(file, a.addr, a.len, a.prot, a.flags, pgoff);
-        up_write(&current->mm->mmap_sem);
-        if (file)
-                fput(file);
-out:
-        return error;
-}
-#endif
-/*
- * 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:
+        return sys_mmap_pgoff(addr, len, prot, flags, fd,
-                switch (version) {
+                              pgoff >> (PAGE_SHIFT - 12));
-                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 2b6b5289cdcc..9c4980825bbb 100644 --- a/arch/frv/kernel/sys_frv.c +++ b/arch/frv/kernel/sys_frv.c
@@ -31,9 +31,6 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
31	unsigned long prot, unsigned long flags,	31	unsigned long prot, unsigned long flags,
32	unsigned long fd, unsigned long pgoff)	32	unsigned long fd, unsigned long pgoff)
33	{	33	{
34	int error = -EBADF;
35	struct file * file = NULL;
36
37	/* As with sparc32, make sure the shift for mmap2 is constant	34	/* As with sparc32, make sure the shift for mmap2 is constant
38	(12), no matter what PAGE_SIZE we have.... */	35	(12), no matter what PAGE_SIZE we have.... */
39		36
@@ -41,155 +38,7 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
41	trying to map something we can't */	38	trying to map something we can't */
42	if (pgoff & ((1 << (PAGE_SHIFT - 12)) - 1))	39	if (pgoff & ((1 << (PAGE_SHIFT - 12)) - 1))
43	return -EINVAL;	40	return -EINVAL;
44	pgoff >>= PAGE_SHIFT - 12;
45
46	flags &= ~(MAP_EXECUTABLE \| MAP_DENYWRITE);
47	if (!(flags & MAP_ANONYMOUS)) {
48	file = fget(fd);
49	if (!file)
50	goto out;
51	}
52
53	down_write(&current->mm->mmap_sem);
54	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
55	up_write(&current->mm->mmap_sem);
56
57	if (file)
58	fput(file);
59	out:
60	return error;
61	}
62
63	#if 0 /* DAVIDM - do we want this */
64	struct mmap_arg_struct64 {
65	__u32 addr;
66	__u32 len;
67	__u32 prot;
68	__u32 flags;
69	__u64 offset; /* 64 bits */
70	__u32 fd;
71	};
72
73	asmlinkage long sys_mmap64(struct mmap_arg_struct64 *arg)
74	{
75	int error = -EFAULT;
76	struct file * file = NULL;
77	struct mmap_arg_struct64 a;
78	unsigned long pgoff;
79
80	if (copy_from_user(&a, arg, sizeof(a)))
81	return -EFAULT;
82
83	if ((long)a.offset & ~PAGE_MASK)
84	return -EINVAL;
85
86	pgoff = a.offset >> PAGE_SHIFT;
87	if ((a.offset >> PAGE_SHIFT) != pgoff)
88	return -EINVAL;
89
90	if (!(a.flags & MAP_ANONYMOUS)) {
91	error = -EBADF;
92	file = fget(a.fd);
93	if (!file)
94	goto out;
95	}
96	a.flags &= ~(MAP_EXECUTABLE \| MAP_DENYWRITE);
97
98	down_write(&current->mm->mmap_sem);
99	error = do_mmap_pgoff(file, a.addr, a.len, a.prot, a.flags, pgoff);
100	up_write(&current->mm->mmap_sem);
101	if (file)
102	fput(file);
103	out:
104	return error;
105	}
106	#endif
107
108	/*
109	* sys_ipc() is the de-multiplexer for the SysV IPC calls..
110	*
111	* This is really horribly ugly.
112	*/
113	asmlinkage long sys_ipc(unsigned long call,
114	unsigned long first,
115	unsigned long second,
116	unsigned long third,
117	void __user *ptr,
118	unsigned long fifth)
119	{
120	int version, ret;
121
122	version = call >> 16; /* hack for backward compatibility */
123	call &= 0xffff;
124
125	switch (call) {
126	case SEMOP:
127	return sys_semtimedop(first, (struct sembuf __user *)ptr, second, NULL);
128	case SEMTIMEDOP:
129	return sys_semtimedop(first, (struct sembuf __user *)ptr, second,
130	(const struct timespec __user *)fifth);
131
132	case SEMGET:
133	return sys_semget (first, second, third);
134	case SEMCTL: {
135	union semun fourth;
136	if (!ptr)
137	return -EINVAL;
138	if (get_user(fourth.__pad, (void * __user *) ptr))
139	return -EFAULT;
140	return sys_semctl (first, second, third, fourth);
141	}
142
143	case MSGSND:
144	return sys_msgsnd (first, (struct msgbuf __user *) ptr,
145	second, third);
146	case MSGRCV:
147	switch (version) {
148	case 0: {
149	struct ipc_kludge tmp;
150	if (!ptr)
151	return -EINVAL;
152
153	if (copy_from_user(&tmp,
154	(struct ipc_kludge __user *) ptr,
155	sizeof (tmp)))
156	return -EFAULT;
157	return sys_msgrcv (first, tmp.msgp, second,
158	tmp.msgtyp, third);
159	}
160	default:
161	return sys_msgrcv (first,
162	(struct msgbuf __user *) ptr,
163	second, fifth, third);
164	}
165	case MSGGET:
166	return sys_msgget ((key_t) first, second);
167	case MSGCTL:
168	return sys_msgctl (first, second, (struct msqid_ds __user *) ptr);
169		41
170	case SHMAT:	42	return sys_mmap_pgoff(addr, len, prot, flags, fd,
171	switch (version) {	43	pgoff >> (PAGE_SHIFT - 12));
172	default: {
173	ulong raddr;
174	ret = do_shmat (first, (char __user *) ptr, second, &raddr);
175	if (ret)
176	return ret;
177	return put_user (raddr, (ulong __user *) third);
178	}
179	case 1: /* iBCS2 emulator entry point */
180	if (!segment_eq(get_fs(), get_ds()))
181	return -EINVAL;
182	/* The "(ulong ) third" is valid _only_ because of the kernel segment thing /
183	return do_shmat (first, (char __user ) ptr, second, (ulong ) third);
184	}
185	case SHMDT:
186	return sys_shmdt ((char __user *)ptr);
187	case SHMGET:
188	return sys_shmget (first, second, third);
189	case SHMCTL:
190	return sys_shmctl (first, second,
191	(struct shmid_ds __user *) ptr);
192	default:
193	return -ENOSYS;
194	}
195	}	44	}