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

90c453ca · Linus Torvalds <[email protected]> · 2015-02-22 09:57:16 -08:00

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()

Commit: 90c453ca2214394eec602d98e6cb92d151908493
Parents: a135c717 · 23be7fda

Merge commit. Changes below are compared with the first parent: a135c717.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
arch/arm/mm/dma-mapping.c	modified	+1	−1	View file

arch/arm/mm/dma-mapping.c

View file

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 903dba0..170a116 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,
 	int i = 0;
 
 	if (array_size <= PAGE_SIZE)
-		pages = kzalloc(array_size, gfp);
+		pages = kzalloc(array_size, GFP_KERNEL);
 	else
 		pages = vzalloc(array_size);
 	if (!pages)