Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 90c453ca2214394eec602d98e6cb92d151908493

Authored by Linus Torvalds
2 parents a135c717d5 23be7fdafa
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

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

Showing 1 changed file Side-by-side Diff

arch/arm/mm/dma-mapping.c
Diff comments   View file @ 90c453c
... ... @@ -1106,7 +1106,7 @@
1106 1106 int i = 0;
1107 1107  
1108 1108 if (array_size <= PAGE_SIZE)
1109   - pages = kzalloc(array_size, gfp);
  1109 + pages = kzalloc(array_size, GFP_KERNEL);
1110 1110 else
1111 1111 pages = vzalloc(array_size);
1112 1112 if (!pages)