From: Andi Kleen Date: Mon, 12 Sep 2005 16:49:24 +0000 (+0200) Subject: [PATCH] x86-64: Don't allocate aperture when swiotlb is enabled and no AGP found X-Git-Tag: v2.6.14-rc1~70 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=63f02fd7ceb2fa4065d8a0c9943e4af2876b6c91;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Linus Torvalds --- diff --git a/arch/x86_64/kernel/aperture.c b/arch/x86_64/kernel/aperture.c index c9a6b812e92..962ad4823b6 100644 --- 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 ||