1 files changed, 48 insertions, 47 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 70c0f3da0476..5db2117ae288 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -20,6 +20,7 @@ config X86_64
 ### Arch settings
 config X86
         def_bool y
+        select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
         select HAVE_AOUT if X86_32
         select HAVE_UNSTABLE_SCHED_CLOCK
         select ARCH_SUPPORTS_NUMA_BALANCING
@@ -120,6 +121,7 @@ config X86
         select OLD_SIGSUSPEND3 if X86_32 || IA32_EMULATION
         select OLD_SIGACTION if X86_32
         select COMPAT_OLD_SIGACTION if IA32_EMULATION
+        select RTC_LIB
 
 config INSTRUCTION_DECODER
         def_bool y
@@ -188,9 +190,6 @@ config GENERIC_CALIBRATE_DELAY
 config ARCH_HAS_CPU_RELAX
         def_bool y
 
-config ARCH_HAS_DEFAULT_IDLE
-        def_bool y
-
 config ARCH_HAS_CACHE_LINE_SIZE
         def_bool y
 
@@ -389,7 +388,7 @@ config X86_NUMACHIP
 
 config X86_VSMP
         bool "ScaleMP vSMP"
-        select PARAVIRT_GUEST
+        select HYPERVISOR_GUEST
         select PARAVIRT
         depends on X86_64 && PCI
         depends on X86_EXTENDED_PLATFORM
@@ -596,44 +595,17 @@ config SCHED_OMIT_FRAME_POINTER
 
           If in doubt, say "Y".
 
-menuconfig PARAVIRT_GUEST
-        bool "Paravirtualized guest support"
-        ---help---
-          Say Y here to get to see options related to running Linux under
-          various hypervisors.  This option alone does not add any kernel code.
-
-          If you say N, all options in this submenu will be skipped and disabled.
-
-if PARAVIRT_GUEST
-
-config PARAVIRT_TIME_ACCOUNTING
-        bool "Paravirtual steal time accounting"
-        select PARAVIRT
-        default n
+menuconfig HYPERVISOR_GUEST
+        bool "Linux guest support"
         ---help---
-          Select this option to enable fine granularity task steal time
-          accounting. Time spent executing other tasks in parallel with
-          the current vCPU is discounted from the vCPU power. To account for
-          that, there can be a small performance impact.
-
-          If in doubt, say N here.
-
-source "arch/x86/xen/Kconfig"
+          Say Y here to enable options for running Linux under various hyper-
+          visors. This option enables basic hypervisor detection and platform
+          setup.
 
-config KVM_GUEST
-        bool "KVM Guest support (including kvmclock)"
-        select PARAVIRT
-        select PARAVIRT
-        select PARAVIRT_CLOCK
-        default y if PARAVIRT_GUEST
-        ---help---
-          This option enables various optimizations for running under the KVM
-          hypervisor. It includes a paravirtualized clock, so that instead
-          of relying on a PIT (or probably other) emulation by the
-          underlying device model, the host provides the guest with
-          timing infrastructure such as time of day, and system time
+          If you say N, all options in this submenu will be skipped and
+          disabled, and Linux guest support won't be built in.
 
-source "arch/x86/lguest/Kconfig"
+if HYPERVISOR_GUEST
 
 config PARAVIRT
         bool "Enable paravirtualization code"
@@ -643,6 +615,13 @@ config PARAVIRT
           over full virtualization.  However, when run without a hypervisor
           the kernel is theoretically slower and slightly larger.
 
+config PARAVIRT_DEBUG
+        bool "paravirt-ops debugging"
+        depends on PARAVIRT && DEBUG_KERNEL
+        ---help---
+          Enable to debug paravirt_ops internals.  Specifically, BUG if
+          a paravirt_op is missing when it is called.
+
 config PARAVIRT_SPINLOCKS
         bool "Paravirtualization layer for spinlocks"
         depends on PARAVIRT && SMP
@@ -656,17 +635,38 @@ config PARAVIRT_SPINLOCKS
 
           If you are unsure how to answer this question, answer N.
 
-config PARAVIRT_CLOCK
-        bool
+source "arch/x86/xen/Kconfig"
 
-endif
+config KVM_GUEST
+        bool "KVM Guest support (including kvmclock)"
+        depends on PARAVIRT
+        select PARAVIRT_CLOCK
+        default y
+        ---help---
+          This option enables various optimizations for running under the KVM
+          hypervisor. It includes a paravirtualized clock, so that instead
+          of relying on a PIT (or probably other) emulation by the
+          underlying device model, the host provides the guest with
+          timing infrastructure such as time of day, and system time
 
-config PARAVIRT_DEBUG
-        bool "paravirt-ops debugging"
-        depends on PARAVIRT && DEBUG_KERNEL
+source "arch/x86/lguest/Kconfig"
+
+config PARAVIRT_TIME_ACCOUNTING
+        bool "Paravirtual steal time accounting"
+        depends on PARAVIRT
+        default n
         ---help---
-          Enable to debug paravirt_ops internals.  Specifically, BUG if
-          a paravirt_op is missing when it is called.
+          Select this option to enable fine granularity task steal time
+          accounting. Time spent executing other tasks in parallel with
+          the current vCPU is discounted from the vCPU power. To account for
+          that, there can be a small performance impact.
+
+          If in doubt, say N here.
+
+config PARAVIRT_CLOCK
+        bool
+
+endif #HYPERVISOR_GUEST
 
 config NO_BOOTMEM
         def_bool y
@@ -1549,6 +1549,7 @@ config X86_SMAP
 config EFI
         bool "EFI runtime service support"
         depends on ACPI
+        select UCS2_STRING
         ---help---
           This enables the kernel to use EFI runtime services that are
           available (such as the EFI variable services).