From 24f410cd801f44624c64349b5b80ca2a5d9cf9bc Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Mon, 8 Sep 2008 18:10:14 +0900
Subject: [PATCH] --- yaml --- r: 112573 b: refs/heads/master c:
 68e91d61346db4359464d06617500141cfd1442a h: refs/heads/master i:   112571:
 e8e192bb5e77d821ee6e916e761ae7c0afe33b29 v: v3

---
 [refs]              | 2 +-
 trunk/lib/swiotlb.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 8258ef64b510..6ce31c27d231 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 823e7e8c6ef12cd1943dc42fe7595ca74e8cc3d7
+refs/heads/master: 68e91d61346db4359464d06617500141cfd1442a
diff --git a/trunk/lib/swiotlb.c b/trunk/lib/swiotlb.c
index 977edbdbc1de..3066ffe1f9eb 100644
--- a/trunk/lib/swiotlb.c
+++ b/trunk/lib/swiotlb.c
@@ -467,13 +467,6 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size,
 	void *ret;
 	int order = get_order(size);
 
-	/*
-	 * XXX fix me: the DMA API should pass us an explicit DMA mask
-	 * instead, or use ZONE_DMA32 (ia64 overloads ZONE_DMA to be a ~32
-	 * bit range instead of a 16MB one).
-	 */
-	flags |= GFP_DMA;
-
 	ret = (void *)__get_free_pages(flags, order);
 	if (ret && address_needs_mapping(hwdev, virt_to_bus(ret))) {
 		/*