diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
| commit | b9558d5f86c471a125abf1fb3a3882fb053b1f8c (patch) | |
| tree | 707b53ec64e740a7da87d5f36485e3cd9b1c794e /arch/m68k/kernel/sys_m68k.c | |
| parent | b3ac367c7a3e6047abe74817db27e34e759f279f (diff) | |
Merge with Linux 2.3.41.
Diffstat (limited to 'arch/m68k/kernel/sys_m68k.c')
| -rw-r--r-- | arch/m68k/kernel/sys_m68k.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/m68k/kernel/sys_m68k.c b/arch/m68k/kernel/sys_m68k.c index 1387f594b..46ddcc1a0 100644 --- a/arch/m68k/kernel/sys_m68k.c +++ b/arch/m68k/kernel/sys_m68k.c @@ -111,11 +111,12 @@ asmlinkage int old_mmap(struct mmap_arg_struct *arg) a.flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE); - error = do_mmap2(file, a.addr, a.len, a.prot, a.flags, a.offset >> PAGE_SHIFT); + error = do_mmap2(a.addr, a.len, a.prot, a.flags, a.fd, a.offset >> PAGE_SHIFT); out: return error; } +#if 0 struct mmap_arg_struct64 { __u32 addr; __u32 len; @@ -160,6 +161,7 @@ out: up(¤t->mm->mmap_sem); return error; } +#endif extern asmlinkage int sys_select(int, fd_set *, fd_set *, fd_set *, struct timeval *); |