Commit 4302abc6 authored by Benjamin Gray's avatar Benjamin Gray Committed by Michael Ellerman
Browse files

powerpc/64s: Prevent fallthrough to hash TLB flush when using radix 



In the fix reconnecting hash__tlb_flush() to tlb_flush() the
void return on radix__tlb_flush() was not restored and subsequently
falls through to the restored hash__tlb_flush().

Guard hash__tlb_flush() under an else to prevent this.

Fixes: 1665c027 ("powerpc/64s: Reconnect tlb_flush() to hash__tlb_flush()")
Reported-by: default avatar"Erhard F." <erhard_f@mailbox.org>
Suggested-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarBenjamin Gray <bgray@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20230217011434.115554-1-bgray@linux.ibm.com
parent 2ea31e2e

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