Hi Linus,
please pull from the 'for-linus' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus
to receive the following updates:
- The remaining patches for the z13 machine support: kernel build option for
z13, the cache synonym avoidance, SMT support, compare-and-delay for
spinloops and the CES5S crypto adapater.
- The ftrace support for function tracing with the gcc hotpatch option. This
touches common code Makefiles, Steven is ok with the changes.
- The hypfs file system gets an extension to access diagnose 0x0c data in
user space for performance analysis for Linux running under z/VM.
- The iucv hvc console gets wildcard spport for the user id filtering.
- The cacheinfo code is converted to use the generic infrastructure.
- Cleanup and bug fixes.
Chen Gang (2):
s390/sclp: fix declaration of _sclp_print_early()
s390/crypto: remove 'const' to avoid compiler warnings
Christophe Jaillet (1):
s390/hmcdrv: free memory on error path
Gerald Schaefer (1):
dcssblk: issue warning when trying to save SN/EN type DCSS
Heiko Carstens (15):
s390/ftrace: add code replacement sanity checks
s390/pci: add missing address space annotation
s390/disassembler: remove indentical initializer
s390/pgtable: add unsigned long casts
s390/signal: add sys_sigreturn and sys_rt_sigreturn declarations
s390: keep Kconfig sorted
s390/sclp: sign extend return value of _sclp_print_early()
s390: reintroduce diag 44 calls for cpu_relax()
ftrace: allow architectures to specify ftrace compile options
ftrace: let notrace function attribute disable hotpatching if necessary
s390/ftrace: hotpatch support for function tracing
s390/jump label: add sanity checks
s390/jump label: use different nop instruction
s390/smp: increase maximum value of NR_CPUS to 512
s390/cacheinfo: don't use smp_processor_id() in preemptible context
Hendrik Brueckner (3):
s390/hvc_iucv: add simple wildcard matches to the iucv allow filter
s390/mm: correct missing space when reporting user process faults
s390/process: free vx save area when releasing tasks
Ingo Tuchscherer (3):
s390/zcrypt: Number of supported ap domains is not retrievable.
s390/zcrypt: Add support for new crypto express (CEX5S) adapter.
s390/zcrypt: fixed domain scanning problem (again)
Joe Perches (1):
s390: remove unnecessary KERN_CONT
Martin Schwidefsky (6):
s390: add z13 code generation support
s390: avoid z13 cache aliasing
s390: add SMT support
s390: update default configuration
s390/tape: remove redundant if statement
s390/spinlock: add compare-and-delay to lock wait loops
Michael Holzheu (2):
s390/hypfs: Add diagnose 0c support
s390/hypfs: Eliminate hypfs interval
Paul Bolle (1):
s390/smp: remove check for CONFIG_ZFCPDUMP
Rickard Strandqvist (1):
s390/cio: idset.c: remove some unused functions
Sebastian Ott (2):
s390/dasd: add locking for global_profile access
s390/dasd: cleanup profiling
Sudeep Holla (1):
s390: move cacheinfo sysfs to generic cacheinfo infrastructure
Syam Sidhardhan (1):
s390/hmcdrv: remove unnecessary version.h inclusion
Thomas Huth (2):
s390/docs: Break long lines in Debugging390.txt
s390/docs: Remove section about script debugging from Debugging390.txt
Documentation/s390/Debugging390.txt | 493 +++++++++++++++-----------------
Makefile | 6 +-
arch/s390/Kconfig | 42 ++-
arch/s390/Makefile | 12 +
arch/s390/boot/compressed/misc.c | 3 +-
arch/s390/configs/default_defconfig | 2 +-
arch/s390/configs/gcov_defconfig | 1 +
arch/s390/configs/performance_defconfig | 1 +
arch/s390/configs/zfcpdump_defconfig | 1 +
arch/s390/crypto/aes_s390.c | 4 +-
arch/s390/defconfig | 7 +-
arch/s390/hypfs/Makefile | 1 +
arch/s390/hypfs/hypfs.h | 7 +-
arch/s390/hypfs/hypfs_dbfs.c | 49 +---
arch/s390/hypfs/hypfs_diag0c.c | 139 +++++++++
arch/s390/hypfs/inode.c | 9 +-
arch/s390/include/asm/cpu_mf.h | 14 +
arch/s390/include/asm/elf.h | 8 +-
arch/s390/include/asm/ftrace.h | 15 +
arch/s390/include/asm/jump_label.h | 7 +-
arch/s390/include/asm/pgtable.h | 4 +
arch/s390/include/asm/processor.h | 5 +-
arch/s390/include/asm/reset.h | 3 +-
arch/s390/include/asm/sclp.h | 7 +-
arch/s390/include/asm/setup.h | 3 +
arch/s390/include/asm/sigp.h | 1 +
arch/s390/include/asm/smp.h | 4 +
arch/s390/include/asm/sysinfo.h | 20 +-
arch/s390/include/asm/topology.h | 4 +
arch/s390/include/uapi/asm/hypfs.h | 35 ++-
arch/s390/kernel/Makefile | 4 +-
arch/s390/kernel/base.S | 3 +-
arch/s390/kernel/cache.c | 391 ++++++-------------------
arch/s390/kernel/dis.c | 9 +-
arch/s390/kernel/early.c | 18 ++
arch/s390/kernel/entry.h | 4 +-
arch/s390/kernel/ftrace.c | 108 ++++---
arch/s390/kernel/head.S | 4 +-
arch/s390/kernel/ipl.c | 11 +-
arch/s390/kernel/jump_label.c | 63 +++-
arch/s390/kernel/kprobes.c | 3 +-
arch/s390/kernel/machine_kexec.c | 19 +-
arch/s390/kernel/mcount.S | 2 +
arch/s390/kernel/process.c | 18 +-
arch/s390/kernel/processor.c | 10 +-
arch/s390/kernel/sclp.S | 3 +-
arch/s390/kernel/setup.c | 3 +
arch/s390/kernel/smp.c | 261 +++++++++++++----
arch/s390/kernel/sysinfo.c | 8 +
arch/s390/kernel/topology.c | 63 ++--
arch/s390/kernel/vtime.c | 58 +++-
arch/s390/lib/spinlock.c | 52 +++-
arch/s390/mm/fault.c | 4 +-
arch/s390/mm/init.c | 9 +-
arch/s390/mm/mmap.c | 142 ++++++++-
arch/s390/mm/pgtable.c | 6 +-
arch/s390/pci/pci_mmio.c | 4 +-
drivers/s390/block/dasd.c | 102 ++-----
drivers/s390/block/dasd_int.h | 3 +-
drivers/s390/block/dasd_proc.c | 21 +-
drivers/s390/block/dcssblk.c | 15 +-
drivers/s390/char/hmcdrv_ftp.c | 6 +-
drivers/s390/char/hmcdrv_mod.c | 1 -
drivers/s390/char/sclp_early.c | 49 +++-
drivers/s390/char/tape_34xx.c | 12 +-
drivers/s390/cio/cio.c | 2 +-
drivers/s390/cio/idset.c | 20 --
drivers/s390/cio/idset.h | 2 -
drivers/s390/crypto/ap_bus.c | 144 +++++++---
drivers/s390/crypto/ap_bus.h | 1 +
drivers/s390/crypto/zcrypt_api.h | 1 +
drivers/s390/crypto/zcrypt_cex4.c | 33 ++-
drivers/tty/hvc/hvc_iucv.c | 31 +-
include/linux/compiler.h | 4 +
kernel/Makefile | 4 +-
kernel/events/Makefile | 2 +-
kernel/locking/Makefile | 8 +-
kernel/sched/Makefile | 2 +-
kernel/trace/Makefile | 4 +-
lib/Makefile | 2 +-
scripts/Makefile.build | 5 +-
scripts/recordmcount.pl | 9 +-
82 files changed, 1640 insertions(+), 1030 deletions(-)
create mode 100644 arch/s390/hypfs/hypfs_diag0c.c