From 2513f2f79bc53a7f65203842231d4df2d3a86ba9 Mon Sep 17 00:00:00 2001 From: Hugh Dickins Date: Mon, 22 Oct 2007 20:45:12 -0700 Subject: [PATCH] --- yaml --- r: 72151 b: refs/heads/master c: 1ddd439ef987c9f0209e6ce824b67518f2afe67b h: refs/heads/master i: 72149: 826938afe46a4a22e94524bec76020e97709ecad 72147: d2eb0a818549052d2c95b9d7b4300b2c7440917d 72143: 2696bb60249d9695ac75c9021cf04f0dd43bb645 v: v3 --- [refs] | 2 +- trunk/mm/mmap.c | 3 +-- trunk/mm/mprotect.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 508d6db840e8..c54dcacb15eb 100644 --- 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 index 7a30c4988231..facc1a75bd4f 100644 --- 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 index 55227845abbe..4de546899dc1 100644 --- 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; }