Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-linus

[~andy/linux] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index d6168994e11585814d356b45cc106554f4c3e9ca..c70684f859e13473908a1370a9a3bb160db5c4e3 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -32,6 +32,7 @@ config X86
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARCH_WANT_FRAME_POINTERS
        select HAVE_DMA_ATTRS
+       select HAVE_DMA_CONTIGUOUS if !SWIOTLB
        select HAVE_KRETPROBES
        select HAVE_OPTPROBES
        select HAVE_FTRACE_MCOUNT_RECORD
@@ -85,9 +86,18 @@ config X86
        select GENERIC_SMP_IDLE_THREAD
        select HAVE_ARCH_SECCOMP_FILTER
        select BUILDTIME_EXTABLE_SORT
+       select GENERIC_CMOS_UPDATE
+       select CLOCKSOURCE_WATCHDOG
+       select GENERIC_CLOCKEVENTS
+       select ARCH_CLOCKSOURCE_DATA if X86_64
+       select GENERIC_CLOCKEVENTS_BROADCAST if X86_64 || (X86_32 && X86_LOCAL_APIC)
+       select GENERIC_TIME_VSYSCALL if X86_64
+       select KTIME_SCALAR if X86_32
+       select GENERIC_STRNCPY_FROM_USER
+       select GENERIC_STRNLEN_USER
 
 config INSTRUCTION_DECODER
-       def_bool (KPROBES || PERF_EVENTS)
+       def_bool (KPROBES || PERF_EVENTS || UPROBES)
 
 config OUTPUT_FORMAT
        string
@@ -99,23 +109,6 @@ config ARCH_DEFCONFIG
        default "arch/x86/configs/i386_defconfig" if X86_32
        default "arch/x86/configs/x86_64_defconfig" if X86_64
 
-config GENERIC_CMOS_UPDATE
-       def_bool y
-
-config CLOCKSOURCE_WATCHDOG
-       def_bool y
-
-config GENERIC_CLOCKEVENTS
-       def_bool y
-
-config ARCH_CLOCKSOURCE_DATA
-       def_bool y
-       depends on X86_64
-
-config GENERIC_CLOCKEVENTS_BROADCAST
-       def_bool y
-       depends on X86_64 || (X86_32 && X86_LOCAL_APIC)
-
 config LOCKDEP_SUPPORT
        def_bool y
 
@@ -166,10 +159,6 @@ config RWSEM_XCHGADD_ALGORITHM
 config GENERIC_CALIBRATE_DELAY
        def_bool y
 
-config GENERIC_TIME_VSYSCALL
-       bool
-       default X86_64
-
 config ARCH_HAS_CPU_RELAX
        def_bool y
 
@@ -236,13 +225,13 @@ config ARCH_HWEIGHT_CFLAGS
        default "-fcall-saved-ecx -fcall-saved-edx" if X86_32
        default "-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" if X86_64
 
-config KTIME_SCALAR
-       def_bool X86_32
-
 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"
 
@@ -258,8 +247,6 @@ config ZONE_DMA
 
          If unsure, say Y.
 
-source "kernel/time/Kconfig"
-
 config SMP
        bool "Symmetric multi-processing support"
        ---help---
@@ -1519,6 +1506,8 @@ config EFI_STUB
           This kernel feature allows a bzImage to be loaded directly
          by EFI firmware without the use of a bootloader.
 
+         See Documentation/x86/efi-stub.txt for more information.
+
 config SECCOMP
        def_bool y
        prompt "Enable seccomp to safely compute untrusted bytecode"