[PATCH] x86-64: Don't allocate aperture when swiotlb is enabled and n…

…o AGP found No-one needs it then Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
git-mirror · Sep 12, 2005 · 63f02fd · 63f02fd
1 parent 5d3d0f7
commit 63f02fd
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/arch/x86_64/kernel/aperture.c b/arch/x86_64/kernel/aperture.c
@@ -245,6 +245,8 @@ void __init iommu_hole_init(void)
 
 	if (aper_alloc) { 
 		/* Got the aperture from the AGP bridge */
+	} else if (swiotlb && !valid_agp) {
+		/* Do nothing */
 	} else if ((!no_iommu && end_pfn >= 0xffffffff>>PAGE_SHIFT) ||
 		   force_iommu ||
 		   valid_agp ||