Hi all, On Thu, 4 Jun 2020 17:49:25 +1000 Stephen Rothwell wrote: > > diff --cc arch/powerpc/include/asm/nohash/32/pgtable.h > index 639f3b3713ec,eb8538c85077..1927e1b653f2 > --- a/arch/powerpc/include/asm/nohash/32/pgtable.h > +++ b/arch/powerpc/include/asm/nohash/32/pgtable.h > @@@ -342,15 -334,6 +337,10 @@@ static inline int pte_young(pte_t pte > pfn_to_page((__pa(pmd_val(pmd)) >> PAGE_SHIFT)) > #endif > > - /* Find an entry in the third-level page table.. */ > - #define pte_index(address) \ > - (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) > +#define pte_offset_kernel(dir, addr) \ > + (pmd_bad(*(dir)) ? NULL : (pte_t *)pmd_page_vaddr(*(dir)) + \ > + pte_index(addr)) > - #define pte_offset_map(dir, addr) pte_offset_kernel((dir), (addr)) > - static inline void pte_unmap(pte_t *pte) { } > + > /* > * Encode and decode a swap entry. > * Note that the bits we use in a PTE for representing a swap entry I have added this hunk (sort of - see below) to linux-next for tomorrow as a fix for mm-consolidate-pte_index-and-pte_offset_-definitions. From: Stephen Rothwell Date: Thu, 4 Jun 2020 21:16:19 +1000 Subject: [PATCH] mm-consolidate-pte_index-and-pte_offset_-definitions-fix Signed-off-by: Stephen Rothwell --- arch/powerpc/include/asm/nohash/32/pgtable.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/powerpc/include/asm/nohash/32/pgtable.h b/arch/powerpc/include/asm/nohash/32/pgtable.h index c188a6f64bcd..d94bcd117c5b 100644 --- a/arch/powerpc/include/asm/nohash/32/pgtable.h +++ b/arch/powerpc/include/asm/nohash/32/pgtable.h @@ -341,6 +341,10 @@ static inline int pte_young(pte_t pte) pfn_to_page((__pa(pmd_val(pmd)) >> PAGE_SHIFT)) #endif +#define pte_offset_kernel(dir, addr) \ + (pmd_bad(*(dir)) ? NULL : (pte_t *)pmd_page_vaddr(*(dir)) + \ + pte_index(addr)) + /* * Encode and decode a swap entry. * Note that the bits we use in a PTE for representing a swap entry -- 2.27.0.rc2 -- Cheers, Stephen Rothwell