From: Mike Rapoport <rppt@xxxxxxxxxxxxx> Hi, These patches update the mips page table folding/unfolding to take into account the 5th level. Mike Rapoport (3): mips: fix build when "48 bits virtual memory" is enabled mips: drop __pXd_offset() macros that duplicate pXd_index() ones mips: add support for folded p4d page tables arch/mips/include/asm/fixmap.h | 2 +- arch/mips/include/asm/pgalloc.h | 4 +-- arch/mips/include/asm/pgtable-32.h | 6 +--- arch/mips/include/asm/pgtable-64.h | 44 ++++++++++++++++-------------- arch/mips/kvm/mmu.c | 40 ++++++++++++++++----------- arch/mips/kvm/trap_emul.c | 4 ++- arch/mips/mm/c-r3k.c | 4 ++- arch/mips/mm/c-r4k.c | 4 ++- arch/mips/mm/c-tx39.c | 4 ++- arch/mips/mm/fault.c | 12 ++++++-- arch/mips/mm/hugetlbpage.c | 14 +++++++--- arch/mips/mm/init.c | 6 ++-- arch/mips/mm/ioremap.c | 6 +++- arch/mips/mm/pgtable-32.c | 6 ++-- arch/mips/mm/tlb-r4k.c | 4 ++- 15 files changed, 97 insertions(+), 63 deletions(-) -- 2.24.0