diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2009-09-03 10:34:23 -0400 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-09-03 10:34:23 -0400 |
| commit | 03362a05c55122baff3556109c922285299dfec4 (patch) | |
| tree | 85f83fbf4e1e8027eca05fbd8285041053a713c4 /arch/x86/include/asm/amd_iommu.h | |
| parent | 85da07c409daba3d067824f0051d58f70cb571a0 (diff) | |
| parent | 4751a95134e05f1172131d2001c6991d671fa58c (diff) | |
Merge branch 'amd-iommu/passthrough' into amd-iommu/2.6.32
Conflicts:
arch/x86/kernel/amd_iommu.c
arch/x86/kernel/amd_iommu_init.c
Diffstat (limited to 'arch/x86/include/asm/amd_iommu.h')
| -rw-r--r-- | arch/x86/include/asm/amd_iommu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/amd_iommu.h b/arch/x86/include/asm/amd_iommu.h index bdf96f119f06..ac95995b7bad 100644 --- a/arch/x86/include/asm/amd_iommu.h +++ b/arch/x86/include/asm/amd_iommu.h | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #ifdef CONFIG_AMD_IOMMU | 25 | #ifdef CONFIG_AMD_IOMMU |
| 26 | extern int amd_iommu_init(void); | 26 | extern int amd_iommu_init(void); |
| 27 | extern int amd_iommu_init_dma_ops(void); | 27 | extern int amd_iommu_init_dma_ops(void); |
| 28 | extern int amd_iommu_init_passthrough(void); | ||
| 28 | extern void amd_iommu_detect(void); | 29 | extern void amd_iommu_detect(void); |
| 29 | extern irqreturn_t amd_iommu_int_handler(int irq, void *data); | 30 | extern irqreturn_t amd_iommu_int_handler(int irq, void *data); |
| 30 | extern void amd_iommu_flush_all_domains(void); | 31 | extern void amd_iommu_flush_all_domains(void); |