diff --git a/[refs] b/[refs]
index adc360b59643..bcaa9946d022 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e14d95f773b7365b6ba2d2105522c92b007c6db1
+refs/heads/master: 69cf0fac6052c5bd3fb3469a41d4216e926028f8
diff --git a/trunk/mm/madvise.c b/trunk/mm/madvise.c
index af3d573b0141..4e196155a0c3 100644
--- a/trunk/mm/madvise.c
+++ b/trunk/mm/madvise.c
@@ -168,6 +168,9 @@ static long madvise_remove(struct vm_area_struct *vma,
 			return -EINVAL;
 	}
 
+	if ((vma->vm_flags & (VM_SHARED|VM_WRITE)) != (VM_SHARED|VM_WRITE))
+		return -EACCES;
+
 	mapping = vma->vm_file->f_mapping;
 
 	offset = (loff_t)(start - vma->vm_start)