Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 941c06d5 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman
Browse files

powerpc/mm/32: Fix pgtable_page_dtor call 



Commit 667416f3 ("powerpc/mm: Fix kernel crash on page table free")
added a call for pgtable_page_dtor in the rcu page table free routine. We missed
the fact that for 32 bit platforms we did call the 'dtor' early. Drop the extra
call for pgtable_page_dtor. We remove the call from __pte_free_tlb so that we
do the page table free and 'dtor' call together. This should help when we
switch these platforms to pte fragments.

Fixes: 667416f3 ("powerpc/mm: Fix kernel crash on page table free")
Reported-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent b2f82565

arch/powerpc/include/asm/book3s/32/pgalloc.h

+0 −1
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ static inline void pgtable_free_tlb(struct mmu_gather *tlb, 
static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table,

				  unsigned long address)

{

	pgtable_page_dtor(table);

	pgtable_free_tlb(tlb, page_address(table), 0);

}

#endif /* _ASM_POWERPC_BOOK3S_32_PGALLOC_H */

arch/powerpc/include/asm/nohash/32/pgalloc.h

+0 −1
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table, 
				  unsigned long address)

{

	tlb_flush_pgtable(tlb, address);

	pgtable_page_dtor(table);

	pgtable_free_tlb(tlb, page_address(table), 0);

}

#endif /* _ASM_POWERPC_PGALLOC_32_H */