Commit e2fb2511 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman

powerpc/mm: flatten function __find_linux_pte() step 2

__find_linux_pte() is full of if/else which is hard to
follow allthough the handling is pretty simple.

Previous patch left { } blocks. This patch removes the first one
by shifting its content to the left.
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent fab9a116
...@@ -369,39 +369,37 @@ pte_t *__find_linux_pte(pgd_t *pgdir, unsigned long ea, ...@@ -369,39 +369,37 @@ pte_t *__find_linux_pte(pgd_t *pgdir, unsigned long ea,
hpdp = (hugepd_t *)&pud; hpdp = (hugepd_t *)&pud;
goto out_huge; goto out_huge;
} }
{ pdshift = PMD_SHIFT;
pdshift = PMD_SHIFT; pmdp = pmd_offset(&pud, ea);
pmdp = pmd_offset(&pud, ea); pmd = READ_ONCE(*pmdp);
pmd = READ_ONCE(*pmdp); /*
/* * A hugepage collapse is captured by pmd_none, because
* A hugepage collapse is captured by pmd_none, because * it mark the pmd none and do a hpte invalidate.
* it mark the pmd none and do a hpte invalidate. */
*/ if (pmd_none(pmd))
if (pmd_none(pmd)) return NULL;
return NULL;
if (pmd_trans_huge(pmd) || pmd_devmap(pmd)) {
if (pmd_trans_huge(pmd) || pmd_devmap(pmd)) { if (is_thp)
if (is_thp) *is_thp = true;
*is_thp = true; ret_pte = (pte_t *)pmdp;
ret_pte = (pte_t *) pmdp; goto out;
goto out; }
} /*
/* * pmd_large check below will handle the swap pmd pte
* pmd_large check below will handle the swap pmd pte * we need to do both the check because they are config
* we need to do both the check because they are config * dependent.
* dependent. */
*/ if (pmd_huge(pmd) || pmd_large(pmd)) {
if (pmd_huge(pmd) || pmd_large(pmd)) { ret_pte = (pte_t *)pmdp;
ret_pte = (pte_t *) pmdp; goto out;
goto out;
}
if (is_hugepd(__hugepd(pmd_val(pmd)))) {
hpdp = (hugepd_t *)&pmd;
goto out_huge;
}
return pte_offset_kernel(&pmd, ea);
} }
if (is_hugepd(__hugepd(pmd_val(pmd)))) {
hpdp = (hugepd_t *)&pmd;
goto out_huge;
}
return pte_offset_kernel(&pmd, ea);
} }
out_huge: out_huge:
if (!hpdp) if (!hpdp)
......
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