diff options
author | Libin <huawei.libin@huawei.com> | 2013-07-03 18:01:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 19:07:26 -0400 |
commit | d6e932177090463e5c709e9e61bbd705a33a1609 (patch) | |
tree | e833b8907a9c07662c5aaaef097a81575ba27653 /mm/mmap.c | |
parent | b430e9d1c6d416306d44dbf3aa3148be7af78abc (diff) |
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@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/mmap.c')
-rw-r--r-- | mm/mmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -955,7 +955,7 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags, | |||
955 | if (is_mergeable_vma(vma, file, vm_flags) && | 955 | if (is_mergeable_vma(vma, file, vm_flags) && |
956 | is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) { | 956 | is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) { |
957 | pgoff_t vm_pglen; | 957 | pgoff_t vm_pglen; |
958 | vm_pglen = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; | 958 | vm_pglen = vma_pages(vma); |
959 | if (vma->vm_pgoff + vm_pglen == vm_pgoff) | 959 | if (vma->vm_pgoff + vm_pglen == vm_pgoff) |
960 | return 1; | 960 | return 1; |
961 | } | 961 | } |