diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
| commit | f969d69ba9f952e5bdd38278e25e26a3e4a61a70 (patch) | |
| tree | b3530d803df59d726afaabebc6626987dee1ca05 /arch/sh/kernel/sys_sh.c | |
| parent | a10ce7ef2066b455d69187643ddf2073bfc4db24 (diff) | |
Merge with 2.3.27.
Diffstat (limited to 'arch/sh/kernel/sys_sh.c')
| -rw-r--r-- | arch/sh/kernel/sys_sh.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/sh/kernel/sys_sh.c b/arch/sh/kernel/sys_sh.c index a485f10a3..8f480f764 100644 --- a/arch/sh/kernel/sys_sh.c +++ b/arch/sh/kernel/sys_sh.c @@ -44,9 +44,8 @@ asmlinkage int sys_pipe(unsigned long * fildes) } asmlinkage unsigned long -sys_mmap(int fd, unsigned long addr, - unsigned long len, unsigned long prot, - unsigned long flags, unsigned long off) +sys_mmap(unsigned long addr, unsigned long len, unsigned long prot, + unsigned long flags, int fd, unsigned long off) { int error = -EFAULT; struct file *file = NULL; |