---

yaml --- r: 207164 b: refs/heads/master c: 482e6f8 h: refs/heads/master v: v3
git-mirror · Jun 5, 2010 · 2719ec3 · 2719ec3
1 parent 8e6539c
commit 2719ec3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 867e359b97c970a60626d5d76bbe2a8fadbf38fb
+refs/heads/master: 482e6f8466ab1066f1a969bcdbe916b56439622c
diff --git a/trunk/arch/tile/kernel/pci-dma.c b/trunk/arch/tile/kernel/pci-dma.c
@@ -35,8 +35,7 @@ void *dma_alloc_coherent(struct device *dev,
 	struct page *pg;
 	dma_addr_t addr;
 
-	/* Set GFP_KERNEL to ensure we have memory with a kernel VA. */
-	gfp |= GFP_KERNEL | __GFP_ZERO;
+	gfp |= __GFP_ZERO;
 
 	/*
 	 * By forcing NUMA node 0 for 32-bit masks we ensure that the