Mike Rapoport <rppt@xxxxxxxxxx> writes: > On Wed, Jun 17, 2020 at 09:21:42AM +1000, Michael Ellerman wrote: >> Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> writes: >> > On Mon, 15 Jun 2020 12:22:29 +0300 Mike Rapoport <rppt@xxxxxxxxxx> wrote: >> > >> >> From: Mike Rapoport <rppt@xxxxxxxxxxxxx> >> >> >> >> The pte_update() implementation for PPC_8xx unfolds page table from the PGD >> >> level to access a PMD entry. Since 8xx has only 2-level page table this can >> >> be simplified with pmd_off() shortcut. >> >> >> >> Replace explicit unfolding with pmd_off() and drop defines of pgd_index() >> >> and pgd_offset() that are no longer needed. >> >> >> >> Signed-off-by: Mike Rapoport <rppt@xxxxxxxxxxxxx> >> >> --- >> >> >> >> I think it's powerpc material, but I won't mind if Andrew picks it up :) >> > >> > Via the powerpc tree would be better, please. >> >> I'll take it into next for v5.9, unless there's a reason it needs to go >> into v5.8. > > I consider it a fixup for 5.8 merge window conflicts. Besides, mering it > now may avoid new conflicts in 5.9 ;-) OK, I'll pick it up for v5.8. cheers