Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 1b1e049..66cc380 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -12,6 +12,7 @@ config X86_32
 
 config X86_64
        def_bool 64BIT
+       select X86_DEV_DMA_OPS
 
 ### Arch settings
 config X86
@@ -40,7 +41,6 @@ config X86
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_FUNCTION_GRAPH_FP_TEST
        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
-       select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
        select HAVE_SYSCALL_TRACEPOINTS
        select HAVE_KVM
        select HAVE_ARCH_KGDB
@@ -77,11 +77,14 @@ config X86
        select GENERIC_CLOCKEVENTS_MIN_ADJUST
        select IRQ_FORCED_THREADING
        select USE_GENERIC_SMP_HELPERS if SMP
-       select HAVE_BPF_JIT if (X86_64 && NET)
+       select HAVE_BPF_JIT if X86_64
        select CLKEVT_I8253
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_IOMAP
        select DCACHE_WORD_ACCESS
+       select GENERIC_SMP_IDLE_THREAD
+       select HAVE_ARCH_SECCOMP_FILTER
+       select BUILDTIME_EXTABLE_SORT
        select GENERIC_CMOS_UPDATE
        select CLOCKSOURCE_WATCHDOG
        select GENERIC_CLOCKEVENTS
@@ -91,7 +94,7 @@ config X86
        select KTIME_SCALAR if X86_32
 
 config INSTRUCTION_DECODER
-       def_bool (KPROBES || PERF_EVENTS)
+       def_bool (KPROBES || PERF_EVENTS || UPROBES)
 
 config OUTPUT_FORMAT
        string
@@ -150,9 +153,6 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
        def_bool X86_XADD
 
-config ARCH_HAS_CPU_IDLE_WAIT
-       def_bool y
-
 config GENERIC_CALIBRATE_DELAY
        def_bool y
 
@@ -226,6 +226,9 @@ config ARCH_CPU_PROBE_RELEASE
        def_bool y
        depends on HOTPLUG_CPU
 
+config ARCH_SUPPORTS_UPROBES
+       def_bool y
+
 source "init/Kconfig"
 source "kernel/Kconfig.freezer"
 
@@ -309,6 +312,7 @@ config X86_EXTENDED_PLATFORM
                NUMAQ (IBM/Sequent)
                RDC R-321x SoC
                SGI 320/540 (Visual Workstation)
+               STA2X11-based (e.g. Northville)
                Summit/EXA (IBM x440)
                Unisys ES7000 IA32 series
                Moorestown MID devices
@@ -355,6 +359,7 @@ config X86_VSMP
        select PARAVIRT
        depends on X86_64 && PCI
        depends on X86_EXTENDED_PLATFORM
+       depends on SMP
        ---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
@@ -441,10 +446,10 @@ config X86_32_NON_STANDARD
        depends on X86_32 && SMP
        depends on X86_EXTENDED_PLATFORM
        ---help---
-         This option compiles in the NUMAQ, Summit, bigsmp, ES7000, default
-         subarchitectures.  It is intended for a generic binary kernel.
-         if you select them all, kernel will probe it one by one. and will
-         fallback to default.
+         This option compiles in the NUMAQ, Summit, bigsmp, ES7000,
+         STA2X11, default subarchitectures.  It is intended for a generic
+         binary kernel. If you select them all, kernel will probe it
+         one by one and will fallback to default.
 
 # Alphabetically sorted list of Non standard 32 bit platforms
 
@@ -484,6 +489,22 @@ config X86_VISWS
          A kernel compiled for the Visual Workstation will run on general
          PCs as well. See <file:Documentation/sgi-visws.txt> for details.
 
+config STA2X11
+       bool "STA2X11 Companion Chip Support"
+       depends on X86_32_NON_STANDARD && PCI
+       select X86_DEV_DMA_OPS
+       select X86_DMA_REMAP
+       select SWIOTLB
+       select MFD_STA2X11
+       select ARCH_REQUIRE_GPIOLIB
+       default n
+       ---help---
+         This adds support for boards based on the STA2X11 IO-Hub,
+         a.k.a. "ConneXt". The chip is used in place of the standard
+         PC chipset, so all "standard" peripherals are missing. If this
+         option is selected the kernel will still be able to boot on
+         standard PC machines.
+
 config X86_SUMMIT
        bool "Summit/EXA (IBM x440)"
        depends on X86_32_NON_STANDARD
@@ -1220,10 +1241,6 @@ config NODES_SHIFT
          Specify the maximum number of NUMA Nodes available on the target
          system.  Increases memory reserved to accommodate various tables.
 
-config HAVE_ARCH_BOOTMEM
-       def_bool y
-       depends on X86_32 && NUMA
-
 config HAVE_ARCH_ALLOC_REMAP
        def_bool y
        depends on X86_32 && NUMA
@@ -2004,16 +2021,6 @@ config EISA
 
 source "drivers/eisa/Kconfig"
 
-config MCA
-       bool "MCA support"
-       ---help---
-         MicroChannel Architecture is found in some IBM PS/2 machines and
-         laptops.  It is a bus system similar to PCI or ISA. See
-         <file:Documentation/mca.txt> (and especially the web page given
-         there) before attempting to build an MCA bus kernel.
-
-source "drivers/mca/Kconfig"
-
 config SCx200
        tristate "NatSemi SCx200 support"
        ---help---
@@ -2196,6 +2203,14 @@ config HAVE_TEXT_POKE_SMP
        bool
        select STOP_MACHINE if SMP
 
+config X86_DEV_DMA_OPS
+       bool
+       depends on X86_64 || STA2X11
+
+config X86_DMA_REMAP
+       bool
+       depends on STA2X11
+
 source "net/Kconfig"
 
 source "drivers/Kconfig"