diff options
| author | Andi Kleen <ak@suse.de> | 2006-06-26 07:57:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 13:48:17 -0400 |
| commit | a813ce432f27c4f5011c7b5ac9d2bbbfeb41d9a7 (patch) | |
| tree | 377a1aeb76547faf06ecd93b9da9b4c90817b2d4 /arch/x86_64/kernel/pci-dma.c | |
| parent | 4d9bc79cd28b779610d9590b3a96a28a0f64a25a (diff) | |
[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/pci-dma.c')
| -rw-r--r-- | arch/x86_64/kernel/pci-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/pci-dma.c b/arch/x86_64/kernel/pci-dma.c index 117bcebe9ebc..33926c367250 100644 --- a/arch/x86_64/kernel/pci-dma.c +++ b/arch/x86_64/kernel/pci-dma.c | |||
| @@ -266,7 +266,7 @@ __init int iommu_setup(char *p) | |||
| 266 | swiotlb = 1; | 266 | swiotlb = 1; |
| 267 | #endif | 267 | #endif |
| 268 | 268 | ||
| 269 | #ifdef CONFIG_GART_IOMMU | 269 | #ifdef CONFIG_IOMMU |
| 270 | gart_parse_options(p); | 270 | gart_parse_options(p); |
| 271 | #endif | 271 | #endif |
| 272 | 272 | ||