diff options
| author | Rik van Riel <[email protected]> | 2014-04-07 15:36:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2014-04-07 16:35:49 -0700 |
| commit | 88a9ab6e3dfb5b10168130c255c6102c925343ab (patch) | |
| tree | a1b496cb69f682a60f9add8c6ffbfc91d415cc1c | |
| parent | a9af0c5dfdaf0b2e1a8bab7fbf6f29138947d534 (diff) | |
mm,numa: reorganize change_pmd_range()
Reorganize the order of ifs in change_pmd_range a little, in preparation
for the next patch.
[[email protected]: fix indenting, per David]
Signed-off-by: Rik van Riel <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Andrea Arcangeli <[email protected]>
Reported-by: Xing Gang <[email protected]>
Tested-by: Chegu Vinod <[email protected]>
Acked-by: David Rientjes <[email protected]>
Cc: Sasha Levin <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
| -rw-r--r-- | mm/mprotect.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mm/mprotect.c b/mm/mprotect.c index 769a67a15803..79cb51866e02 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -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)) + continue; 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, continue; } } - /* fall through */ + /* fall through, the trans huge pmd just split */ } - if (pmd_none_or_clear_bad(pmd)) - continue; + VM_BUG_ON(pmd_trans_huge(*pmd)); this_pages = change_pte_range(vma, pmd, addr, next, newprot, dirty_accountable, prot_numa); pages += this_pages; |