Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 patches from Martin Schwidefsky: "Add the finit_module system call, fix the irq statistics in /proc/stat, fix a s390dbf lockdep problem, a patch revert for a problem that is not 100% understood yet, and a few patches to fix warnings." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/pci: define read*_relaxed functions s390/topology: export cpu_topology s390/pm: export pm_power_off s390/pci: define isa_dma_bridge_buggy s390/3215: partially revert tty close handling fix s390/irq: count cpu restart events s390/irq: remove split irq fields from /proc/stat s390/irq: enable irq sum accounting for /proc/stat again s390/syscalls: wire up finit_module syscall s390/pci: remove dead code s390/smp: fix section mismatch for smp_add_present_cpu() s390/debug: Fix s390dbf lockdep problem in debug_(un)register_view()
Showing
- arch/s390/include/asm/dma.h 6 additions, 0 deletionsarch/s390/include/asm/dma.h
- arch/s390/include/asm/io.h 5 additions, 0 deletionsarch/s390/include/asm/io.h
- arch/s390/include/asm/irq.h 48 additions, 30 deletionsarch/s390/include/asm/irq.h
- arch/s390/include/uapi/asm/unistd.h 2 additions, 1 deletionarch/s390/include/uapi/asm/unistd.h
- arch/s390/kernel/compat_wrapper.S 6 additions, 0 deletionsarch/s390/kernel/compat_wrapper.S
- arch/s390/kernel/debug.c 7 additions, 4 deletionsarch/s390/kernel/debug.c
- arch/s390/kernel/irq.c 75 additions, 49 deletionsarch/s390/kernel/irq.c
- arch/s390/kernel/nmi.c 1 addition, 1 deletionarch/s390/kernel/nmi.c
- arch/s390/kernel/perf_cpum_cf.c 1 addition, 1 deletionarch/s390/kernel/perf_cpum_cf.c
- arch/s390/kernel/runtime_instr.c 1 addition, 1 deletionarch/s390/kernel/runtime_instr.c
- arch/s390/kernel/setup.c 2 additions, 1 deletionarch/s390/kernel/setup.c
- arch/s390/kernel/smp.c 7 additions, 5 deletionsarch/s390/kernel/smp.c
- arch/s390/kernel/syscalls.S 1 addition, 0 deletionsarch/s390/kernel/syscalls.S
- arch/s390/kernel/time.c 2 additions, 2 deletionsarch/s390/kernel/time.c
- arch/s390/kernel/topology.c 2 additions, 0 deletionsarch/s390/kernel/topology.c
- arch/s390/mm/fault.c 1 addition, 1 deletionarch/s390/mm/fault.c
- arch/s390/oprofile/hwsampler.c 1 addition, 1 deletionarch/s390/oprofile/hwsampler.c
- arch/s390/pci/pci.c 2 additions, 31 deletionsarch/s390/pci/pci.c
- arch/s390/pci/pci_dma.c 0 additions, 2 deletionsarch/s390/pci/pci_dma.c
- drivers/s390/block/dasd_diag.c 1 addition, 1 deletiondrivers/s390/block/dasd_diag.c
Loading
Please register or sign in to comment