aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Metcalf <cmetcalf@tilera.com>2010-06-05 09:05:47 -0400
committerChris Metcalf <cmetcalf@tilera.com>2010-06-05 10:26:55 -0400
commit482e6f8466ab1066f1a969bcdbe916b56439622c (patch)
tree52848e31bfc699437430d586b68e732250cbaf03
parent867e359b97c970a60626d5d76bbe2a8fadbf38fb (diff)
arch/tile: Do not use GFP_KERNEL for dma_alloc_coherent().
Feedback from fujita.tomonori@lab.ntt.co.jp. Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
-rw-r--r--arch/tile/kernel/pci-dma.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/tile/kernel/pci-dma.c b/arch/tile/kernel/pci-dma.c
index 1d456404f065..5ad5e13b0fa6 100644
--- a/arch/tile/kernel/pci-dma.c
+++ b/arch/tile/kernel/pci-dma.c
@@ -35,8 +35,7 @@ void *dma_alloc_coherent(struct device *dev,
35 struct page *pg; 35 struct page *pg;
36 dma_addr_t addr; 36 dma_addr_t addr;
37 37
38 /* Set GFP_KERNEL to ensure we have memory with a kernel VA. */ 38 gfp |= __GFP_ZERO;
39 gfp |= GFP_KERNEL | __GFP_ZERO;
40 39
41 /* 40 /*
42 * By forcing NUMA node 0 for 32-bit masks we ensure that the 41 * By forcing NUMA node 0 for 32-bit masks we ensure that the