summaryrefslogtreecommitdiff
path: root/arch/mips/mm/dma-default.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-12-12 21:34:20 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-12-12 21:34:20 +0300
commita971526e4db7992362e938e53e2deb57e847ecc9 (patch)
tree4ad2426b163d29335d21e8d43cfc7df601332740 /arch/mips/mm/dma-default.c
parent7807563183c4c1bec1bcc815e8bcc40d807c81b7 (diff)
parent78c0cbffebe60e1182c8f077de2c06a1a48dc5ae (diff)
downloadlinux-a971526e4db7992362e938e53e2deb57e847ecc9.tar.xz
Merge branch 'parisc-4.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixes from Helge Deller: "Fix the boot crash on Mako machines with Huge Pages, prevent a panic with SATA controllers (and others) by correctly calculating the IOMMU space, hook up the mlock2 syscall and drop unneeded code in the parisc pci code" * 'parisc-4.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc: Disable huge pages on Mako machines parisc: Wire up mlock2 syscall parisc: Remove unused pcibios_init_bus() parisc iommu: fix panic due to trying to allocate too large region
Diffstat (limited to 'arch/mips/mm/dma-default.c')
0 files changed, 0 insertions, 0 deletions