diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-16 05:51:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-16 05:51:24 -0400 |
| commit | 8a4a6182fd43c46ed8c12e26b4669854bcad300a (patch) | |
| tree | f1db8bfe06b8f2b75c6348cf84fc5412ab3e8fd7 /arch/x86/include | |
| parent | 5dfaf90f8052327c92fbe3c470a2e6634be296c0 (diff) | |
| parent | 6a047d8b9efc4b7d0c57ca4835f7e519e5c90d3f (diff) | |
Merge branch 'amd-iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/amd_iommu.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/amd_iommu.h b/arch/x86/include/asm/amd_iommu.h index 262e02820049..bdf96f119f06 100644 --- a/arch/x86/include/asm/amd_iommu.h +++ b/arch/x86/include/asm/amd_iommu.h | |||
| @@ -29,9 +29,11 @@ extern void amd_iommu_detect(void); | |||
| 29 | extern irqreturn_t amd_iommu_int_handler(int irq, void *data); | 29 | extern irqreturn_t amd_iommu_int_handler(int irq, void *data); |
| 30 | extern void amd_iommu_flush_all_domains(void); | 30 | extern void amd_iommu_flush_all_domains(void); |
| 31 | extern void amd_iommu_flush_all_devices(void); | 31 | extern void amd_iommu_flush_all_devices(void); |
| 32 | extern void amd_iommu_shutdown(void); | ||
| 32 | #else | 33 | #else |
| 33 | static inline int amd_iommu_init(void) { return -ENODEV; } | 34 | static inline int amd_iommu_init(void) { return -ENODEV; } |
| 34 | static inline void amd_iommu_detect(void) { } | 35 | static inline void amd_iommu_detect(void) { } |
| 36 | static inline void amd_iommu_shutdown(void) { } | ||
| 35 | #endif | 37 | #endif |
| 36 | 38 | ||
| 37 | #endif /* _ASM_X86_AMD_IOMMU_H */ | 39 | #endif /* _ASM_X86_AMD_IOMMU_H */ |