From e8e192bb5e77d821ee6e916e761ae7c0afe33b29 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Mon, 8 Sep 2008 18:10:12 +0900 Subject: [PATCH] --- yaml --- r: 112571 b: refs/heads/master c: 8a53ad675f86ee003482b557da944e070d3c4859 h: refs/heads/master i: 112569: 6f55b5257757da4b8546099a134f5ae6d35cfabc 112567: 446179543e6b6bc4145f1151796cda6d0b121c02 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/pci-nommu.c | 3 +-- trunk/include/asm-x86/dma-mapping.h | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f3514ce47f92..10e8f51d2b3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de9f521fb72dd091aa4989fe2e004ecf4785a850 +refs/heads/master: 8a53ad675f86ee003482b557da944e070d3c4859 diff --git a/trunk/arch/x86/kernel/pci-nommu.c b/trunk/arch/x86/kernel/pci-nommu.c index 0f51883cc6a8..ada1c87cafc2 100644 --- a/trunk/arch/x86/kernel/pci-nommu.c +++ b/trunk/arch/x86/kernel/pci-nommu.c @@ -80,7 +80,6 @@ nommu_alloc_coherent(struct device *hwdev, size_t size, int node; struct page *page; - gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); gfp |= __GFP_ZERO; dma_mask = hwdev->coherent_dma_mask; @@ -93,7 +92,7 @@ nommu_alloc_coherent(struct device *hwdev, size_t size, node = dev_to_node(hwdev); #ifdef CONFIG_X86_64 - if (dma_mask <= DMA_32BIT_MASK) + if (dma_mask <= DMA_32BIT_MASK && !(gfp & GFP_DMA)) gfp |= GFP_DMA32; #endif diff --git a/trunk/include/asm-x86/dma-mapping.h b/trunk/include/asm-x86/dma-mapping.h index 088c56814aa3..ad8b49032d18 100644 --- a/trunk/include/asm-x86/dma-mapping.h +++ b/trunk/include/asm-x86/dma-mapping.h @@ -246,6 +246,8 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, struct dma_mapping_ops *ops = get_dma_ops(dev); void *memory; + gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); + if (dma_alloc_from_coherent(dev, size, dma_handle, &memory)) return memory;