tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

Pull ARM fix from Russell King:
"Just one fix this time around. __iommu_alloc_buffer() can cause a
BUG() if dma_alloc_coherent() is called with either __GFP_DMA32 or
__GFP_HIGHMEM set. The patch from Alexandre addresses this"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: 8305/1: DMA: Fix kzalloc flags in __iommu_alloc_buffer()

Linus Torvalds 90c453ca a135c717

options
unified split
Changed files
+1 -1
arch
arm
mm
dma-mapping.c
+1 -1
arch/arm/mm/dma-mapping.c
··· 1106 int i = 0; 1107 1108 if (array_size <= PAGE_SIZE) 1109 - pages = kzalloc(array_size, gfp); 1110 else 1111 pages = vzalloc(array_size); 1112 if (!pages)
··· 1106 int i = 0; 1107 1108 if (array_size <= PAGE_SIZE) 1109 + pages = kzalloc(array_size, GFP_KERNEL); 1110 else 1111 pages = vzalloc(array_size); 1112 if (!pages)