aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/amd_iommu.c2
-rw-r--r--arch/x86/kernel/pci-calgary_64.c2
-rw-r--r--arch/x86/kernel/pci-gart_64.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index 6f7b97445738..70537d117a96 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -572,7 +572,7 @@ static void dma_ops_reserve_addresses(struct dma_ops_domain *dom,
572 if (start_page + pages > last_page) 572 if (start_page + pages > last_page)
573 pages = last_page - start_page; 573 pages = last_page - start_page;
574 574
575 set_bit_string(dom->bitmap, start_page, pages); 575 iommu_area_reserve(dom->bitmap, start_page, pages);
576} 576}
577 577
578static void dma_ops_free_pagetable(struct dma_ops_domain *dma_dom) 578static void dma_ops_free_pagetable(struct dma_ops_domain *dma_dom)
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
index fe7695e4caae..080d1d27f37a 100644
--- a/arch/x86/kernel/pci-calgary_64.c
+++ b/arch/x86/kernel/pci-calgary_64.c
@@ -261,7 +261,7 @@ static void iommu_range_reserve(struct iommu_table *tbl,
261 badbit, tbl, start_addr, npages); 261 badbit, tbl, start_addr, npages);
262 } 262 }
263 263
264 set_bit_string(tbl->it_map, index, npages); 264 iommu_area_reserve(tbl->it_map, index, npages);
265 265
266 spin_unlock_irqrestore(&tbl->it_lock, flags); 266 spin_unlock_irqrestore(&tbl->it_lock, flags);
267} 267}
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
index 508ef470b27f..3dcb1ad86e38 100644
--- a/arch/x86/kernel/pci-gart_64.c
+++ b/arch/x86/kernel/pci-gart_64.c
@@ -827,7 +827,7 @@ void __init gart_iommu_init(void)
827 * Out of IOMMU space handling. 827 * Out of IOMMU space handling.
828 * Reserve some invalid pages at the beginning of the GART. 828 * Reserve some invalid pages at the beginning of the GART.
829 */ 829 */
830 set_bit_string(iommu_gart_bitmap, 0, EMERGENCY_PAGES); 830 iommu_area_reserve(iommu_gart_bitmap, 0, EMERGENCY_PAGES);
831 831
832 agp_memory_reserved = iommu_size; 832 agp_memory_reserved = iommu_size;
833 printk(KERN_INFO 833 printk(KERN_INFO