1 files changed, 7 insertions, 4 deletions

diff --git a/arch/mips/kernel/cpu-bugs64.c b/arch/mips/kernel/cpu-bugs64.c
index 2d80b5f1aeae..09f4034f239f 100644
--- a/arch/mips/kernel/cpu-bugs64.c
+++ b/arch/mips/kernel/cpu-bugs64.c
@@ -244,7 +244,7 @@ static inline void check_daddi(void)
         panic(bug64hit, !DADDI_WAR ? daddiwar : nowar);
 }
 
-int daddiu_bug  = -1;
+int daddiu_bug  = config_enabled(CONFIG_CPU_MIPSR6) ? 0 : -1;
 
 static inline void check_daddiu(void)
 {
@@ -314,11 +314,14 @@ static inline void check_daddiu(void)
 
 void __init check_bugs64_early(void)
 {
-        check_mult_sh();
-        check_daddiu();
+        if (!config_enabled(CONFIG_CPU_MIPSR6)) {
+                check_mult_sh();
+                check_daddiu();
+        }
 }
 
 void __init check_bugs64(void)
 {
-        check_daddi();
+        if (!config_enabled(CONFIG_CPU_MIPSR6))
+                check_daddi();
 }