diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-23 11:18:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-23 11:18:47 +0200 |
| commit | 8a517c514d5893602cf85c1b4c47afbbc04d2198 (patch) | |
| tree | e7c40f68ef97bb2bdb4c366c0b45437bc049feb1 /arch/ia64/include/asm/iommu.h | |
| parent | x86, cpu: cpu/proc.c display cache alignment and address sizes for 32 bit (diff) | |
| parent | Linux 2.6.31-rc7 (diff) | |
| download | linux-8a517c514d5893602cf85c1b4c47afbbc04d2198.tar.xz linux-8a517c514d5893602cf85c1b4c47afbbc04d2198.zip | |
Merge commit 'v2.6.31-rc7' into x86/cpu
Diffstat (limited to 'arch/ia64/include/asm/iommu.h')
| -rw-r--r-- | arch/ia64/include/asm/iommu.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/iommu.h b/arch/ia64/include/asm/iommu.h index 0490794fe4aa..745e095fe82e 100644 --- a/arch/ia64/include/asm/iommu.h +++ b/arch/ia64/include/asm/iommu.h @@ -9,6 +9,11 @@ extern void pci_iommu_shutdown(void); extern void no_iommu_init(void); extern int force_iommu, no_iommu; extern int iommu_detected; +#ifdef CONFIG_DMAR +extern int iommu_pass_through; +#else +#define iommu_pass_through (0) +#endif extern void iommu_dma_init(void); extern void machvec_init(const char *name); |