diff options
| author | Jon Mason <jdmason@us.ibm.com> | 2006-06-26 07:58:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 13:48:18 -0400 |
| commit | 8d4f6b93a4aaa6b56b600cd1165c971f4395e4b3 (patch) | |
| tree | 23955634ded577e53c46390714a6f069b4587c86 /include/asm-x86_64 | |
| parent | 2bbc419f9d51b44f3fdeea12c5b786bdace82b8e (diff) | |
[PATCH] x86_64: Calgary IOMMU - introduce iommu_detected
swiotlb relies on the gart specific iommu_aperture variable to know if
we discovered a hardware IOMMU before swiotlb initialization. Introduce
iommu_detected to do the same thing, but in a HW IOMMU neutral manner,
in preparation for adding the Calgary HW IOMMU.
Signed-Off-By: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-Off-By: Jon Mason <jdmason@us.ibm.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-x86_64')
| -rw-r--r-- | include/asm-x86_64/proto.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h index 105476ff8039..9d3335b4e9b6 100644 --- a/include/asm-x86_64/proto.h +++ b/include/asm-x86_64/proto.h | |||
| @@ -116,6 +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 | extern int iommu_detected; | ||
| 119 | #ifdef CONFIG_IOMMU | 120 | #ifdef CONFIG_IOMMU |
| 120 | extern int fallback_aper_order; | 121 | extern int fallback_aper_order; |
| 121 | extern int fallback_aper_force; | 122 | extern int fallback_aper_force; |