Commit dbeed98d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-6.2-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fix from Michael Ellerman:

 - Prevent fallthrough to hash TLB flush when using radix

Thanks to Benjamin Gray and Erhard Furtner.

* tag 'powerpc-6.2-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/64s: Prevent fallthrough to hash TLB flush when using radix
parents 75cc9c47 4302abc6

arch/powerpc/include/asm/book3s/64/tlbflush.h

+2 −2
Original line number Diff line number Diff line
@@ -97,8 +97,8 @@ static inline void tlb_flush(struct mmu_gather *tlb) 
{

	if (radix_enabled())

		radix__tlb_flush(tlb);



	return hash__tlb_flush(tlb);

	else

		hash__tlb_flush(tlb);

}



#ifdef CONFIG_SMP