Skip to content

Commit 4302abc

Browse files
BenjaminGrayNp1mpe
authored andcommitted
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: 1665c02 ("powerpc/64s: Reconnect tlb_flush() to hash__tlb_flush()") Reported-by: "Erhard F." <erhard_f@mailbox.org> Suggested-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Benjamin Gray <bgray@linux.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20230217011434.115554-1-bgray@linux.ibm.com
1 parent 2ea31e2 commit 4302abc

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ static inline void tlb_flush(struct mmu_gather *tlb)
9797
{
9898
if (radix_enabled())
9999
radix__tlb_flush(tlb);
100-
101-
return hash__tlb_flush(tlb);
100+
else
101+
hash__tlb_flush(tlb);
102102
}
103103

104104
#ifdef CONFIG_SMP

0 commit comments

Comments
 (0)