Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / Kconfig

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 17f5ab3ca2794487c94f2082ecdd2bc69d3753a9..77021381974654d0904a679dbd5e7e6786e51604 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -154,17 +154,9 @@ config SMP
 
          If you don't know what to do here, say N.
 
-config ARM_CPU_TOPOLOGY
-       bool "Support CPU topology definition"
-       depends on SMP
-       default y
-       help
-         Support CPU topology definition, based on configuration
-         provided by the firmware.
-
 config SCHED_MC
        bool "Multi-core scheduler support"
-       depends on ARM_CPU_TOPOLOGY
+       depends on SMP
        help
          Multi-core scheduler support improves the CPU scheduler's decision
          making when dealing with multi-core CPU chips at a cost of slightly
@@ -172,7 +164,7 @@ config SCHED_MC
 
 config SCHED_SMT
        bool "SMT scheduler support"
-       depends on ARM_CPU_TOPOLOGY
+       depends on SMP
        help
          Improves the CPU scheduler's decision making when dealing with
          MultiThreading at a cost of slightly increased overhead in some