diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2012-03-30 11:47:06 -0700 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2012-05-07 14:35:00 +0200 |
| commit | 263b5e8629c9ce21c9cd4c0e29c097afb1c10ef3 (patch) | |
| tree | 5cd19f863f505982c9aa8331b62541e08eae2535 /arch/x86/kernel/apic/io_apic.c | |
| parent | 5e2b930b0784a30c98dee8e9d79c1f84c31f7209 (diff) | |
| download | linux-263b5e8629c9ce21c9cd4c0e29c097afb1c10ef3.tar.gz | |
x86, iommu/vt-d: Clean up interfaces for interrupt remapping
Remove the Intel specific interfaces from dmar.h and remove asm/irq_remapping.h which is only used for io_apic.c anyway. Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Acked-by: Yinghai Lu <yinghai@kernel.org> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Alex Williamson <alex.williamson@redhat.com> Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'arch/x86/kernel/apic/io_apic.c')
| -rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 3db693bda91d..073edd1d3c66 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -58,7 +58,6 @@ #include <asm/hypertransport.h> #include <asm/setup.h> #include <asm/intr_remapping.h> -#include <asm/irq_remapping.h> #include <asm/hpet.h> #include <asm/hw_irq.h> @@ -87,6 +86,22 @@ void __init set_io_apic_ops(const struct io_apic_ops *ops) io_apic_ops = *ops; } +#ifdef CONFIG_IRQ_REMAP +static void irq_remap_modify_chip_defaults(struct irq_chip *chip); +static inline bool irq_remapped(struct irq_cfg *cfg) +{ + return cfg->irq_2_iommu.iommu != NULL; +} +#else +static inline bool irq_remapped(struct irq_cfg *cfg) +{ + return false; +} +static inline void irq_remap_modify_chip_defaults(struct irq_chip *chip) +{ +} +#endif + /* * Is the SiS APIC rmw bug present ? * -1 = don't know, 0 = no, 1 = yes |