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

[uclinux-h8/linux.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index a641b90..8d4f87e 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -98,7 +98,6 @@ config X86
        select HAVE_ACPI_APEI_NMI               if ACPI
        select HAVE_ALIGNED_STRUCT_PAGE         if SLUB
        select HAVE_ARCH_AUDITSYSCALL
-       select HAVE_ARCH_HARDENED_USERCOPY
        select HAVE_ARCH_HUGE_VMAP              if X86_64 || X86_PAE
        select HAVE_ARCH_JUMP_LABEL
        select HAVE_ARCH_KASAN                  if X86_64 && SPARSEMEM_VMEMMAP
@@ -128,7 +127,7 @@ config X86
        select HAVE_EBPF_JIT                    if X86_64
        select HAVE_EFFICIENT_UNALIGNED_ACCESS
        select HAVE_EXIT_THREAD
-       select HAVE_FENTRY                      if X86_64
+       select HAVE_FENTRY                      if X86_64 || DYNAMIC_FTRACE
        select HAVE_FTRACE_MCOUNT_RECORD
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_FUNCTION_TRACER
@@ -1045,6 +1044,14 @@ config X86_MCE
          The action the kernel takes depends on the severity of the problem,
          ranging from warning messages to halting the machine.
 
+config X86_MCELOG_LEGACY
+       bool "Support for deprecated /dev/mcelog character device"
+       depends on X86_MCE
+       ---help---
+         Enable support for /dev/mcelog which is needed by the old mcelog
+         userspace logging daemon. Consider switching to the new generation
+         rasdaemon solution.
+
 config X86_MCE_INTEL
        def_bool y
        prompt "Intel MCE features"
@@ -1074,7 +1081,7 @@ config X86_MCE_THRESHOLD
        def_bool y
 
 config X86_MCE_INJECT
-       depends on X86_MCE && X86_LOCAL_APIC
+       depends on X86_MCE && X86_LOCAL_APIC && X86_MCELOG_LEGACY
        tristate "Machine check injector support"
        ---help---
          Provide support for injecting machine checks for testing purposes.
@@ -1968,7 +1975,7 @@ config RELOCATABLE
 config RANDOMIZE_BASE
        bool "Randomize the address of the kernel image (KASLR)"
        depends on RELOCATABLE
-       default n
+       default y
        ---help---
          In support of Kernel Address Space Layout Randomization (KASLR),
          this randomizes the physical address at which the kernel image
@@ -1998,7 +2005,7 @@ config RANDOMIZE_BASE
          theoretically possible, but the implementations are further
          limited due to memory layouts.
 
-         If unsure, say N.
+         If unsure, say Y.
 
 # Relocation on x86 needs some additional build support
 config X86_NEED_RELOCS
@@ -2047,7 +2054,7 @@ config RANDOMIZE_MEMORY
           configuration have in average 30,000 different possible virtual
           addresses for each memory section.
 
-          If unsure, say N.
+          If unsure, say Y.
 
 config RANDOMIZE_MEMORY_PHYSICAL_PADDING
        hex "Physical memory mapping padding" if EXPERT
@@ -2789,9 +2796,6 @@ config X86_DMA_REMAP
        bool
        depends on STA2X11
 
-config HAVE_GENERIC_GUP
-       def_bool y
-
 source "net/Kconfig"
 
 source "drivers/Kconfig"