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()
Unified · Split
| @@ -1106,7 +1106,7 @@ static struct page **__iommu_alloc_buffer(struct device *dev, size_t size, · 1105 unmodified lines | |||
| 1106 | int i = 0; | 1106 | int i = 0; |
| 1107 | 1107 | ||
| 1108 | if (array_size <= PAGE_SIZE) | 1108 | if (array_size <= PAGE_SIZE) |
| 1109 | pages = kzalloc(array_size, gfp); | 1109 | pages = kzalloc(array_size, GFP_KERNEL); |
| 1110 | else | 1110 | else |
| 1111 | pages = vzalloc(array_size); | 1111 | pages = vzalloc(array_size); |
| 1112 | if (!pages) | 1112 | if (!pages) |