diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-22 12:57:16 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-22 12:57:16 -0500 |
| commit | 90c453ca2214394eec602d98e6cb92d151908493 (patch) | |
| tree | 336d27967f7b2143b4c9bc0ab798e323850babca /arch/arm/mm | |
| parent | a135c717d5cdb311cff7661af4c17fef0562e590 (diff) | |
| parent | 23be7fdafa50c42b7aa6ebcf0c090dea09e2ef08 (diff) | |
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()
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 903dba064a03..170a116d1b29 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c | |||
| @@ -1106,7 +1106,7 @@ static struct page **__iommu_alloc_buffer(struct device *dev, size_t size, | |||
| 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) |