Merge master.kernel.org:/home/rmk/linux-2.6-arm

[firefly-linux-kernel-4.4.55.git] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index c80235206c017a89df2b365b5792845f3ecb850b..0d8cd9bbe101a07c9e39aa3a1759ba85a76381e6 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -54,6 +54,9 @@ config GENERIC_BUG
        depends on BUG
        default y
 
+config GENERIC_BUG_RELATIVE_POINTERS
+       def_bool y
+
 config NO_IOMEM
        def_bool y
 
@@ -87,6 +90,7 @@ config S390
        select HAVE_SYSCALL_TRACEPOINTS
        select HAVE_DYNAMIC_FTRACE
        select HAVE_FUNCTION_GRAPH_TRACER
+       select HAVE_REGS_AND_STACK_ACCESS_API
        select HAVE_DEFAULT_NO_SPIN_MUTEXES
        select HAVE_OPROFILE
        select HAVE_KPROBES
@@ -95,6 +99,9 @@ config S390
        select HAVE_ARCH_TRACEHOOK
        select INIT_ALL_POSSIBLE
        select HAVE_PERF_EVENTS
+       select HAVE_KERNEL_GZIP
+       select HAVE_KERNEL_BZIP2
+       select HAVE_KERNEL_LZMA
        select ARCH_INLINE_SPIN_TRYLOCK
        select ARCH_INLINE_SPIN_TRYLOCK_BH
        select ARCH_INLINE_SPIN_LOCK