Merge with Linus' kernel.

1 files changed, 13 insertions, 5 deletions

diff --git a/ipc/shm.c b/ipc/shm.c
index 587d836d80d9..0ef4a1cf3e27 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -157,14 +157,22 @@ static void shm_close (struct vm_area_struct *shmd)
 
 static int shm_mmap(struct file * file, struct vm_area_struct * vma)
 {
-        file_accessed(file);
-        vma->vm_ops = &shm_vm_ops;
-        shm_inc(file->f_dentry->d_inode->i_ino);
-        return 0;
+        int ret;
+
+        ret = shmem_mmap(file, vma);
+        if (ret == 0) {
+                vma->vm_ops = &shm_vm_ops;
+                shm_inc(file->f_dentry->d_inode->i_ino);
+        }
+
+        return ret;
 }
 
 static struct file_operations shm_file_operations = {
-        .mmap   = shm_mmap
+        .mmap   = shm_mmap,
+#ifndef CONFIG_MMU
+        .get_unmapped_area = shmem_get_unmapped_area,
+#endif
 };
 
 static struct vm_operations_struct shm_vm_ops = {