diff --git a/[refs] b/[refs]
index 6d46728f8af1..6fb687d94c8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca1e0484d9fe8a9048ac32b0f9894545f43704e8
+refs/heads/master: b78b6af66a5fbaf17d7e6bfc32384df5e34408c8
diff --git a/trunk/ipc/shm.c b/trunk/ipc/shm.c
index 6b0c9af5bbf7..1c2faf62bc73 100644
--- a/trunk/ipc/shm.c
+++ b/trunk/ipc/shm.c
@@ -162,6 +162,8 @@ static int shm_mmap(struct file * file, struct vm_area_struct * vma)
 	ret = shmem_mmap(file, vma);
 	if (ret == 0) {
 		vma->vm_ops = &shm_vm_ops;
+		if (!(vma->vm_flags & VM_WRITE))
+			vma->vm_flags &= ~VM_MAYWRITE;
 		shm_inc(file->f_dentry->d_inode->i_ino);
 	}