Hi all, On Thu, 4 Jun 2020 17:49:25 +1000 Stephen Rothwell <s...@canb.auug.org.au> 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 > @@@ -204,13 -205,6 +205,9 @@@ static inline void pmd_clear(pmd_t *pmd > *pmdp = __pmd(0); > } > > - > - /* to find an entry in a kernel page-table-directory */ > - #define pgd_offset_k(address) pgd_offset(&init_mm, address) > - > +/* to find an entry in a page-table-directory */ > +#define pgd_index(address) ((address) >> PGDIR_SHIFT) > +#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address)) > > /* > * PTE updates. This function is called whenever an existing > @@@ -240,7 -234,7 +237,7 @@@ static inline pte_basic_t pte_update(st > pte_basic_t old = pte_val(*p); > pte_basic_t new = (old & ~(pte_basic_t)clr) | set; > int num, i; > -- pmd_t *pmd = pmd_offset(pud_offset(pgd_offset(mm, addr), addr), addr); > ++ pmd_t *pmd = pmd_offset(pud_offset(p4d_offset(pgd_offset(mm, addr), > addr), addr), addr); > > if (!huge) > num = PAGE_SIZE / SZ_4K;
I have added those hunks (more or less) to linux-next for tomorrow as a fix for mm-consolidate-pgd_index-and-pgd_offset_k-definitions. -- Cheers, Stephen Rothwell
pgpYLaVqz4JF5.pgp
Description: OpenPGP digital signature
