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

torvalds · torvalds · commit dbeed98d89ea · 2023-02-17T14:53:37.000-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
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,8 @@ static inline void tlb_flush(struct mmu_gather *tlb)`
`97`	`97`	`{`
`98`	`98`	`if (radix_enabled())`
`99`	`99`	`radix__tlb_flush(tlb);`
`100`		`-`
`101`		`- return hash__tlb_flush(tlb);`
	`100`	`+ else`
	`101`	`+ hash__tlb_flush(tlb);`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`#ifdef CONFIG_SMP`