aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/pci-swiotlb.c5
-rw-r--r--include/linux/swiotlb.h2
-rw-r--r--lib/swiotlb.c7
3 files changed, 1 insertions, 13 deletions
diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
index 6af96ee44200..0ac7cd524788 100644
--- a/arch/x86/kernel/pci-swiotlb.c
+++ b/arch/x86/kernel/pci-swiotlb.c
@@ -13,11 +13,6 @@
13 13
14int swiotlb __read_mostly; 14int swiotlb __read_mostly;
15 15
16void * __init swiotlb_alloc_boot(size_t size, unsigned long nslabs)
17{
18 return alloc_bootmem_low_pages(size);
19}
20
21void *swiotlb_alloc(unsigned order, unsigned long nslabs) 16void *swiotlb_alloc(unsigned order, unsigned long nslabs)
22{ 17{
23 return (void *)__get_free_pages(GFP_DMA | __GFP_NOWARN, order); 18 return (void *)__get_free_pages(GFP_DMA | __GFP_NOWARN, order);
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index cb1a6631b8f4..94db70444c17 100644
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -14,7 +14,6 @@ struct scatterlist;
14 */ 14 */
15#define IO_TLB_SEGSIZE 128 15#define IO_TLB_SEGSIZE 128
16 16
17
18/* 17/*
19 * log of the size of each IO TLB slab. The number of slabs is command line 18 * log of the size of each IO TLB slab. The number of slabs is command line
20 * controllable. 19 * controllable.
@@ -24,7 +23,6 @@ struct scatterlist;
24extern void 23extern void
25swiotlb_init(void); 24swiotlb_init(void);
26 25
27extern void *swiotlb_alloc_boot(size_t bytes, unsigned long nslabs);
28extern void *swiotlb_alloc(unsigned order, unsigned long nslabs); 26extern void *swiotlb_alloc(unsigned order, unsigned long nslabs);
29 27
30extern dma_addr_t swiotlb_phys_to_bus(struct device *hwdev, 28extern dma_addr_t swiotlb_phys_to_bus(struct device *hwdev,
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index bffe6d7ef9d9..9edfdd442edc 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
117void * __weak __init swiotlb_alloc_boot(size_t size, unsigned long nslabs)
118{
119 return alloc_bootmem_low_pages(size);
120}
121
122void * __weak swiotlb_alloc(unsigned order, unsigned long nslabs) 117void * __weak swiotlb_alloc(unsigned order, unsigned long nslabs)
123{ 118{
124 return (void *)__get_free_pages(GFP_DMA | __GFP_NOWARN, order); 119 return (void *)__get_free_pages(GFP_DMA | __GFP_NOWARN, order);
@@ -189,7 +184,7 @@ swiotlb_init_with_default_size(size_t default_size)
189 /* 184 /*
190 * Get IO TLB memory from the low pages 185 * Get IO TLB memory from the low pages
191 */ 186 */
192 io_tlb_start = swiotlb_alloc_boot(bytes, io_tlb_nslabs); 187 io_tlb_start = alloc_bootmem_low_pages(bytes);
193 if (!io_tlb_start) 188 if (!io_tlb_start)
194 panic("Cannot allocate SWIOTLB buffer"); 189 panic("Cannot allocate SWIOTLB buffer");
195 io_tlb_end = io_tlb_start + bytes; 190 io_tlb_end = io_tlb_start + bytes;