Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 9 insertions, 15 deletions

diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index 9a3334ae282e..de9d39717808 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -20,7 +20,6 @@
 #include <linux/syscalls.h>
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
-#include <linux/slab.h>
 #include <linux/user.h>
 #include <linux/utsname.h>
 #include <linux/time.h>
@@ -37,6 +36,7 @@
 #include <linux/uio.h>
 #include <linux/vfs.h>
 #include <linux/rcupdate.h>
+#include <linux/slab.h>
 
 #include <asm/fpu.h>
 #include <asm/io.h>
@@ -178,25 +178,18 @@ SYSCALL_DEFINE6(osf_mmap, unsigned long, addr, unsigned long, len,
                 unsigned long, prot, unsigned long, flags, unsigned long, fd,
                 unsigned long, off)
 {
-        struct file *file = NULL;
-        unsigned long ret = -EBADF;
+        unsigned long ret = -EINVAL;
 
 #if 0
         if (flags & (_MAP_HASSEMAPHORE | _MAP_INHERIT | _MAP_UNALIGNED))
                 printk("%s: unimplemented OSF mmap flags %04lx\n", 
                         current->comm, flags);
 #endif
-        if (!(flags & MAP_ANONYMOUS)) {
-                file = fget(fd);
-                if (!file)
-                        goto out;
-        }
-        flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-        down_write(&current->mm->mmap_sem);
-        ret = do_mmap(file, addr, len, prot, flags, off);
-        up_write(&current->mm->mmap_sem);
-        if (file)
-                fput(file);
+        if ((off + PAGE_ALIGN(len)) < off)
+                goto out;
+        if (off & ~PAGE_MASK)
+                goto out;
+        ret = sys_mmap_pgoff(addr, len, prot, flags, fd, off >> PAGE_SHIFT);
  out:
         return ret;
 }
@@ -368,7 +361,7 @@ osf_procfs_mount(char *dirname, struct procfs_args __user *args, int flags)
 SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, char __user *, path,
                 int, flag, void __user *, data)
 {
-        int retval = -EINVAL;
+        int retval;
         char *name;
 
         name = getname(path);
@@ -386,6 +379,7 @@ SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, char __user *, path,
                 retval = osf_procfs_mount(name, data, flag);
                 break;
         default:
+                retval = -EINVAL;
                 printk("osf_mount(%ld, %x)\n", typenr, flag);
         }
         putname(name);