[PATCH] lib: Replace calls to __get_free_pages() with __get_dma_pages().

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Replace a couple calls to __get_free_pages() with the corresponding
calls to __get_dma_pages().

Signed-off-by: Robert P. J. Day <[email protected]>

---

  that's the lot of them.

diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 10c13ad..8fc38dc 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -201,8 +201,7 @@ swiotlb_late_init_with_default_size(size_t default_size)
 	bytes = io_tlb_nslabs << IO_TLB_SHIFT;

 	while ((SLABS_PER_PAGE << order) > IO_TLB_MIN_SLABS) {
-		io_tlb_start = (char *)__get_free_pages(GFP_DMA | __GFP_NOWARN,
-		                                        order);
+		io_tlb_start = (char *)__get_dma_pages(__GFP_NOWARN, order);
 		if (io_tlb_start)
 			break;
 		order--;
@@ -244,7 +243,7 @@ swiotlb_late_init_with_default_size(size_t default_size)
 	/*
 	 * Get the overflow emergency buffer
 	 */
-	io_tlb_overflow_buffer = (void *)__get_free_pages(GFP_DMA,
+	io_tlb_overflow_buffer = (void *)__get_dma_pages(0,
 	                                          get_order(io_tlb_overflow));
 	if (!io_tlb_overflow_buffer)
 		goto cleanup4;
@@ -449,9 +448,8 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size,
 	 * 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);
+	ret = (void *)__get_dma_pages(flags, order);
 	if (ret && address_needs_mapping(hwdev, virt_to_bus(ret))) {
 		/*
 		 * The allocated memory isn't reachable by the device.
-- 
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA

http://fsdev.net/wiki/index.php?title=Main_Page
========================================================================
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]
  Powered by Linux