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

[sfrench/cifs-2.6.git] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index ae55e715cc748e0148601c9cd05de1f969f60560..863a62a6de3cc3f8daa92a9f9ae8c34065dff989 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -68,6 +68,7 @@ config S390
        select ARCH_BINFMT_ELF_STATE
        select ARCH_HAS_DEVMEM_IS_ALLOWED
        select ARCH_HAS_ELF_RANDOMIZE
+       select ARCH_HAS_FORTIFY_SOURCE
        select ARCH_HAS_GCOV_PROFILE_ALL
        select ARCH_HAS_GIGANTIC_PAGE if (MEMORY_ISOLATION && COMPACTION) || CMA
        select ARCH_HAS_KCOV
@@ -143,7 +144,6 @@ config S390
        select HAVE_DYNAMIC_FTRACE
        select HAVE_DYNAMIC_FTRACE_WITH_REGS
        select HAVE_EFFICIENT_UNALIGNED_ACCESS
-       select HAVE_EXIT_THREAD
        select HAVE_FTRACE_MCOUNT_RECORD
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_FUNCTION_TRACER
@@ -538,6 +538,22 @@ config ARCH_RANDOM
 
          If unsure, say Y.
 
+config ALTERNATIVES
+       def_bool y
+       prompt "Patch optimized instructions for running CPU type"
+       help
+         When enabled the kernel code is compiled with additional
+         alternative instructions blocks optimized for newer CPU types.
+         These alternative instructions blocks are patched at kernel boot
+         time when running CPU supports them. This mechanism is used to
+         optimize some critical code paths (i.e. spinlocks) for newer CPUs
+         even if kernel is build to support older machine generations.
+
+         This mechanism could be disabled by appending "noaltinstr"
+         option to the kernel command line.
+
+         If unsure, say Y.
+
 endmenu
 
 menu "Memory setup"
@@ -809,18 +825,6 @@ config PFAULT
          Everybody who wants to run Linux under VM != VM4.2 should select
          this option.
 
-config SHARED_KERNEL
-       bool "VM shared kernel support"
-       depends on !JUMP_LABEL
-       help
-         Select this option, if you want to share the text segment of the
-         Linux kernel between different VM guests. This reduces memory
-         usage with lots of guests but greatly increases kernel size.
-         Also if a kernel was IPL'ed from a shared segment the kexec system
-         call will not work.
-         You should only select this option if you know what you are
-         doing and want to exploit this feature.
-
 config CMM
        def_tristate n
        prompt "Cooperative memory management"
@@ -930,17 +934,4 @@ config S390_GUEST
          Select this option if you want to run the kernel as a guest under
          the KVM hypervisor.
 
-config S390_GUEST_OLD_TRANSPORT
-       def_bool y
-       prompt "Guest support for old s390 virtio transport (DEPRECATED)"
-       depends on S390_GUEST
-       help
-         Enable this option to add support for the old s390-virtio
-         transport (i.e. virtio devices NOT based on virtio-ccw). This
-         type of virtio devices is only available on the experimental
-         kuli userspace or with old (< 2.6) qemu. If you are running
-         with a modern version of qemu (which supports virtio-ccw since
-         1.4 and uses it by default since version 2.4), you probably won't
-         need this.
-
 endmenu