---

yaml --- r: 72151 b: refs/heads/master c: 1ddd439 h: refs/heads/master i: 72149: 826938a 72147: d2eb0a8 72143: 2696bb6 v: v3
git-mirror · Oct 23, 2007 · 2513f2f · 2513f2f
1 parent 900b5ad
commit 2513f2f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ae3f847e49e3787eca91bced31f8fd328d50496
+refs/heads/master: 1ddd439ef987c9f0209e6ce824b67518f2afe67b
diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
@@ -1171,8 +1171,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
 	vm_flags = vma->vm_flags;
 
 	if (vma_wants_writenotify(vma))
-		vma->vm_page_prot =
-			protection_map[vm_flags & (VM_READ|VM_WRITE|VM_EXEC)];
+		vma->vm_page_prot = vm_get_page_prot(vm_flags & ~VM_SHARED);
 
 	if (!file || !vma_merge(mm, prev, addr, vma->vm_end,
 			vma->vm_flags, NULL, file, pgoff, vma_policy(vma))) {

diff --git a/trunk/mm/mprotect.c b/trunk/mm/mprotect.c
@@ -194,7 +194,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
 	vma->vm_flags = newflags;
 	vma->vm_page_prot = vm_get_page_prot(newflags);
 	if (vma_wants_writenotify(vma)) {
-		vma->vm_page_prot = vm_get_page_prot(newflags);
+		vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
 		dirty_accountable = 1;
 	}