projects/linux·commit dbeed98d

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

dbeed98d · Linus Torvalds <[email protected]> · 2023-02-17 14:53:37 -08:00

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
Commit
dbeed98d89ea91ae68ff6dce6060671726292e85
Parents
75cc9c47 · 4302abc6

Merge commit. Changes below are compared with the first parent: 75cc9c47.

Changes

1 files changed · +2 −2

FileStatusAddDelContent
arch/powerpc/include/asm/book3s/64/tlbflush.hmodified+2−2View file

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

View file
diff --git a/arch/powerpc/include/asm/book3s/64/tlbflush.h b/arch/powerpc/include/asm/book3s/64/tlbflush.h
index d5cd162..2bbc0fc 100644
--- a/arch/powerpc/include/asm/book3s/64/tlbflush.h
+++ b/arch/powerpc/include/asm/book3s/64/tlbflush.h
@@ -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