mm: convert generic code to 5-level paging
Convert all non-architecture-specific code to 5-level paging. It's mostly mechanical adding handling one more page table level in places where we deal with pud_t. Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Acked-by: Michal Hocko <mhocko@suse.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
048456dcf2
commit
c2febafc67
@@ -196,9 +196,9 @@ pmd_t * __meminit vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int node)
|
||||
return pmd;
|
||||
}
|
||||
|
||||
pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
|
||||
pud_t * __meminit vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node)
|
||||
{
|
||||
pud_t *pud = pud_offset(pgd, addr);
|
||||
pud_t *pud = pud_offset(p4d, addr);
|
||||
if (pud_none(*pud)) {
|
||||
void *p = vmemmap_alloc_block(PAGE_SIZE, node);
|
||||
if (!p)
|
||||
@@ -208,6 +208,18 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
|
||||
return pud;
|
||||
}
|
||||
|
||||
p4d_t * __meminit vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node)
|
||||
{
|
||||
p4d_t *p4d = p4d_offset(pgd, addr);
|
||||
if (p4d_none(*p4d)) {
|
||||
void *p = vmemmap_alloc_block(PAGE_SIZE, node);
|
||||
if (!p)
|
||||
return NULL;
|
||||
p4d_populate(&init_mm, p4d, p);
|
||||
}
|
||||
return p4d;
|
||||
}
|
||||
|
||||
pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
|
||||
{
|
||||
pgd_t *pgd = pgd_offset_k(addr);
|
||||
@@ -225,6 +237,7 @@ int __meminit vmemmap_populate_basepages(unsigned long start,
|
||||
{
|
||||
unsigned long addr = start;
|
||||
pgd_t *pgd;
|
||||
p4d_t *p4d;
|
||||
pud_t *pud;
|
||||
pmd_t *pmd;
|
||||
pte_t *pte;
|
||||
@@ -233,7 +246,10 @@ int __meminit vmemmap_populate_basepages(unsigned long start,
|
||||
pgd = vmemmap_pgd_populate(addr, node);
|
||||
if (!pgd)
|
||||
return -ENOMEM;
|
||||
pud = vmemmap_pud_populate(pgd, addr, node);
|
||||
p4d = vmemmap_p4d_populate(pgd, addr, node);
|
||||
if (!p4d)
|
||||
return -ENOMEM;
|
||||
pud = vmemmap_pud_populate(p4d, addr, node);
|
||||
if (!pud)
|
||||
return -ENOMEM;
|
||||
pmd = vmemmap_pmd_populate(pud, addr, node);
|
||||
|
||||
Reference in New Issue
Block a user