Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 35 insertions, 15 deletions

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 43c0acad7160..0d8cd9bbe101 100644
--- 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,37 @@ 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
+        select ARCH_INLINE_SPIN_LOCK_BH
+        select ARCH_INLINE_SPIN_LOCK_IRQ
+        select ARCH_INLINE_SPIN_LOCK_IRQSAVE
+        select ARCH_INLINE_SPIN_UNLOCK
+        select ARCH_INLINE_SPIN_UNLOCK_BH
+        select ARCH_INLINE_SPIN_UNLOCK_IRQ
+        select ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE
+        select ARCH_INLINE_READ_TRYLOCK
+        select ARCH_INLINE_READ_LOCK
+        select ARCH_INLINE_READ_LOCK_BH
+        select ARCH_INLINE_READ_LOCK_IRQ
+        select ARCH_INLINE_READ_LOCK_IRQSAVE
+        select ARCH_INLINE_READ_UNLOCK
+        select ARCH_INLINE_READ_UNLOCK_BH
+        select ARCH_INLINE_READ_UNLOCK_IRQ
+        select ARCH_INLINE_READ_UNLOCK_IRQRESTORE
+        select ARCH_INLINE_WRITE_TRYLOCK
+        select ARCH_INLINE_WRITE_LOCK
+        select ARCH_INLINE_WRITE_LOCK_BH
+        select ARCH_INLINE_WRITE_LOCK_IRQ
+        select ARCH_INLINE_WRITE_LOCK_IRQSAVE
+        select ARCH_INLINE_WRITE_UNLOCK
+        select ARCH_INLINE_WRITE_UNLOCK_BH
+        select ARCH_INLINE_WRITE_UNLOCK_IRQ
+        select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
 
 config SCHED_OMIT_FRAME_POINTER
         bool
@@ -192,23 +227,8 @@ config AUDIT_ARCH
         bool
         default y
 
-config S390_SWITCH_AMODE
-        bool "Switch kernel/user addressing modes"
-        help
-          This option allows to switch the addressing modes of kernel and user
-          space. The kernel parameter switch_amode=on will enable this feature,
-          default is disabled. Enabling this (via kernel parameter) on machines
-          earlier than IBM System z9-109 EC/BC will reduce system performance.
-
-          Note that this option will also be selected by selecting the execute
-          protection option below. Enabling the execute protection via the
-          noexec kernel parameter will also switch the addressing modes,
-          independent of the switch_amode kernel parameter.
-
-
 config S390_EXEC_PROTECT
         bool "Data execute protection"
-        select S390_SWITCH_AMODE
         help
           This option allows to enable a buffer overflow protection for user
           space programs and it also selects the addressing mode option above.