Merge tag 'v4.8-rc1' into patchwork

[sfrench/cifs-2.6.git] / arch / mips / kernel / cpu-bugs64.c

diff --git a/arch/mips/kernel/cpu-bugs64.c b/arch/mips/kernel/cpu-bugs64.c
index 6392dbe504fb3b4050210f7a5ca993362efa352b..a378e44688f50f1023dfb86c3c706b77ea5b4de6 100644 (file)
--- 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 = config_enabled(CONFIG_CPU_MIPSR6) ? 0 : -1;
+int daddiu_bug = IS_ENABLED(CONFIG_CPU_MIPSR6) ? 0 : -1;
 
 static inline void check_daddiu(void)
 {
@@ -314,7 +314,7 @@ static inline void check_daddiu(void)
 
 void __init check_bugs64_early(void)
 {
-       if (!config_enabled(CONFIG_CPU_MIPSR6)) {
+       if (!IS_ENABLED(CONFIG_CPU_MIPSR6)) {
                check_mult_sh();
                check_daddiu();
        }
@@ -322,6 +322,6 @@ void __init check_bugs64_early(void)
 
 void __init check_bugs64(void)
 {
-       if (!config_enabled(CONFIG_CPU_MIPSR6))
+       if (!IS_ENABLED(CONFIG_CPU_MIPSR6))
                check_daddi();
 }