Pull thinkpad into release branch

[linux-2.6] / arch / i386 / Kconfig

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 1df4a1f..53d6237 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -29,6 +29,7 @@ config GENERIC_CLOCKEVENTS
 config GENERIC_CLOCKEVENTS_BROADCAST
        bool
        default y
+       depends on X86_LOCAL_APIC
 
 config LOCKDEP_SUPPORT
        bool
@@ -219,11 +220,11 @@ config PARAVIRT
 
 config VMI
        bool "VMI Paravirt-ops support"
-       depends on PARAVIRT && !NO_HZ
-       default y
+       depends on PARAVIRT && !COMPAT_VDSO
        help
-         VMI provides a paravirtualized interface to multiple hypervisors
-         include VMware ESX server and Xen by connecting to a ROM module
+         VMI provides a paravirtualized interface to the VMware ESX server
+         (it could be used by other hypervisors in theory too, but is not
+         at the moment), by linking the kernel to a GPL-ed ROM module
          provided by the hypervisor.
 
 config ACPI_SRAT
@@ -892,7 +893,6 @@ config HOTPLUG_CPU
 config COMPAT_VDSO
        bool "Compat VDSO support"
        default y
-       depends on !PARAVIRT
        help
          Map the VDSO to the predictable old-style address too.
        ---help---
@@ -1286,12 +1286,3 @@ config X86_TRAMPOLINE
 config KTIME_SCALAR
        bool
        default y
-
-config NO_IDLE_HZ
-       bool
-       depends on PARAVIRT
-       default y
-       help
-         Switches the regular HZ timer off when the system is going idle.
-         This helps a hypervisor detect that the Linux system is idle,
-         reducing the overhead of idle systems.