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 /include/asm-x86_64/proto.h | |
| 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 'include/asm-x86_64/proto.h')
| -rw-r--r-- | include/asm-x86_64/proto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h index 8abf2a43c944..1064533e0959 100644 --- a/include/asm-x86_64/proto.h +++ b/include/asm-x86_64/proto.h | |||
| @@ -116,7 +116,7 @@ extern int skip_ioapic_setup; | |||
| 116 | extern int acpi_ht; | 116 | extern int acpi_ht; |
| 117 | extern int acpi_disabled; | 117 | extern int acpi_disabled; |
| 118 | 118 | ||
| 119 | #ifdef CONFIG_GART_IOMMU | 119 | #ifdef CONFIG_IOMMU |
| 120 | extern int fallback_aper_order; | 120 | extern int fallback_aper_order; |
| 121 | extern int fallback_aper_force; | 121 | extern int fallback_aper_force; |
| 122 | extern int iommu_aperture; | 122 | extern int iommu_aperture; |