patch-2.4.27 linux-2.4.27/arch/x86_64/kernel/pci-gart.c
Next file: linux-2.4.27/arch/x86_64/kernel/pci-pc.c
Previous file: linux-2.4.27/arch/x86_64/kernel/mtrr.c
Back to the patch index
Back to the overall index
- Lines: 16
- Date:
2004-08-07 16:26:04.635345997 -0700
- Orig file:
linux-2.4.26/arch/x86_64/kernel/pci-gart.c
- Orig date:
2004-04-14 06:05:28.000000000 -0700
diff -urN linux-2.4.26/arch/x86_64/kernel/pci-gart.c linux-2.4.27/arch/x86_64/kernel/pci-gart.c
@@ -503,12 +503,13 @@
no_agp = no_agp || (agp_init() < 0) || (agp_copy_info(&info) < 0);
#endif
+#ifdef CONFIG_SWIOTLB
if (swiotlb) {
no_iommu = 1;
printk(KERN_INFO "PCI-DMA: Using SWIOTLB\n");
return;
- }
-
+ }
+#endif
if (no_iommu || (!force_mmu && end_pfn < 0xffffffff>>PAGE_SHIFT) || !iommu_aperture) {
printk(KERN_INFO "PCI-DMA: Disabling IOMMU.\n");
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)