mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
setup vma->vm_page_prot by vm_get_page_prot()
This patch uses vm_get_page_prot() to setup vma->vm_page_prot. Though inside vm_get_page_prot() the protection flags is AND with (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED), it does not hurt correct code. Signed-off-by: Coly Li <[email protected]> Cc: Hugh Dickins <[email protected]> Cc: Tony Luck <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
1c7037db50
commit
3ed75eb8f1
4 changed files with 8 additions and 13 deletions
11
mm/mmap.c
11
mm/mmap.c
|
|
@ -1048,8 +1048,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
|
|||
|
||||
/* The open routine did something to the protections already? */
|
||||
if (pgprot_val(vma->vm_page_prot) !=
|
||||
pgprot_val(protection_map[vm_flags &
|
||||
(VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]))
|
||||
pgprot_val(vm_get_page_prot(vm_flags)))
|
||||
return 0;
|
||||
|
||||
/* Specialty mapping? */
|
||||
|
|
@ -1130,8 +1129,7 @@ munmap_back:
|
|||
vma->vm_start = addr;
|
||||
vma->vm_end = addr + len;
|
||||
vma->vm_flags = vm_flags;
|
||||
vma->vm_page_prot = protection_map[vm_flags &
|
||||
(VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)];
|
||||
vma->vm_page_prot = vm_get_page_prot(vm_flags);
|
||||
vma->vm_pgoff = pgoff;
|
||||
|
||||
if (file) {
|
||||
|
|
@ -2002,8 +2000,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
|
|||
vma->vm_end = addr + len;
|
||||
vma->vm_pgoff = pgoff;
|
||||
vma->vm_flags = flags;
|
||||
vma->vm_page_prot = protection_map[flags &
|
||||
(VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)];
|
||||
vma->vm_page_prot = vm_get_page_prot(flags);
|
||||
vma_link(mm, vma, prev, rb_link, rb_parent);
|
||||
out:
|
||||
mm->total_vm += len >> PAGE_SHIFT;
|
||||
|
|
@ -2209,7 +2206,7 @@ int install_special_mapping(struct mm_struct *mm,
|
|||
vma->vm_end = addr + len;
|
||||
|
||||
vma->vm_flags = vm_flags | mm->def_flags;
|
||||
vma->vm_page_prot = protection_map[vma->vm_flags & 7];
|
||||
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
|
||||
|
||||
vma->vm_ops = &special_mapping_vmops;
|
||||
vma->vm_private_data = pages;
|
||||
|
|
|
|||
Loading…
Reference in a new issue