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

Pull s390 patches from Martin Schwidefsky:
 "A new binary interface to be able to query and modify the LPAR
  scheduler weight and cap settings.  Some improvements for the hvc
  terminal over iucv and a couple of bux fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/hypfs: add interface for diagnose 0x304
  s390: wire up sys_sched_setattr/sys_sched_getattr
  s390/uapi: fix struct statfs64 definition
  s390/uaccess: remove dead extern declarations, make functions static
  s390/uaccess: test if current->mm is set before walking page tables
  s390/zfcpdump: make zfcpdump depend on 64BIT
  s390/32bit: fix cmpxchg64
  s390/xpram: don't modify module parameters
  s390/zcrypt: remove zcrypt kmsg documentation again
  s390/hvc_iucv: Automatically assign free HVC terminal devices
  s390/hvc_iucv: Display connection details through device attributes
  s390/hvc_iucv: fix sparse warning
  s390/vmur: Link parent CCW device during UR device creation

diff --combined arch/s390/Kconfig
index 4f858f77d870d842fa99fdc26e00b13521ae35e3,40f0c69d20465924f0eeefc8f9dfdf157813ae5c..65a07750f4f946f038bb2e2a4e13f9f6d05dce83
--- 1/arch/s390/Kconfig
--- 2/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -334,10 -334,10 +334,10 @@@ config SM
          a system with only one CPU, like most personal computers, say N. If
          you have a system with more than one CPU, say Y.
  
 -        If you say N here, the kernel will run on single and multiprocessor
 +        If you say N here, the kernel will run on uni- and multiprocessor
          machines, but will use only one CPU of a multiprocessor machine. If
          you say Y here, the kernel will run on many, but not all,
 -        singleprocessor machines. On a singleprocessor machine, the kernel
 +        uniprocessor machines. On a uniprocessor machine, the kernel
          will run faster if you say N here.
  
          See also the SMP-HOWTO available at
@@@ -596,7 -596,7 +596,7 @@@ config CRASH_DUM
  config ZFCPDUMP
        def_bool n
        prompt "zfcpdump support"
-       depends on SMP
+       depends on 64BIT && SMP
        help
          Select this option if you want to build an zfcpdump enabled kernel.
          Refer to <file:Documentation/s390/zfcpdump.txt> for more details on this.