Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (72 commits)
  [S390] 3215/3270 console: remove wrong comment
  [S390] dasd: remove BKL from extended error reporting code
  [S390] vmlogrdr: remove BKL
  [S390] vmur: remove BKL
  [S390] zcrypt: remove BKL
  [S390] 3270: remove BKL
  [S390] vmwatchdog: remove lock_kernel() from open() function
  [S390] monwriter: remove lock_kernel() from open() function
  [S390] monreader: remove lock_kernel() from open() function
  [S390] s390: remove unused nfsd #includes
  [S390] ftrace: build ftrace.o when CONFIG_FTRACE_SYSCALLS is set for s390
  [S390] etr/stp: put correct per cpu variable
  [S390] tty3270: move keyboard compat ioctls
  [S390] sclp: improve servicability setting
  [S390] s390: use change recording override for kernel mapping
  [S390] MAINTAINERS: Add s390 drivers block
  [S390] use generic sockios.h header file
  [S390] use generic termbits.h header file
  [S390] smp: remove unused typedef and defines
  [S390] cmm: free pages on hibernate.
  ...

1 files changed, 0 insertions, 15 deletions

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 16c673096a22..c80235206c01 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -220,23 +220,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.