From c3fef8b67c635e1b73d0d2f876e54840c1a30730 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Tue, 30 May 2006 22:47:48 +0200 Subject: [PATCH] --- yaml --- r: 27031 b: refs/heads/master c: dc9a719528d782777b86936b817cc0913d5f0b42 h: refs/heads/master i: 27029: 741677cde5e41fd7e074b8880485a4adcf623a96 27027: e61177d4ef1c163dad50e505a6eb0ae8ec3eb330 27023: e9e120e7d3f0a39ff09d84ec5e02c2f83440ed3d v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/pci-gart.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d181b9aa6196..875df5a0e437 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ae53cd496d36db5f25e6f84b8b9fe7e675999a1 +refs/heads/master: dc9a719528d782777b86936b817cc0913d5f0b42 diff --git a/trunk/arch/x86_64/kernel/pci-gart.c b/trunk/arch/x86_64/kernel/pci-gart.c index 2480d3f08a47..82a7c9bfdfa0 100644 --- a/trunk/arch/x86_64/kernel/pci-gart.c +++ b/trunk/arch/x86_64/kernel/pci-gart.c @@ -631,10 +631,8 @@ static int __init pci_iommu_init(void) 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 compiled in.\n" - KERN_ERR "WARNING 32bit PCI may malfunction.\n" - KERN_ERR "You might want to enable " - "CONFIG_GART_IOMMU\n"); + "but IOMMU not available.\n" + KERN_ERR "WARNING 32bit PCI may malfunction.\n"); } return -1; }