aboutsummaryrefslogtreecommitdiffstats
path: root/mm/huge_memory.c
diff options
context:
space:
mode:
authorHugh Dickins <hughd@google.com>2016-05-19 20:12:54 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-19 22:12:14 -0400
commitbf8616d5fa179d6c755f06726567c6d63c6fbbc7 (patch)
treee9bb568bea162e3f66da723d09d21449638b3878 /mm/huge_memory.c
parent52b6f46bc163eef17ecba4cd552beeafe2b24453 (diff)
huge mm: move_huge_pmd does not need new_vma
Remove move_huge_pmd()'s redundant new_vma arg: all it was used for was a VM_NOHUGEPAGE check on new_vma flags, but the new_vma is cloned from the old vma, so a trans_huge_pmd in the new_vma will be as acceptable as it was in the old vma, alignment and size permitting. Signed-off-by: Hugh Dickins <hughd@google.com> Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: Andres Lagar-Cavilla <andreslc@google.com> Cc: Yang Shi <yang.shi@linaro.org> Cc: Ning Qu <quning@gmail.com> Cc: Mel Gorman <mgorman@techsingularity.net> Cc: Andres Lagar-Cavilla <andreslc@google.com> Cc: Konstantin Khlebnikov <koct9i@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/huge_memory.c')
-rw-r--r--mm/huge_memory.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index f8ac8f582fd8..66675eed67be 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1698,20 +1698,17 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,
1698 return 1; 1698 return 1;
1699} 1699}
1700 1700
1701bool move_huge_pmd(struct vm_area_struct *vma, struct vm_area_struct *new_vma, 1701bool move_huge_pmd(struct vm_area_struct *vma, unsigned long old_addr,
1702 unsigned long old_addr,
1703 unsigned long new_addr, unsigned long old_end, 1702 unsigned long new_addr, unsigned long old_end,
1704 pmd_t *old_pmd, pmd_t *new_pmd) 1703 pmd_t *old_pmd, pmd_t *new_pmd)
1705{ 1704{
1706 spinlock_t *old_ptl, *new_ptl; 1705 spinlock_t *old_ptl, *new_ptl;
1707 pmd_t pmd; 1706 pmd_t pmd;
1708
1709 struct mm_struct *mm = vma->vm_mm; 1707 struct mm_struct *mm = vma->vm_mm;
1710 1708
1711 if ((old_addr & ~HPAGE_PMD_MASK) || 1709 if ((old_addr & ~HPAGE_PMD_MASK) ||
1712 (new_addr & ~HPAGE_PMD_MASK) || 1710 (new_addr & ~HPAGE_PMD_MASK) ||
1713 old_end - old_addr < HPAGE_PMD_SIZE || 1711 old_end - old_addr < HPAGE_PMD_SIZE)
1714 (new_vma->vm_flags & VM_NOHUGEPAGE))
1715 return false; 1712 return false;
1716 1713
1717 /* 1714 /*