parisc: use pgtable-nopXd instead of 4level-fixup

[platform/kernel/linux-rpi.git] / arch / parisc / mm / fixmap.c

diff --git a/arch/parisc/mm/fixmap.c b/arch/parisc/mm/fixmap.c
index 474cd24..e2d8b0a 100644 (file)
--- a/arch/parisc/mm/fixmap.c
+++ b/arch/parisc/mm/fixmap.c
@@ -14,11 +14,13 @@ void notrace set_fixmap(enum fixed_addresses idx, phys_addr_t phys)
 {
        unsigned long vaddr = __fix_to_virt(idx);
        pgd_t *pgd = pgd_offset_k(vaddr);
-       pmd_t *pmd = pmd_offset(pgd, vaddr);
+       p4d_t *p4d = p4d_offset(pgd, vaddr);
+       pud_t *pud = pud_offset(p4d, vaddr);
+       pmd_t *pmd = pmd_offset(pud, vaddr);
        pte_t *pte;
 
        if (pmd_none(*pmd))
-               pmd = pmd_alloc(NULL, pgd, vaddr);
+               pmd = pmd_alloc(NULL, pud, vaddr);
 
        pte = pte_offset_kernel(pmd, vaddr);
        if (pte_none(*pte))
@@ -32,7 +34,9 @@ void notrace clear_fixmap(enum fixed_addresses idx)
 {
        unsigned long vaddr = __fix_to_virt(idx);
        pgd_t *pgd = pgd_offset_k(vaddr);
-       pmd_t *pmd = pmd_offset(pgd, vaddr);
+       p4d_t *p4d = p4d_offset(pgd, vaddr);
+       pud_t *pud = pud_offset(p4d, vaddr);
+       pmd_t *pmd = pmd_offset(pud, vaddr);
        pte_t *pte = pte_offset_kernel(pmd, vaddr);
 
        if (WARN_ON(pte_none(*pte)))