From 93357abbf4871e65c93d15009191aa7d93bdccaf Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Mon, 12 Sep 2005 18:49:24 +0200
Subject: [PATCH] --- yaml --- r: 8586 b: refs/heads/master c:
 63f02fd7ceb2fa4065d8a0c9943e4af2876b6c91 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86_64/kernel/aperture.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 902aaed3625e..1900503fb3a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d3d0f7704ed0bc7eaca0501eeae3e5da1ea6c87
+refs/heads/master: 63f02fd7ceb2fa4065d8a0c9943e4af2876b6c91
diff --git a/trunk/arch/x86_64/kernel/aperture.c b/trunk/arch/x86_64/kernel/aperture.c
index c9a6b812e926..962ad4823b6a 100644
--- a/trunk/arch/x86_64/kernel/aperture.c
+++ b/trunk/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 ||