diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-13 19:48:22 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-13 19:48:22 -0700 |
commit | fb5fe0fd626c425ed41842c4318aa7ab6f3c2db7 (patch) | |
tree | 940f1218666e6d1f1ac574d526858dbb3b2526a6 /lib/dma-virt.c | |
parent | 065f3e4951f11701729ad310ca0b610f61d91e2a (diff) | |
parent | 7b9f71f974a12740e79e918cfd58c2fce0b5b580 (diff) | |
download | linux-fb5fe0fd626c425ed41842c4318aa7ab6f3c2db7.tar.bz2 |
Merge tag 'powerpc-4.11-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull some more powerpc fixes from Michael Ellerman:
"The main item is the addition of the Power9 Machine Check handler.
This was delayed to make sure some details were correct, and is as
minimal as possible.
The rest is small fixes, two for the Power9 PMU, two dealing with
obscure toolchain problems, two for the PowerNV IOMMU code (used by
VFIO), and one to fix a crash on 32-bit machines with macio devices
due to missing dma_ops.
Thanks to:
Alexey Kardashevskiy, Cyril Bur, Larry Finger, Madhavan Srinivasan,
Nicholas Piggin"
* tag 'powerpc-4.11-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/64s: POWER9 machine check handler
powerpc/64s: allow machine check handler to set severity and initiator
powerpc/64s: fix handling of non-synchronous machine checks
powerpc/pmac: Fix crash in dma-mapping.h with NULL dma_ops
powerpc/powernv/ioda2: Update iommu table base on ownership change
powerpc/powernv/ioda2: Gracefully fail if too many TCE levels requested
selftests/powerpc: Replace stxvx and lxvx with stxvd2x/lxvd2x
powerpc/perf: Handle sdar_mode for marked event in power9
powerpc/perf: Fix perf_get_data_addr() for power9 DD1
powerpc/boot: Fix zImage TOC alignment
Diffstat (limited to 'lib/dma-virt.c')
0 files changed, 0 insertions, 0 deletions