aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2008-09-08 05:10:14 -0400
committerIngo Molnar <mingo@elte.hu>2008-09-08 09:50:07 -0400
commit68e91d61346db4359464d06617500141cfd1442a (patch)
tree98d9c471df5980ded654cc5ed91bf63588e87e6d
parent823e7e8c6ef12cd1943dc42fe7595ca74e8cc3d7 (diff)
swiotlb: remove GFP_DMA hack in swiotlb_alloc_coherent
The callers are supposed to set up the gfp flags appropriately. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Acked-by: Joerg Roedel <joerg.roedel@amd.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--lib/swiotlb.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 977edbdbc1de..3066ffe1f9eb 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -467,13 +467,6 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size,
467 void *ret; 467 void *ret;
468 int order = get_order(size); 468 int order = get_order(size);
469 469
470 /*
471 * XXX fix me: the DMA API should pass us an explicit DMA mask
472 * instead, or use ZONE_DMA32 (ia64 overloads ZONE_DMA to be a ~32
473 * bit range instead of a 16MB one).
474 */
475 flags |= GFP_DMA;
476
477 ret = (void *)__get_free_pages(flags, order); 470 ret = (void *)__get_free_pages(flags, order);
478 if (ret && address_needs_mapping(hwdev, virt_to_bus(ret))) { 471 if (ret && address_needs_mapping(hwdev, virt_to_bus(ret))) {
479 /* 472 /*