x86, hyperv: Mark the Hyper-V clocksource as being continuous

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

diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index f3b86d0df44ee6487cb26a8b105b944b03361b74..c026cca5602c6fe5c84619f0b43b2fe7c3bb2382 100644 (file)
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -4,23 +4,24 @@ choice
        default M686 if X86_32
        default GENERIC_CPU if X86_64
 
-config M386
-       bool "386"
-       depends on X86_32 && !UML
+config M486
+       bool "486"
+       depends on X86_32
        ---help---
-         This is the processor type of your CPU. This information is used for
-         optimizing purposes. In order to compile a kernel that can run on
-         all x86 CPU types (albeit not optimally fast), you can specify
-         "386" here.
+         This is the processor type of your CPU. This information is
+         used for optimizing purposes. In order to compile a kernel
+         that can run on all supported x86 CPU types (albeit not
+         optimally fast), you can specify "486" here.
+
+         Note that the 386 is no longer supported, this includes
+         AMD/Cyrix/Intel 386DX/DXL/SL/SLC/SX, Cyrix/TI 486DLC/DLC2,
+         UMC 486SX-S and the NexGen Nx586.
 
          The kernel will not necessarily run on earlier architectures than
          the one you have chosen, e.g. a Pentium optimized kernel will run on
          a PPro, but not necessarily on a i486.
 
          Here are the settings recommended for greatest speed:
-         - "386" for the AMD/Cyrix/Intel 386DX/DXL/SL/SLC/SX, Cyrix/TI
-         486DLC/DLC2, and UMC 486SX-S.  Only "386" kernels will run on a 386
-         class machine.
          - "486" for the AMD/Cyrix/IBM/Intel 486DX/DX2/DX4 or
          SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or U5S.
          - "586" for generic Pentium CPUs lacking the TSC
@@ -43,16 +44,7 @@ config M386
          - "VIA C3-2" for VIA C3-2 "Nehemiah" (model 9 and above).
          - "VIA C7" for VIA C7.
 
-         If you don't know what to do, choose "386".
-
-config M486
-       bool "486"
-       depends on X86_32
-       ---help---
-         Select this for a 486 series processor, either Intel or one of the
-         compatible processors from AMD, Cyrix, IBM, or Intel.  Includes DX,
-         DX2, and DX4 variants; also SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or
-         U5S.
+         If you don't know what to do, choose "486".
 
 config M586
        bool "586/K5/5x86/6x86/6x86MX"
@@ -305,24 +297,16 @@ config X86_INTERNODE_CACHE_SHIFT
        default "12" if X86_VSMP
        default X86_L1_CACHE_SHIFT
 
-config X86_CMPXCHG
-       def_bool y
-       depends on X86_64 || (X86_32 && !M386)
-
 config X86_L1_CACHE_SHIFT
        int
        default "7" if MPENTIUM4 || MPSC
        default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU
-       default "4" if MELAN || M486 || M386 || MGEODEGX1
+       default "4" if MELAN || M486 || MGEODEGX1
        default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX
 
-config X86_XADD
-       def_bool y
-       depends on !M386
-
 config X86_PPRO_FENCE
        bool "PentiumPro memory ordering errata workaround"
-       depends on M686 || M586MMX || M586TSC || M586 || M486 || M386 || MGEODEGX1
+       depends on M686 || M586MMX || M586TSC || M586 || M486 || MGEODEGX1
        ---help---
          Old PentiumPro multiprocessor systems had errata that could cause
          memory operations to violate the x86 ordering standard in rare cases.
@@ -335,27 +319,11 @@ config X86_PPRO_FENCE
 
 config X86_F00F_BUG
        def_bool y
-       depends on M586MMX || M586TSC || M586 || M486 || M386
+       depends on M586MMX || M586TSC || M586 || M486
 
 config X86_INVD_BUG
        def_bool y
-       depends on M486 || M386
-
-config X86_WP_WORKS_OK
-       def_bool y
-       depends on !M386
-
-config X86_INVLPG
-       def_bool y
-       depends on X86_32 && !M386
-
-config X86_BSWAP
-       def_bool y
-       depends on X86_32 && !M386
-
-config X86_POPAD_OK
-       def_bool y
-       depends on X86_32 && !M386
+       depends on M486
 
 config X86_ALIGNMENT_16
        def_bool y
@@ -412,12 +380,11 @@ config X86_MINIMUM_CPU_FAMILY
        default "64" if X86_64
        default "6" if X86_32 && X86_P6_NOP
        default "5" if X86_32 && X86_CMPXCHG64
-       default "4" if X86_32 && (X86_XADD || X86_CMPXCHG || X86_BSWAP || X86_WP_WORKS_OK)
-       default "3"
+       default "4"
 
 config X86_DEBUGCTLMSR
        def_bool y
-       depends on !(MK6 || MWINCHIPC6 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 || M486 || M386) && !UML
+       depends on !(MK6 || MWINCHIPC6 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 || M486) && !UML
 
 menuconfig PROCESSOR_SELECT
        bool "Supported processor vendors" if EXPERT
@@ -441,7 +408,7 @@ config CPU_SUP_INTEL
 config CPU_SUP_CYRIX_32
        default y
        bool "Support Cyrix processors" if PROCESSOR_SELECT
-       depends on M386 || M486 || M586 || M586TSC || M586MMX || (EXPERT && !64BIT)
+       depends on M486 || M586 || M586TSC || M586MMX || (EXPERT && !64BIT)
        ---help---
          This enables detection, tunings and quirks for Cyrix processors
 
@@ -495,7 +462,7 @@ config CPU_SUP_TRANSMETA_32
 config CPU_SUP_UMC_32
        default y
        bool "Support UMC processors" if PROCESSOR_SELECT
-       depends on M386 || M486 || (EXPERT && !64BIT)
+       depends on M486 || (EXPERT && !64BIT)
        ---help---
          This enables detection, tunings and quirks for UMC processors