diff options
-rw-r--r-- | arch/x86/kernel/pci-swiotlb.c | 5 | ||||
-rw-r--r-- | include/linux/swiotlb.h | 2 | ||||
-rw-r--r-- | lib/swiotlb.c | 8 |
3 files changed, 2 insertions, 13 deletions
diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c index 0ac7cd524788..ea675cfe76fe 100644 --- a/arch/x86/kernel/pci-swiotlb.c +++ b/arch/x86/kernel/pci-swiotlb.c | |||
@@ -13,11 +13,6 @@ | |||
13 | 13 | ||
14 | int swiotlb __read_mostly; | 14 | int swiotlb __read_mostly; |
15 | 15 | ||
16 | void *swiotlb_alloc(unsigned order, unsigned long nslabs) | ||
17 | { | ||
18 | return (void *)__get_free_pages(GFP_DMA | __GFP_NOWARN, order); | ||
19 | } | ||
20 | |||
21 | dma_addr_t swiotlb_phys_to_bus(struct device *hwdev, phys_addr_t paddr) | 16 | dma_addr_t swiotlb_phys_to_bus(struct device *hwdev, phys_addr_t paddr) |
22 | { | 17 | { |
23 | return paddr; | 18 | return paddr; |
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h index 94db70444c17..6bc50944040f 100644 --- a/include/linux/swiotlb.h +++ b/include/linux/swiotlb.h | |||
@@ -23,8 +23,6 @@ struct scatterlist; | |||
23 | extern void | 23 | extern void |
24 | swiotlb_init(void); | 24 | swiotlb_init(void); |
25 | 25 | ||
26 | extern void *swiotlb_alloc(unsigned order, unsigned long nslabs); | ||
27 | |||
28 | extern dma_addr_t swiotlb_phys_to_bus(struct device *hwdev, | 26 | extern dma_addr_t swiotlb_phys_to_bus(struct device *hwdev, |
29 | phys_addr_t address); | 27 | phys_addr_t address); |
30 | extern phys_addr_t swiotlb_bus_to_phys(struct device *hwdev, | 28 | extern phys_addr_t swiotlb_bus_to_phys(struct device *hwdev, |
diff --git a/lib/swiotlb.c b/lib/swiotlb.c index 9edfdd442edc..3c4c21cdf43d 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c | |||
@@ -114,11 +114,6 @@ setup_io_tlb_npages(char *str) | |||
114 | __setup("swiotlb=", setup_io_tlb_npages); | 114 | __setup("swiotlb=", setup_io_tlb_npages); |
115 | /* make io_tlb_overflow tunable too? */ | 115 | /* make io_tlb_overflow tunable too? */ |
116 | 116 | ||
117 | void * __weak swiotlb_alloc(unsigned order, unsigned long nslabs) | ||
118 | { | ||
119 | return (void *)__get_free_pages(GFP_DMA | __GFP_NOWARN, order); | ||
120 | } | ||
121 | |||
122 | dma_addr_t __weak swiotlb_phys_to_bus(struct device *hwdev, phys_addr_t paddr) | 117 | dma_addr_t __weak swiotlb_phys_to_bus(struct device *hwdev, phys_addr_t paddr) |
123 | { | 118 | { |
124 | return paddr; | 119 | return paddr; |
@@ -240,7 +235,8 @@ swiotlb_late_init_with_default_size(size_t default_size) | |||
240 | bytes = io_tlb_nslabs << IO_TLB_SHIFT; | 235 | bytes = io_tlb_nslabs << IO_TLB_SHIFT; |
241 | 236 | ||
242 | while ((SLABS_PER_PAGE << order) > IO_TLB_MIN_SLABS) { | 237 | while ((SLABS_PER_PAGE << order) > IO_TLB_MIN_SLABS) { |
243 | io_tlb_start = swiotlb_alloc(order, io_tlb_nslabs); | 238 | io_tlb_start = (void *)__get_free_pages(GFP_DMA | __GFP_NOWARN, |
239 | order); | ||
244 | if (io_tlb_start) | 240 | if (io_tlb_start) |
245 | break; | 241 | break; |
246 | order--; | 242 | order--; |