The patch titled
Subject: mm: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT
has been added to the -mm tree. Its filename is
mm-use-vma_pages-to-replace-vm_end-vm_start-page_shift.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Libin <huawei.libin@xxxxxxxxxx>
Subject: mm: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT
(*->vm_end - *->vm_start) >> PAGE_SHIFT operation is implemented
as a inline funcion vma_pages() in linux/mm.h, so using it.
Signed-off-by: Libin <huawei.libin@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memory.c | 2 +-
mm/mmap.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff -puN mm/memory.c~mm-use-vma_pages-to-replace-vm_end-vm_start-page_shift mm/memory.c
--- a/mm/memory.c~mm-use-vma_pages-to-replace-vm_end-vm_start-page_shift
+++ a/mm/memory.c
@@ -2913,7 +2913,7 @@ static inline void unmap_mapping_range_t
details->first_index, details->last_index) {
vba = vma->vm_pgoff;
- vea = vba + ((vma->vm_end - vma->vm_start) >> PAGE_SHIFT) - 1;
+ vea = vba + vma_pages(vma) - 1;
/* Assume for now that PAGE_CACHE_SHIFT == PAGE_SHIFT */
zba = details->first_index;
if (zba < vba)
diff -puN mm/mmap.c~mm-use-vma_pages-to-replace-vm_end-vm_start-page_shift mm/mmap.c
--- a/mm/mmap.c~mm-use-vma_pages-to-replace-vm_end-vm_start-page_shift
+++ a/mm/mmap.c
@@ -955,7 +955,7 @@ can_vma_merge_after(struct vm_area_struc
if (is_mergeable_vma(vma, file, vm_flags) &&
is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
pgoff_t vm_pglen;
- vm_pglen = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
+ vm_pglen = vma_pages(vma);
if (vma->vm_pgoff + vm_pglen == vm_pgoff)
return 1;
}
_
Patches currently in -mm which might be from huawei.libin@xxxxxxxxxx are
origin.patch
mm-use-vma_pages-to-replace-vm_end-vm_start-page_shift.patch
ncpfs-use-vma_pages-to-replace-vm_end-vm_start-page_shift.patch
char-use-vma_pages-to-replace-vm_end-vm_start-page_shift.patch
uio-use-vma_pages-to-replace-vm_end-vm_start-page_shift.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
