[PATCH] x86-64: Don't allocate aperture when swiotlb is enabled and no AGP found

No-one needs it then

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andi Kleen 2005-09-12 18:49:24 +02:00 committed by Linus Torvalds
parent 5d3d0f7704
commit 63f02fd7ce

View File

@ -245,6 +245,8 @@ void __init iommu_hole_init(void)
if (aper_alloc) { if (aper_alloc) {
/* Got the aperture from the AGP bridge */ /* Got the aperture from the AGP bridge */
} else if (swiotlb && !valid_agp) {
/* Do nothing */
} else if ((!no_iommu && end_pfn >= 0xffffffff>>PAGE_SHIFT) || } else if ((!no_iommu && end_pfn >= 0xffffffff>>PAGE_SHIFT) ||
force_iommu || force_iommu ||
valid_agp || valid_agp ||