diff options
Diffstat (limited to 'arch/m68knommu/kernel')
-rw-r--r-- | arch/m68knommu/kernel/sys_m68k.c | 34 | ||||
-rw-r--r-- | arch/m68knommu/kernel/syscalltable.S | 2 |
2 files changed, 1 insertions, 35 deletions
diff --git a/arch/m68knommu/kernel/sys_m68k.c b/arch/m68knommu/kernel/sys_m68k.c index e0d3f13e77a8..3e371cc9fd91 100644 --- a/arch/m68knommu/kernel/sys_m68k.c +++ b/arch/m68knommu/kernel/sys_m68k.c | |||
@@ -28,40 +28,6 @@ | |||
28 | #include <asm/unistd.h> | 28 | #include <asm/unistd.h> |
29 | 29 | ||
30 | /* | 30 | /* |
31 | * Perform the select(nd, in, out, ex, tv) and mmap() system | ||
32 | * calls. Linux/m68k cloned Linux/i386, which didn't use to be able to | ||
33 | * handle more than 4 system call parameters, so these system calls | ||
34 | * used a memory block for parameter passing.. | ||
35 | */ | ||
36 | |||
37 | struct mmap_arg_struct { | ||
38 | unsigned long addr; | ||
39 | unsigned long len; | ||
40 | unsigned long prot; | ||
41 | unsigned long flags; | ||
42 | unsigned long fd; | ||
43 | unsigned long offset; | ||
44 | }; | ||
45 | |||
46 | asmlinkage int old_mmap(struct mmap_arg_struct *arg) | ||
47 | { | ||
48 | struct mmap_arg_struct a; | ||
49 | int error = -EFAULT; | ||
50 | |||
51 | if (copy_from_user(&a, arg, sizeof(a))) | ||
52 | goto out; | ||
53 | |||
54 | error = -EINVAL; | ||
55 | if (a.offset & ~PAGE_MASK) | ||
56 | goto out; | ||
57 | |||
58 | error = sys_mmap_pgoff(a.addr, a.len, a.prot, a.flags, a.fd, | ||
59 | a.offset >> PAGE_SHIFT); | ||
60 | out: | ||
61 | return error; | ||
62 | } | ||
63 | |||
64 | /* | ||
65 | * sys_ipc() is the de-multiplexer for the SysV IPC calls.. | 31 | * sys_ipc() is the de-multiplexer for the SysV IPC calls.. |
66 | * | 32 | * |
67 | * This is really horribly ugly. | 33 | * This is really horribly ugly. |
diff --git a/arch/m68knommu/kernel/syscalltable.S b/arch/m68knommu/kernel/syscalltable.S index 405738351700..b30b3eb197a5 100644 --- a/arch/m68knommu/kernel/syscalltable.S +++ b/arch/m68knommu/kernel/syscalltable.S | |||
@@ -108,7 +108,7 @@ ENTRY(sys_call_table) | |||
108 | .long sys_ni_syscall /* sys_swapon */ | 108 | .long sys_ni_syscall /* sys_swapon */ |
109 | .long sys_reboot | 109 | .long sys_reboot |
110 | .long sys_old_readdir | 110 | .long sys_old_readdir |
111 | .long old_mmap /* 90 */ | 111 | .long sys_old_mmap /* 90 */ |
112 | .long sys_munmap | 112 | .long sys_munmap |
113 | .long sys_truncate | 113 | .long sys_truncate |
114 | .long sys_ftruncate | 114 | .long sys_ftruncate |