Commit 4dbe87d5 authored by Nitin Gupta's avatar Nitin Gupta Committed by David S. Miller

sparc64: Cleanup hugepage table walk functions

Flatten out nested code structure in huge_pte_offset()
and huge_pte_alloc().
Signed-off-by: default avatarNitin Gupta <nitin.m.gupta@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent df7b2155
...@@ -266,27 +266,19 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, ...@@ -266,27 +266,19 @@ pte_t *huge_pte_alloc(struct mm_struct *mm,
pgd_t *pgd; pgd_t *pgd;
pud_t *pud; pud_t *pud;
pmd_t *pmd; pmd_t *pmd;
pte_t *pte = NULL;
pgd = pgd_offset(mm, addr); pgd = pgd_offset(mm, addr);
pud = pud_alloc(mm, pgd, addr); pud = pud_alloc(mm, pgd, addr);
if (!pud) if (!pud)
return NULL; return NULL;
if (sz >= PUD_SIZE) if (sz >= PUD_SIZE)
pte = (pte_t *)pud; return (pte_t *)pud;
else {
pmd = pmd_alloc(mm, pud, addr); pmd = pmd_alloc(mm, pud, addr);
if (!pmd) if (!pmd)
return NULL; return NULL;
if (sz >= PMD_SIZE) if (sz >= PMD_SIZE)
pte = (pte_t *)pmd; return (pte_t *)pmd;
else return pte_alloc_map(mm, pmd, addr);
pte = pte_alloc_map(mm, pmd, addr);
}
return pte;
} }
pte_t *huge_pte_offset(struct mm_struct *mm, pte_t *huge_pte_offset(struct mm_struct *mm,
...@@ -295,27 +287,21 @@ pte_t *huge_pte_offset(struct mm_struct *mm, ...@@ -295,27 +287,21 @@ pte_t *huge_pte_offset(struct mm_struct *mm,
pgd_t *pgd; pgd_t *pgd;
pud_t *pud; pud_t *pud;
pmd_t *pmd; pmd_t *pmd;
pte_t *pte = NULL;
pgd = pgd_offset(mm, addr); pgd = pgd_offset(mm, addr);
if (!pgd_none(*pgd)) { if (pgd_none(*pgd))
return NULL;
pud = pud_offset(pgd, addr); pud = pud_offset(pgd, addr);
if (!pud_none(*pud)) { if (pud_none(*pud))
return NULL;
if (is_hugetlb_pud(*pud)) if (is_hugetlb_pud(*pud))
pte = (pte_t *)pud; return (pte_t *)pud;
else {
pmd = pmd_offset(pud, addr); pmd = pmd_offset(pud, addr);
if (!pmd_none(*pmd)) { if (pmd_none(*pmd))
return NULL;
if (is_hugetlb_pmd(*pmd)) if (is_hugetlb_pmd(*pmd))
pte = (pte_t *)pmd; return (pte_t *)pmd;
else return pte_offset_map(pmd, addr);
pte = pte_offset_map(pmd, addr);
}
}
}
}
return pte;
} }
void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
......
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