Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 updates from Martin Schwidefsky: "There are a couple of new things for s390 with this merge request: - a new scheduling domain "drawer" is added to reflect the unusual topology found on z13 machines. Performance tests showed up to 8 percent gain with the additional domain. - the new crc-32 checksum crypto module uses the vector-galois-field multiply and sum SIMD instruction to speed up crc-32 and crc-32c. - proper __ro_after_init support, this requires RO_AFTER_INIT_DATA in the generic vmlinux.lds linker script definitions. - kcov instrumentation support. A prerequisite for that is the inline assembly basic block cleanup, which is the reason for the net/iucv/iucv.c change. - support for 2GB pages is added to the hugetlbfs backend. Then there are two removals: - the oprofile hardware sampling support is dead code and is removed. The oprofile user space uses the perf interface nowadays. - the ETR clock synchronization is removed, this has been superseeded be the STP clock synchronization. And it always has been "interesting" code.. And the usual bug fixes and cleanups" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (82 commits) s390/pci: Delete an unnecessary check before the function call "pci_dev_put" s390/smp: clean up a condition s390/cio/chp : Remove deprecated create_singlethread_workqueue s390/chsc: improve channel path descriptor determination s390/chsc: sanitize fmt check for chp_desc determination s390/cio: make fmt1 channel path descriptor optional s390/chsc: fix ioctl CHSC_INFO_CU command s390/cio/device_ops: fix kernel doc s390/cio: allow to reset channel measurement block s390/console: Make preferred console handling more consistent s390/mm: fix gmap tlb flush issues s390/mm: add support for 2GB hugepages s390: have unique symbol for __switch_to address s390/cpuinfo: show maximum thread id s390/ptrace: clarify bits in the per_struct s390: stack address vs thread_info s390: remove pointless load within __switch_to s390: enable kcov support s390/cpumf: use basic block for ecctr inline assembly s390/hypfs: use basic block for diag inline assembly ...
Showing
- Documentation/cputopology.txt 32 additions, 8 deletionsDocumentation/cputopology.txt
- Documentation/kernel-parameters.txt 0 additions, 2 deletionsDocumentation/kernel-parameters.txt
- Documentation/s390/s390dbf.txt 1 addition, 1 deletionDocumentation/s390/s390dbf.txt
- arch/s390/Kconfig 6 additions, 10 deletionsarch/s390/Kconfig
- arch/s390/boot/compressed/Makefile 2 additions, 0 deletionsarch/s390/boot/compressed/Makefile
- arch/s390/configs/default_defconfig 1 addition, 0 deletionsarch/s390/configs/default_defconfig
- arch/s390/configs/gcov_defconfig 1 addition, 0 deletionsarch/s390/configs/gcov_defconfig
- arch/s390/configs/performance_defconfig 1 addition, 0 deletionsarch/s390/configs/performance_defconfig
- arch/s390/crypto/Makefile 3 additions, 0 deletionsarch/s390/crypto/Makefile
- arch/s390/crypto/crc32-vx.c 310 additions, 0 deletionsarch/s390/crypto/crc32-vx.c
- arch/s390/crypto/crc32be-vx.S 207 additions, 0 deletionsarch/s390/crypto/crc32be-vx.S
- arch/s390/crypto/crc32le-vx.S 268 additions, 0 deletionsarch/s390/crypto/crc32le-vx.S
- arch/s390/defconfig 4 additions, 0 deletionsarch/s390/defconfig
- arch/s390/hypfs/hypfs_diag.c 8 additions, 6 deletionsarch/s390/hypfs/hypfs_diag.c
- arch/s390/hypfs/hypfs_vm.c 1 addition, 1 deletionarch/s390/hypfs/hypfs_vm.c
- arch/s390/include/asm/cache.h 1 addition, 4 deletionsarch/s390/include/asm/cache.h
- arch/s390/include/asm/cio.h 1 addition, 1 deletionarch/s390/include/asm/cio.h
- arch/s390/include/asm/cpu_mf.h 14 additions, 3 deletionsarch/s390/include/asm/cpu_mf.h
- arch/s390/include/asm/diag.h 1 addition, 1 deletionarch/s390/include/asm/diag.h
- arch/s390/include/asm/etr.h 0 additions, 261 deletionsarch/s390/include/asm/etr.h
Please register or sign in to comment