[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>

1 files changed, 2 insertions, 0 deletions

diff --git a/arch/x86_64/kernel/aperture.c b/arch/x86_64/kernel/aperture.c
index c9a6b812e926..962ad4823b6a 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 ||