|
@@ -33,13 +33,12 @@
|
|
|
#include "entry.h"
|
|
|
|
|
|
/*
|
|
|
- * Perform the select(nd, in, out, ex, tv) and mmap() system
|
|
|
- * calls. Linux for S/390 isn't able to handle more than 5
|
|
|
- * system call parameters, so these system calls used a memory
|
|
|
- * block for parameter passing..
|
|
|
+ * Perform the mmap() system call. Linux for S/390 isn't able to handle more
|
|
|
+ * than 5 system call parameters, so this system call uses a memory block
|
|
|
+ * for parameter passing.
|
|
|
*/
|
|
|
|
|
|
-struct mmap_arg_struct {
|
|
|
+struct s390_mmap_arg_struct {
|
|
|
unsigned long addr;
|
|
|
unsigned long len;
|
|
|
unsigned long prot;
|
|
@@ -48,9 +47,9 @@ struct mmap_arg_struct {
|
|
|
unsigned long offset;
|
|
|
};
|
|
|
|
|
|
-SYSCALL_DEFINE1(mmap2, struct mmap_arg_struct __user *, arg)
|
|
|
+SYSCALL_DEFINE1(mmap2, struct s390_mmap_arg_struct __user *, arg)
|
|
|
{
|
|
|
- struct mmap_arg_struct a;
|
|
|
+ struct s390_mmap_arg_struct a;
|
|
|
int error = -EFAULT;
|
|
|
|
|
|
if (copy_from_user(&a, arg, sizeof(a)))
|
|
@@ -60,23 +59,6 @@ out:
|
|
|
return error;
|
|
|
}
|
|
|
|
|
|
-SYSCALL_DEFINE1(s390_old_mmap, struct mmap_arg_struct __user *, arg)
|
|
|
-{
|
|
|
- struct mmap_arg_struct a;
|
|
|
- long 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;
|
|
|
-}
|
|
|
-
|
|
|
/*
|
|
|
* sys_ipc() is the de-multiplexer for the SysV IPC calls..
|
|
|
*
|