diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2007-10-24 12:49:47 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-30 00:22:22 +0100 |
| commit | 395624fcddd178de01a78aa88670a86ec919de77 (patch) | |
| tree | bfc66eafdbf5b220020a8d986fac0c6f255aeb51 /include | |
| parent | e1054b39b275340f7ba0308eca83c127b36e936e (diff) | |
| download | kernel_samsung_smdk4412-395624fcddd178de01a78aa88670a86ec919de77.zip kernel_samsung_smdk4412-395624fcddd178de01a78aa88670a86ec919de77.tar.gz kernel_samsung_smdk4412-395624fcddd178de01a78aa88670a86ec919de77.tar.bz2 | |
x86 gart: rename iommu.h to gart.h
This patch renames the include file asm-x86/iommu.h to asm-x86/gart.h to make
clear to which IOMMU implementation it belongs. The patch also adds "GART" to
the Kconfig line.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Acked-by: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/gart.h | 29 | ||||
| -rw-r--r-- | include/asm-x86/iommu.h | 4 |
2 files changed, 31 insertions, 2 deletions
diff --git a/include/asm-x86/gart.h b/include/asm-x86/gart.h new file mode 100644 index 0000000..5af471f --- /dev/null +++ b/include/asm-x86/gart.h @@ -0,0 +1,29 @@ +#ifndef _ASM_X8664_IOMMU_H +#define _ASM_X8664_IOMMU_H 1 + +extern void pci_iommu_shutdown(void); +extern void no_iommu_init(void); +extern int force_iommu, no_iommu; +extern int iommu_detected; +#ifdef CONFIG_IOMMU +extern void gart_iommu_init(void); +extern void gart_iommu_shutdown(void); +extern void __init gart_parse_options(char *); +extern void iommu_hole_init(void); +extern int fallback_aper_order; +extern int fallback_aper_force; +extern int iommu_aperture; +extern int iommu_aperture_allowed; +extern int iommu_aperture_disabled; +extern int fix_aperture; +#else +#define iommu_aperture 0 +#define iommu_aperture_allowed 0 + +static inline void gart_iommu_shutdown(void) +{ +} + +#endif + +#endif diff --git a/include/asm-x86/iommu.h b/include/asm-x86/iommu.h index 5af471f..07862fd 100644 --- a/include/asm-x86/iommu.h +++ b/include/asm-x86/iommu.h @@ -1,5 +1,5 @@ -#ifndef _ASM_X8664_IOMMU_H -#define _ASM_X8664_IOMMU_H 1 +#ifndef _ASM_X8664_GART_H +#define _ASM_X8664_GART_H 1 extern void pci_iommu_shutdown(void); extern void no_iommu_init(void); |