diff mbox series

[2/2] MIPS: r4k-bugs64: Drop CONFIG_CPU_MIPSR6 checks

Message ID 20191001230423.70119-2-paul.burton@mips.com (mailing list archive)
State Accepted
Headers show
Series [1/2] MIPS: r4k-bugs64: Limit R4k bug checks to affected systems | expand

Commit Message

Paul Burton Oct. 1, 2019, 11:04 p.m. UTC 
The r4k-bugs64 code will no longer be built for MIPSr6 kernel
configurations, so there's no need to perform checks for MIPSr6 within
the code. Drop those redundant checks.

Signed-off-by: Paul Burton <paul.burton@mips.com>
---

 arch/mips/kernel/r4k-bugs64.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/arch/mips/kernel/r4k-bugs64.c b/arch/mips/kernel/r4k-bugs64.c
index fa62cd1dff93..a0c2ba728f45 100644
--- a/arch/mips/kernel/r4k-bugs64.c
+++ b/arch/mips/kernel/r4k-bugs64.c
@@ -240,7 +240,7 @@  static inline void check_daddi(void)
 	panic(bug64hit, !DADDI_WAR ? daddiwar : nowar);
 }
 
-int daddiu_bug	= IS_ENABLED(CONFIG_CPU_MIPSR6) ? 0 : -1;
+int daddiu_bug	= -1;
 
 static inline void check_daddiu(void)
 {
@@ -310,14 +310,11 @@  static inline void check_daddiu(void)
 
 void __init check_bugs64_early(void)
 {
-	if (!IS_ENABLED(CONFIG_CPU_MIPSR6)) {
-		check_mult_sh();
-		check_daddiu();
-	}
+	check_mult_sh();
+	check_daddiu();
 }
 
 void __init check_bugs64(void)
 {
-	if (!IS_ENABLED(CONFIG_CPU_MIPSR6))
-		check_daddi();
+	check_daddi();
 }