[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20191114080405.GA13838@rapoport-lnx>
Date: Thu, 14 Nov 2019 09:04:06 +0100
From: Mike Rapoport <rppt@...nel.org>
To: Max Filippov <jcmvbkbc@...il.com>
Cc: Chris Zankel <chris@...kel.net>,
"open list:TENSILICA XTENSA PORT (xtensa)"
<linux-xtensa@...ux-xtensa.org>, linux-mm@...ck.org,
LKML <linux-kernel@...r.kernel.org>,
Mike Rapoport <rppt@...ux.ibm.com>
Subject: Re: [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@...nel.org> wrote:
> >
> > From: Mike Rapoport <rppt@...ux.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@...ux.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.
Powered by blists - more mailing lists