diff options
| -rw-r--r-- | mm/madvise.c | 8 | ||||
| -rw-r--r-- | mm/vma.c | 4 | ||||
| -rw-r--r-- | mm/vma.h | 15 |
3 files changed, 12 insertions, 15 deletions
diff --git a/mm/madvise.c b/mm/madvise.c index 1c30031ab035..2bf80989d5b6 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -144,8 +144,8 @@ static int replace_anon_vma_name(struct vm_area_struct *vma, } #endif /* CONFIG_ANON_VMA_NAME */ /* - * Update the vm_flags and/or anon_name on region of a vma, splitting it or - * merging it as necessary. Must be called with mmap_lock held for writing. + * Update the vm_flags or anon_name on region of a vma, splitting it or merging + * it as necessary. Must be called with mmap_lock held for writing. */ static int madvise_update_vma(vm_flags_t new_flags, struct madvise_behavior *madv_behavior) @@ -161,8 +161,8 @@ static int madvise_update_vma(vm_flags_t new_flags, return 0; if (set_new_anon_name) - vma = vma_modify_flags_name(&vmi, madv_behavior->prev, vma, - range->start, range->end, new_flags, anon_name); + vma = vma_modify_name(&vmi, madv_behavior->prev, vma, + range->start, range->end, anon_name); else vma = vma_modify_flags(&vmi, madv_behavior->prev, vma, range->start, range->end, new_flags); @@ -1650,17 +1650,15 @@ struct vm_area_struct *vma_modify_flags( } struct vm_area_struct -*vma_modify_flags_name(struct vma_iterator *vmi, +*vma_modify_name(struct vma_iterator *vmi, struct vm_area_struct *prev, struct vm_area_struct *vma, unsigned long start, unsigned long end, - vm_flags_t vm_flags, struct anon_vma_name *new_name) { VMG_VMA_STATE(vmg, vmi, prev, vma, start, end); - vmg.vm_flags = vm_flags; vmg.anon_name = new_name; return vma_modify(&vmg); @@ -290,15 +290,14 @@ __must_check struct vm_area_struct unsigned long start, unsigned long end, vm_flags_t vm_flags); -/* We are about to modify the VMA's flags and/or anon_name. */ +/* We are about to modify the VMA's anon_name. */ __must_check struct vm_area_struct -*vma_modify_flags_name(struct vma_iterator *vmi, - struct vm_area_struct *prev, - struct vm_area_struct *vma, - unsigned long start, - unsigned long end, - vm_flags_t vm_flags, - struct anon_vma_name *new_name); +*vma_modify_name(struct vma_iterator *vmi, + struct vm_area_struct *prev, + struct vm_area_struct *vma, + unsigned long start, + unsigned long end, + struct anon_vma_name *new_name); /* We are about to modify the VMA's memory policy. */ __must_check struct vm_area_struct |