2 files changed, 8 insertions, 0 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index b3f36c2c759d..5ea3dc4770ed 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2255,12 +2255,17 @@ config CPU_GENERIC_DUMP_TLB
         bool
         default y if !(CPU_R3000 || CPU_R8000 || CPU_TX39XX)
 
+config MIPS_FP_SUPPORT
+        def_bool y
+
 config CPU_R2300_FPU
         bool
+        depends on MIPS_FP_SUPPORT
         default y if CPU_R3000 || CPU_TX39XX
 
 config CPU_R4K_FPU
         bool
+        depends on MIPS_FP_SUPPORT
         default y if !CPU_R2300_FPU
 
 config CPU_R4K_CACHE_TLB
@@ -2313,6 +2318,7 @@ config MIPS_MT_FPAFF
 config MIPSR2_TO_R6_EMULATOR
         bool "MIPS R2-to-R6 emulator"
         depends on CPU_MIPSR6
+        depends on MIPS_FP_SUPPORT
         default y
         help
           Choose this option if you want to run non-R6 MIPS userland code.
@@ -2460,6 +2466,7 @@ endchoice
 config CPU_HAS_MSA
         bool "Support for the MIPS SIMD Architecture"
         depends on CPU_SUPPORTS_MSA
+        depends on MIPS_FP_SUPPORT
         depends on 64BIT || MIPS_O32_FP64_SUPPORT
         help
           MIPS SIMD Architecture (MSA) introduces 128 bit wide vector registers
diff --git a/arch/mips/kvm/Kconfig b/arch/mips/kvm/Kconfig
index 76b93a9c8c9b..760aec70dce5 100644
--- a/arch/mips/kvm/Kconfig
+++ b/arch/mips/kvm/Kconfig
@@ -18,6 +18,7 @@ if VIRTUALIZATION
 config KVM
         tristate "Kernel-based Virtual Machine (KVM) support"
         depends on HAVE_KVM
+        depends on MIPS_FP_SUPPORT
         select EXPORT_UASM
         select PREEMPT_NOTIFIERS
         select ANON_INODES