x86, spinlock: Replace pv spinlocks with pv ticketlocks

[deliverable/linux.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index fe120da25625b23ef52c74b479bf715f265261b4..b32ebf92b0ce96b5798bdf2a48043986be6ba6ea 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -65,6 +65,7 @@ config X86
        select HAVE_KERNEL_LZMA
        select HAVE_KERNEL_XZ
        select HAVE_KERNEL_LZO
        select HAVE_KERNEL_LZMA
        select HAVE_KERNEL_XZ
        select HAVE_KERNEL_LZO

+       select HAVE_KERNEL_LZ4

        select HAVE_HW_BREAKPOINT
        select HAVE_MIXED_BREAKPOINTS_REGS
        select PERF_EVENTS
        select HAVE_HW_BREAKPOINT
        select HAVE_MIXED_BREAKPOINTS_REGS
        select PERF_EVENTS


@@ -102,6 +103,7 @@ config X86
        select HAVE_ARCH_SECCOMP_FILTER
        select BUILDTIME_EXTABLE_SORT
        select GENERIC_CMOS_UPDATE
        select HAVE_ARCH_SECCOMP_FILTER
        select BUILDTIME_EXTABLE_SORT
        select GENERIC_CMOS_UPDATE

+       select HAVE_ARCH_SOFT_DIRTY

        select CLOCKSOURCE_WATCHDOG
        select GENERIC_CLOCKEVENTS
        select ARCH_CLOCKSOURCE_DATA if X86_64
        select CLOCKSOURCE_WATCHDOG
        select GENERIC_CLOCKEVENTS
        select ARCH_CLOCKSOURCE_DATA if X86_64


@@ -121,6 +123,7 @@ config X86
        select OLD_SIGACTION if X86_32
        select COMPAT_OLD_SIGACTION if IA32_EMULATION
        select RTC_LIB
        select OLD_SIGACTION if X86_32
        select COMPAT_OLD_SIGACTION if IA32_EMULATION
        select RTC_LIB

+       select HAVE_DEBUG_STACKOVERFLOW

 
 config INSTRUCTION_DECODER
        def_bool y
 
 config INSTRUCTION_DECODER
        def_bool y


@@ -207,6 +210,12 @@ config ARCH_HIBERNATION_POSSIBLE
 config ARCH_SUSPEND_POSSIBLE
        def_bool y
 
 config ARCH_SUSPEND_POSSIBLE
        def_bool y
 

+config ARCH_WANT_HUGE_PMD_SHARE
+       def_bool y
+
+config ARCH_WANT_GENERAL_HUGETLB
+       def_bool y
+

 config ZONE_DMA32
        bool
        default X86_64
 config ZONE_DMA32
        bool
        default X86_64


@@ -336,6 +345,7 @@ config X86_EXTENDED_PLATFORM
 
          If you enable this option then you'll be able to select support
          for the following (non-PC) 32 bit x86 platforms:
 
          If you enable this option then you'll be able to select support
          for the following (non-PC) 32 bit x86 platforms:

+               Goldfish (Android emulator)

                AMD Elan
                NUMAQ (IBM/Sequent)
                RDC R-321x SoC
                AMD Elan
                NUMAQ (IBM/Sequent)
                RDC R-321x SoC


@@ -410,6 +420,7 @@ config X86_UV
 config X86_GOLDFISH
        bool "Goldfish (Virtual Platform)"
        depends on X86_32
 config X86_GOLDFISH
        bool "Goldfish (Virtual Platform)"
        depends on X86_32

+       depends on X86_EXTENDED_PLATFORM

        ---help---
         Enable support for the Goldfish virtual platform used primarily
         for Android development. Unless you are building for the Android
        ---help---
         Enable support for the Goldfish virtual platform used primarily
         for Android development. Unless you are building for the Android


@@ -1058,8 +1069,16 @@ config MICROCODE_INTEL_LIB
        depends on MICROCODE_INTEL
 
 config MICROCODE_INTEL_EARLY
        depends on MICROCODE_INTEL
 
 config MICROCODE_INTEL_EARLY

+       def_bool n
+
+config MICROCODE_AMD_EARLY
+       def_bool n
+
+config MICROCODE_EARLY

        bool "Early load microcode"
        bool "Early load microcode"

-       depends on MICROCODE_INTEL && BLK_DEV_INITRD
+       depends on MICROCODE=y && BLK_DEV_INITRD
+       select MICROCODE_INTEL_EARLY if MICROCODE_INTEL
+       select MICROCODE_AMD_EARLY if MICROCODE_AMD

        default y
        help
          This option provides functionality to read additional microcode data
        default y
        help
          This option provides functionality to read additional microcode data


@@ -1067,10 +1086,6 @@ config MICROCODE_INTEL_EARLY
          microcode to CPU's as early as possible. No functional change if no
          microcode data is glued to the initrd, therefore it's safe to say Y.
 
          microcode to CPU's as early as possible. No functional change if no
          microcode data is glued to the initrd, therefore it's safe to say Y.
 

-config MICROCODE_EARLY
-       def_bool y
-       depends on MICROCODE_INTEL_EARLY
-

 config X86_MSR
        tristate "/dev/cpu/*/msr - Model-specific register support"
        ---help---
 config X86_MSR
        tristate "/dev/cpu/*/msr - Model-specific register support"
        ---help---


@@ -1725,7 +1740,7 @@ config PHYSICAL_ALIGN
 
 config HOTPLUG_CPU
        bool "Support for hot-pluggable CPUs"
 
 config HOTPLUG_CPU
        bool "Support for hot-pluggable CPUs"

-       depends on SMP && HOTPLUG
+       depends on SMP

        ---help---
          Say Y here to allow turning CPUs off and on. CPUs can be
          controlled through /sys/devices/system/cpu.
        ---help---
          Say Y here to allow turning CPUs off and on. CPUs can be
          controlled through /sys/devices/system/cpu.


@@ -2246,11 +2261,11 @@ source "drivers/pcmcia/Kconfig"
 source "drivers/pci/hotplug/Kconfig"
 
 config RAPIDIO
 source "drivers/pci/hotplug/Kconfig"
 
 config RAPIDIO

-       bool "RapidIO support"
+       tristate "RapidIO support"

        depends on PCI
        default n
        help
        depends on PCI
        default n
        help

-         If you say Y here, the kernel will include drivers and
+         If enabled this option will include drivers and the core

          infrastructure code to support RapidIO interconnect devices.
 
 source "drivers/rapidio/Kconfig"
          infrastructure code to support RapidIO interconnect devices.
 
 source "drivers/rapidio/Kconfig"