aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/pci-dma.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/pci-dma.c')
-rw-r--r--arch/x86/kernel/pci-dma.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 9f07cfcbd3a5..1b3beb5075e6 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -133,9 +133,11 @@ void __init pci_iommu_alloc(void)
133 /* free the range so iommu could get some range less than 4G */ 133 /* free the range so iommu could get some range less than 4G */
134 dma32_free_bootmem(); 134 dma32_free_bootmem();
135 135
136 if (pci_xen_swiotlb_detect() || pci_swiotlb_detect()) 136 if (pci_xen_swiotlb_detect() || pci_swiotlb_detect_override())
137 goto out; 137 goto out;
138 138
139 pci_swiotlb_detect_4gb();
140
139 gart_iommu_hole_init(); 141 gart_iommu_hole_init();
140 142
141 detect_calgary(); 143 detect_calgary();