Commit 88a9ab6e authored by Rik van Riel's avatar Rik van Riel Committed by Linus Torvalds

mm,numa: reorganize change_pmd_range()

Reorganize the order of ifs in change_pmd_range a little, in preparation
for the next patch.

[ fix indenting, per David]
Signed-off-by: default avatarRik van Riel <>
Cc: Peter Zijlstra <>
Cc: Andrea Arcangeli <>
Reported-by: default avatarXing Gang <>
Tested-by: default avatarChegu Vinod <>
Acked-by: default avatarDavid Rientjes <>
Cc: Sasha Levin <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent a9af0c5d
......@@ -118,6 +118,8 @@ static inline unsigned long change_pmd_range(struct vm_area_struct *vma,
unsigned long this_pages;
next = pmd_addr_end(addr, end);
if (!pmd_trans_huge(*pmd) && pmd_none_or_clear_bad(pmd))
if (pmd_trans_huge(*pmd)) {
if (next - addr != HPAGE_PMD_SIZE)
split_huge_page_pmd(vma, addr, pmd);
......@@ -133,10 +135,9 @@ static inline unsigned long change_pmd_range(struct vm_area_struct *vma,
/* fall through */
/* fall through, the trans huge pmd just split */
if (pmd_none_or_clear_bad(pmd))
this_pages = change_pte_range(vma, pmd, addr, next, newprot,
dirty_accountable, prot_numa);
pages += this_pages;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment