1 files changed, 23 insertions, 35 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 52e18e6d2ba0..5d2858119930 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -251,7 +251,7 @@ config X86_ELAN
 
 config X86_VOYAGER
         bool "Voyager (NCR)"
-        depends on X86_32 && (SMP || BROKEN)
+        depends on X86_32 && (SMP || BROKEN) && !PCI
         help
           Voyager is an MCA-based 32-way capable SMP architecture proprietary
           to NCR Corp.  Machine classes 345x/35xx/4100/51xx are Voyager-based.
@@ -263,7 +263,7 @@ config X86_VOYAGER
 
 config X86_NUMAQ
         bool "NUMAQ (IBM/Sequent)"
-        depends on SMP && X86_32
+        depends on SMP && X86_32 && PCI
         select NUMA
         help
           This option is used for getting Linux to run on a (IBM/Sequent) NUMA
@@ -293,7 +293,7 @@ config X86_BIGSMP
 
 config X86_VISWS
         bool "SGI 320/540 (Visual Workstation)"
-        depends on X86_32
+        depends on X86_32 && !PCI
         help
           The SGI Visual Workstation series is an IA32-based workstation
           based on SGI systems chips with some legacy PC hardware attached.
@@ -337,7 +337,7 @@ config X86_RDC321X
 config X86_VSMP
         bool "Support for ScaleMP vSMP"
         select PARAVIRT
-        depends on X86_64
+        depends on X86_64 && !PCI
         help
           Support for ScaleMP vSMP systems.  Say 'Y' here if this kernel is
           supposed to run on these EM64T-based machines.  Only choose this option
@@ -383,6 +383,7 @@ config VMI
 config KVM_CLOCK
         bool "KVM paravirtualized clock"
         select PARAVIRT
+        select PARAVIRT_CLOCK
         depends on !(X86_VISWS || X86_VOYAGER)
         help
           Turning on this option will allow you to run a paravirtualized clock
@@ -410,37 +411,25 @@ config PARAVIRT
           over full virtualization.  However, when run without a hypervisor
           the kernel is theoretically slower and slightly larger.
 
+config PARAVIRT_CLOCK
+        bool
+        default n
+
 endif
 
-config MEMTEST_BOOTPARAM
-        bool "Memtest boot parameter"
+config MEMTEST
+        bool "Memtest"
         depends on X86_64
         default y
         help
           This option adds a kernel parameter 'memtest', which allows memtest
-          to be disabled at boot.  If this option is selected, memtest
-          functionality can be disabled with memtest=0 on the kernel
-          command line.  The purpose of this option is to allow a single
-          kernel image to be distributed with memtest built in, but not
-          necessarily enabled.
-
+          to be set.
+                memtest=0, mean disabled; -- default
+                memtest=1, mean do 1 test pattern;
+                ...
+                memtest=4, mean do 4 test patterns.
           If you are unsure how to answer this question, answer Y.
 
-config MEMTEST_BOOTPARAM_VALUE
-        int "Memtest boot parameter default value (0-4)"
-        depends on MEMTEST_BOOTPARAM
-        range 0 4
-        default 0
-        help
-          This option sets the default value for the kernel parameter
-          'memtest', which allows memtest to be disabled at boot.  If this
-          option is set to 0 (zero), the memtest kernel parameter will
-          default to 0, disabling memtest at bootup.  If this option is
-          set to 4, the memtest kernel parameter will default to 4,
-          enabling memtest at bootup, and use that as pattern number.
-
-          If you are unsure how to answer this question, answer 0.
-
 config ACPI_SRAT
         def_bool y
         depends on X86_32 && ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH)
@@ -558,18 +547,18 @@ config IOMMU_HELPER
         def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB)
 
 config NR_CPUS
-        int "Maximum number of CPUs (2-255)"
-        range 2 255
+        int "Maximum number of CPUs (2-4096)"
+        range 2 4096
         depends on SMP
         default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000
         default "8"
         help
           This allows you to specify the maximum number of CPUs which this
-          kernel will support.  The maximum supported value is 255 and the
+          kernel will support.  The maximum supported value is 4096 and the
           minimum value which makes sense is 2.
 
           This is purely to save memory - each supported CPU adds
-          approximately eight kilobytes to the kernel image.
+          approximately one kilobyte to the kernel image.
 
 config SCHED_SMT
         bool "SMT (Hyperthreading) scheduler support"
@@ -961,8 +950,8 @@ config NUMA_EMU
           number of nodes. This is only useful for debugging.
 
 config NODES_SHIFT
-        int "Max num nodes shift(1-15)"
-        range 1 15  if X86_64
+        int "Max num nodes shift(1-9)"
+        range 1 9  if X86_64
         default "6" if X86_64
         default "4" if X86_NUMAQ
         default "3"
@@ -1470,8 +1459,7 @@ endmenu
 menu "Bus options (PCI etc.)"
 
 config PCI
-        bool "PCI support" if !X86_VISWS && !X86_VSMP
-        depends on !X86_VOYAGER
+        bool "PCI support"
         default y
         select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)
         help