diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 23:51:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 23:51:44 -0400 |
| commit | bdfa54dfd9eea001274dbcd622657a904fe43b81 (patch) | |
| tree | ab251ab359e519656d7061bbe8db4c7ab355404b | |
| parent | 2481bc75283ea10e75d5fb1a8b42af363fc4b45c (diff) | |
| parent | a1307bba1adcc9b338511180fa94a54b4c3f534b (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 updates from Martin Schwidefsky:
"The major change in this merge is the removal of the support for
31-bit kernels. Naturally 31-bit user space will continue to work via
the compat layer.
And then some cleanup, some improvements and bug fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (23 commits)
s390/smp: wait until secondaries are active & online
s390/hibernate: fix save and restore of kernel text section
s390/cacheinfo: add missing facility check
s390/syscalls: simplify syscall_get_arch()
s390/irq: enforce correct irqclass_sub_desc array size
s390: remove "64" suffix from mem64.S and swsusp_asm64.S
s390/ipl: cleanup macro usage
s390/ipl: cleanup shutdown_action attributes
s390/ipl: cleanup bin attr usage
s390/uprobes: fix address space annotation
s390: add missing arch_release_task_struct() declaration
s390: make couple of functions and variables static
s390/maccess: improve s390_kernel_write()
s390/maccess: remove potentially broken probe_kernel_write()
s390/watchdog: support for KVM hypervisors and delete pr_info messages
s390/watchdog: enable KEEPALIVE for /dev/watchdog
s390/dasd: remove setting of scheduler from driver
s390/traps: panic() instead of die() on translation exception
s390: remove test_facility(2) (== z/Architecture mode active) checks
s390/cmpxchg: simplify cmpxchg_double
...
119 files changed, 1337 insertions, 7255 deletions
diff --git a/arch/s390/Kbuild b/arch/s390/Kbuild index 647c3eccc3d0..2938934c6518 100644 --- a/arch/s390/Kbuild +++ b/arch/s390/Kbuild | |||
| @@ -4,6 +4,5 @@ obj-$(CONFIG_KVM) += kvm/ | |||
| 4 | obj-$(CONFIG_CRYPTO_HW) += crypto/ | 4 | obj-$(CONFIG_CRYPTO_HW) += crypto/ |
| 5 | obj-$(CONFIG_S390_HYPFS_FS) += hypfs/ | 5 | obj-$(CONFIG_S390_HYPFS_FS) += hypfs/ |
| 6 | obj-$(CONFIG_APPLDATA_BASE) += appldata/ | 6 | obj-$(CONFIG_APPLDATA_BASE) += appldata/ |
| 7 | obj-$(CONFIG_MATHEMU) += math-emu/ | ||
| 8 | obj-y += net/ | 7 | obj-y += net/ |
| 9 | obj-$(CONFIG_PCI) += pci/ | 8 | obj-$(CONFIG_PCI) += pci/ |
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 6321fd8bf813..a5ced5c3c1e0 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
| @@ -35,7 +35,7 @@ config GENERIC_BUG_RELATIVE_POINTERS | |||
| 35 | def_bool y | 35 | def_bool y |
| 36 | 36 | ||
| 37 | config ARCH_DMA_ADDR_T_64BIT | ||