Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'fixes-for-3.9' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull DMA-mapping fix from Marek Szyprowski:
"An important fix for all ARM architectures which use ZONE_DMA.
Without it dma_alloc_* calls with GFP_ATOMIC flag might have allocated
buffers outsize DMA zone."
* 'fixes-for-3.9' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
ARM: DMA-mapping: add missing GFP_DMA flag for atomic buffer allocation
+3
-2
+3
-2
arch/arm/mm/dma-mapping.c
+3
-2
arch/arm/mm/dma-mapping.c
···
342
342
{
343
343
struct dma_pool *pool = &atomic_pool;
344
344
pgprot_t prot = pgprot_dmacoherent(pgprot_kernel);
345
+
gfp_t gfp = GFP_KERNEL | GFP_DMA;
345
346
unsigned long nr_pages = pool->size >> PAGE_SHIFT;
346
347
unsigned long *bitmap;
347
348
struct page *page;
···
362
361
ptr = __alloc_from_contiguous(NULL, pool->size, prot, &page,
363
362
atomic_pool_init);
364
363
else
365
-
ptr = __alloc_remap_buffer(NULL, pool->size, GFP_KERNEL, prot,
366
-
&page, atomic_pool_init);
364
+
ptr = __alloc_remap_buffer(NULL, pool->size, gfp, prot, &page,
365
+
atomic_pool_init);
367
366
if (ptr) {
368
367
int i;
369
368