From c0d05b9fbdf2bfb6a50c6b3fcad88dbc2b1e226c Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Thu, 7 Dec 2006 02:14:13 +0100
Subject: [PATCH] --- yaml --- r: 43129 b: refs/heads/master c:
 3807fd46e94ab9f09e5ee3bff5e6515a94e9b3c7 h: refs/heads/master i:   43127:
 c5fe47f64875b374170209af762d3f2d05ab64e9 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86_64/kernel/pci-gart.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b152954023f5..02d225060d4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d331e739f5ad2aaa9d8553891ba6ca823bdbce37
+refs/heads/master: 3807fd46e94ab9f09e5ee3bff5e6515a94e9b3c7
diff --git a/trunk/arch/x86_64/kernel/pci-gart.c b/trunk/arch/x86_64/kernel/pci-gart.c
index 16261a8a3303..fc1960f1f243 100644
--- a/trunk/arch/x86_64/kernel/pci-gart.c
+++ b/trunk/arch/x86_64/kernel/pci-gart.c
@@ -601,10 +601,9 @@ void __init gart_iommu_init(void)
 	    (!force_iommu && end_pfn <= MAX_DMA32_PFN) ||
 	    !iommu_aperture ||
 	    (no_agp && init_k8_gatt(&info) < 0)) {
-		printk(KERN_INFO "PCI-DMA: Disabling IOMMU.\n");
 		if (end_pfn > MAX_DMA32_PFN) {
 			printk(KERN_ERR "WARNING more than 4GB of memory "
-					"but IOMMU not available.\n"
+					"but GART IOMMU not available.\n"
 			       KERN_ERR "WARNING 32bit PCI may malfunction.\n");
 		}
 		return;