diff options
author | Andi Kleen <ak@suse.de> | 2006-12-06 20:14:13 -0500 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2006-12-06 20:14:13 -0500 |
commit | 3807fd46e94ab9f09e5ee3bff5e6515a94e9b3c7 (patch) | |
tree | 05c3d26d6601a270f2f95153f349d1e1866e2839 /arch | |
parent | d331e739f5ad2aaa9d8553891ba6ca823bdbce37 (diff) |
[PATCH] x86-64: Clarify error message in GART code
- Remove "Disabling IOMMU" message because it confuses people
- Clarify that the GART IOMMU is refered to in other message
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86_64/kernel/pci-gart.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c index 16261a8a3303..fc1960f1f243 100644 --- a/arch/x86_64/kernel/pci-gart.c +++ b/arch/x86_64/kernel/pci-gart.c | |||
@@ -601,10 +601,9 @@ void __init gart_iommu_init(void) | |||
601 | (!force_iommu && end_pfn <= MAX_DMA32_PFN) || | 601 | (!force_iommu && end_pfn <= MAX_DMA32_PFN) || |
602 | !iommu_aperture || | 602 | !iommu_aperture || |
603 | (no_agp && init_k8_gatt(&info) < 0)) { | 603 | (no_agp && init_k8_gatt(&info) < 0)) { |
604 | printk(KERN_INFO "PCI-DMA: Disabling IOMMU.\n"); | ||
605 | if (end_pfn > MAX_DMA32_PFN) { | 604 | if (end_pfn > MAX_DMA32_PFN) { |
606 | printk(KERN_ERR "WARNING more than 4GB of memory " | 605 | printk(KERN_ERR "WARNING more than 4GB of memory " |
607 | "but IOMMU not available.\n" | 606 | "but GART IOMMU not available.\n" |
608 | KERN_ERR "WARNING 32bit PCI may malfunction.\n"); | 607 | KERN_ERR "WARNING 32bit PCI may malfunction.\n"); |
609 | } | 608 | } |
610 | return; | 609 | return; |