diff options
| author | Linus Torvalds | 2014-01-28 18:02:24 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2014-01-28 18:02:24 +0100 |
| commit | e770d73ceb93c235525cb9bbbf1374c9b61a0895 (patch) | |
| tree | ac72b64d1978fece984c8b5a27442acbef7f172c /arch/s390/Kconfig | |
| parent | Merge tag 'cris-correction-for-3.14' of git://jni.nu/cris (diff) | |
| parent | s390/hypfs: add interface for diagnose 0x304 (diff) | |
| download | kernel-qcow2-linux-e770d73ceb93c235525cb9bbbf1374c9b61a0895.tar.gz kernel-qcow2-linux-e770d73ceb93c235525cb9bbbf1374c9b61a0895.tar.xz kernel-qcow2-linux-e770d73ceb93c235525cb9bbbf1374c9b61a0895.zip | |
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
Diffstat (limited to 'arch/s390/Kconfig')
| -rw-r--r-- | arch/s390/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 4f858f77d870..65a07750f4f9 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -596,7 +596,7 @@ config CRASH_DUMP 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. |