---

yaml --- r: 8586 b: refs/heads/master c: 63f02fd h: refs/heads/master v: v3
git-mirror · Sep 12, 2005 · 93357ab · 93357ab
1 parent 74fbd36
commit 93357ab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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 ||