summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-01-11 22:45:48 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-12 04:04:59 +0100
commit5b22a3855127bb8221bc96e8e41064b3c5b2bf08 (patch)
tree3b7af627e49122d567fa2da50b7ef54446237127
parent[PATCH] x86_64: Fix warning in nmi.c on uniprocessor kernels (diff)
downloadlinux-5b22a3855127bb8221bc96e8e41064b3c5b2bf08.tar.xz
linux-5b22a3855127bb8221bc96e8e41064b3c5b2bf08.zip
[PATCH] x86_64: Tell user to enable GART_IOMMU when needed
Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/x86_64/kernel/pci-nommu.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/pci-nommu.c b/arch/x86_64/kernel/pci-nommu.c
index 3209adac3272..e41564975195 100644
--- a/arch/x86_64/kernel/pci-nommu.c
+++ b/arch/x86_64/kernel/pci-nommu.c
@@ -92,7 +92,8 @@ void __init no_iommu_init(void)
dma_ops = &nommu_dma_ops;
if (end_pfn > MAX_DMA32_PFN) {
printk(KERN_ERR
- "WARNING more than 4GB of memory but IOMMU disabled.\n"
- KERN_ERR "WARNING 32bit PCI may malfunction.\n");
+ "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");
}
}