Commit dbeed98d authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -97,8 +97,8 @@ static inline void tlb_flush(struct mmu_gather *tlb) ...@@ -97,8 +97,8 @@ static inline void tlb_flush(struct mmu_gather *tlb)
{ {
if (radix_enabled()) if (radix_enabled())
radix__tlb_flush(tlb); radix__tlb_flush(tlb);
else
return hash__tlb_flush(tlb); hash__tlb_flush(tlb);
} }
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment