diff options
| author | Andi Kleen <ak@suse.de> | 2006-05-30 22:47:48 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-30 20:31:05 -0700 |
| commit | dc9a719528d782777b86936b817cc0913d5f0b42 (patch) | |
| tree | ee7fb8f042a90a1a9ba55f16ddfd8fd6f1879220 /arch/x86_64 | |
| parent | 6ae53cd496d36db5f25e6f84b8b9fe7e675999a1 (diff) | |
| download | op-kernel-dev-dc9a719528d782777b86936b817cc0913d5f0b42.zip op-kernel-dev-dc9a719528d782777b86936b817cc0913d5f0b42.tar.gz | |
[PATCH] x86_64: Fix no IOMMU warning in PCI-GART driver
Complaining about the IOMMU not compiled in doesn't make sense
here because it is clearly compiled in.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64')
| -rw-r--r-- | arch/x86_64/kernel/pci-gart.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c index 2480d3f..82a7c9b 100644 --- a/arch/x86_64/kernel/pci-gart.c +++ b/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; } |
