lkml.org 
[lkml]   [2019]   [Nov]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 2/2] xtensa: get rid of __ARCH_USE_5LEVEL_HACK
On Wed, Nov 13, 2019 at 12:30:39PM -0800, Max Filippov wrote:
> Hi Mike,
>
> On Tue, Nov 5, 2019 at 6:33 AM Mike Rapoport <rppt@kernel.org> wrote:
> >
> > From: Mike Rapoport <rppt@linux.ibm.com>
> >
> > xtensa has 2-level page tables and already uses pgtable-nopmd for page
> > table folding.
> >
> > Add walks of p4d level where appropriate and drop usage of
> > __ARCH_USE_5LEVEL_HACK.
> >
> > Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
> > ---
> > arch/xtensa/include/asm/pgtable.h | 1 -
> > arch/xtensa/mm/fault.c | 10 ++++++++--
> > arch/xtensa/mm/kasan_init.c | 6 ++++--
> > arch/xtensa/mm/mmu.c | 3 ++-
> > arch/xtensa/mm/tlb.c | 5 ++++-
> > 5 files changed, 18 insertions(+), 7 deletions(-)
>
> This change missed a spot in arch/xtensa/include/asm/fixmap.h.
> I've added the following hunk and queued both patches to the xtensa tree:

Thanks!

> diff --git a/arch/xtensa/include/asm/fixmap.h b/arch/xtensa/include/asm/fixmap.h
> index 7e25c1b50ac0..cfb8696917e9 100644
> --- a/arch/xtensa/include/asm/fixmap.h
> +++ b/arch/xtensa/include/asm/fixmap.h
> @@ -78,8 +78,10 @@ static inline unsigned long virt_to_fix(const
> unsigned long vaddr)
>
> #define kmap_get_fixmap_pte(vaddr) \
> pte_offset_kernel( \
> - pmd_offset(pud_offset(pgd_offset_k(vaddr), (vaddr)), (vaddr)), \
> - (vaddr) \
> - )
> + pmd_offset(pud_offset(p4d_offset(pgd_offset_k(vaddr), \
> + (vaddr)), \
> + (vaddr)), \
> + (vaddr)), \
> + (vaddr))
>
> #endif
>
>
> --
> Thanks.
> -- Max

--
Sincerely yours,
Mike.

\
 
 \ /
  Last update: 2019-11-14 09:05    [W:0.067 / U:0.356 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site