summaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/setup.c
diff options
context:
space:
mode:
authorAndi Kleen2006-06-26 13:57:22 +0200
committerLinus Torvalds2006-06-26 19:48:17 +0200
commita813ce432f27c4f5011c7b5ac9d2bbbfeb41d9a7 (patch)
tree377a1aeb76547faf06ecd93b9da9b4c90817b2d4 /arch/x86_64/kernel/setup.c
parent[PATCH] x86_64: Make sure is_compat_task works early (diff)
downloadkernel-qcow2-linux-a813ce432f27c4f5011c7b5ac9d2bbbfeb41d9a7.tar.gz
kernel-qcow2-linux-a813ce432f27c4f5011c7b5ac9d2bbbfeb41d9a7.tar.xz
kernel-qcow2-linux-a813ce432f27c4f5011c7b5ac9d2bbbfeb41d9a7.zip
[PATCH] x86_64: Rename IOMMU option, fix help and mark option embedded.
- Rename the GART_IOMMU option to IOMMU to make clear it's not just for AMD - Rewrite the help text to better emphatise this fact - Make it an embedded option because too many people get it wrong. To my astonishment I discovered the aacraid driver tests this symbol directly. This looks quite broken to me - it's an internal implementation detail of the PCI DMA API. Can the maintainer please clarify what this test was intended to do? Cc: linux-scsi@vger.kernel.org Cc: alan@redhat.com Cc: markh@osdl.org Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64/kernel/setup.c')
-rw-r--r--arch/x86_64/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index 9dadb9a1db2a..816203d57e11 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -702,7 +702,7 @@ void __init setup_arch(char **cmdline_p)
e820_setup_gap();
-#ifdef CONFIG_GART_IOMMU
+#ifdef CONFIG_IOMMU
iommu_hole_init();
#endif