From 2719ec3fb4a4c333bc3fd5b564d797a73750a02e Mon Sep 17 00:00:00 2001
From: Chris Metcalf <cmetcalf@tilera.com>
Date: Sat, 5 Jun 2010 09:05:47 -0400
Subject: [PATCH] --- yaml --- r: 207164 b: refs/heads/master c:
 482e6f8466ab1066f1a969bcdbe916b56439622c h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/tile/kernel/pci-dma.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8f216c50acdb..f9d17d82cad7 100644
--- 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
index 1d456404f065..5ad5e13b0fa6 100644
--- 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