iommu: rename intr_remapping.[ch] to irq_remapping.[ch]
Make the file names consistent with the naming conventions of irq subsystem. Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> Cc: Joerg Roedel <joerg.roedel@amd.com> Cc: Yinghai Lu <yinghai@kernel.org> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Alex Williamson <alex.williamson@redhat.com> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
This commit is contained in:
parent
95a02e976c
commit
8a8f422d3b
@ -19,8 +19,8 @@
|
|||||||
* the x86 interrupt management code.
|
* the x86 interrupt management code.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __X86_INTR_REMAPPING_H
|
#ifndef __X86_IRQ_REMAPPING_H
|
||||||
#define __X86_INTR_REMAPPING_H
|
#define __X86_IRQ_REMAPPING_H
|
||||||
|
|
||||||
#ifdef CONFIG_IRQ_REMAP
|
#ifdef CONFIG_IRQ_REMAP
|
||||||
|
|
||||||
@ -100,4 +100,4 @@ static inline int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
|
|||||||
}
|
}
|
||||||
#endif /* CONFIG_IRQ_REMAP */
|
#endif /* CONFIG_IRQ_REMAP */
|
||||||
|
|
||||||
#endif /* __X86_INTR_REMAPPING_H */
|
#endif /* __X86_IRQ_REMAPPING_H */
|
@ -35,7 +35,7 @@
|
|||||||
#include <linux/smp.h>
|
#include <linux/smp.h>
|
||||||
#include <linux/mm.h>
|
#include <linux/mm.h>
|
||||||
|
|
||||||
#include <asm/intr_remapping.h>
|
#include <asm/irq_remapping.h>
|
||||||
#include <asm/perf_event.h>
|
#include <asm/perf_event.h>
|
||||||
#include <asm/x86_init.h>
|
#include <asm/x86_init.h>
|
||||||
#include <asm/pgalloc.h>
|
#include <asm/pgalloc.h>
|
||||||
|
@ -57,7 +57,7 @@
|
|||||||
#include <asm/msidef.h>
|
#include <asm/msidef.h>
|
||||||
#include <asm/hypertransport.h>
|
#include <asm/hypertransport.h>
|
||||||
#include <asm/setup.h>
|
#include <asm/setup.h>
|
||||||
#include <asm/intr_remapping.h>
|
#include <asm/irq_remapping.h>
|
||||||
#include <asm/hpet.h>
|
#include <asm/hpet.h>
|
||||||
#include <asm/hw_irq.h>
|
#include <asm/hw_irq.h>
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o
|
|||||||
obj-$(CONFIG_AMD_IOMMU_V2) += amd_iommu_v2.o
|
obj-$(CONFIG_AMD_IOMMU_V2) += amd_iommu_v2.o
|
||||||
obj-$(CONFIG_DMAR_TABLE) += dmar.o
|
obj-$(CONFIG_DMAR_TABLE) += dmar.o
|
||||||
obj-$(CONFIG_INTEL_IOMMU) += iova.o intel-iommu.o
|
obj-$(CONFIG_INTEL_IOMMU) += iova.o intel-iommu.o
|
||||||
obj-$(CONFIG_IRQ_REMAP) += intel_intr_remapping.o intr_remapping.o
|
obj-$(CONFIG_IRQ_REMAP) += intel_irq_remapping.o irq_remapping.o
|
||||||
obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o
|
obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o
|
||||||
obj-$(CONFIG_OMAP_IOVMM) += omap-iovmm.o
|
obj-$(CONFIG_OMAP_IOVMM) += omap-iovmm.o
|
||||||
obj-$(CONFIG_OMAP_IOMMU_DEBUG) += omap-iommu-debug.o
|
obj-$(CONFIG_OMAP_IOMMU_DEBUG) += omap-iommu-debug.o
|
||||||
|
@ -36,7 +36,7 @@
|
|||||||
#include <linux/tboot.h>
|
#include <linux/tboot.h>
|
||||||
#include <linux/dmi.h>
|
#include <linux/dmi.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <asm/intr_remapping.h>
|
#include <asm/irq_remapping.h>
|
||||||
#include <asm/iommu_table.h>
|
#include <asm/iommu_table.h>
|
||||||
|
|
||||||
#define PREFIX "DMAR: "
|
#define PREFIX "DMAR: "
|
||||||
|
@ -42,7 +42,7 @@
|
|||||||
#include <linux/dmi.h>
|
#include <linux/dmi.h>
|
||||||
#include <linux/pci-ats.h>
|
#include <linux/pci-ats.h>
|
||||||
#include <linux/memblock.h>
|
#include <linux/memblock.h>
|
||||||
#include <asm/intr_remapping.h>
|
#include <asm/irq_remapping.h>
|
||||||
#include <asm/cacheflush.h>
|
#include <asm/cacheflush.h>
|
||||||
#include <asm/iommu.h>
|
#include <asm/iommu.h>
|
||||||
|
|
||||||
|
@ -11,11 +11,11 @@
|
|||||||
#include <asm/cpu.h>
|
#include <asm/cpu.h>
|
||||||
#include <linux/intel-iommu.h>
|
#include <linux/intel-iommu.h>
|
||||||
#include <acpi/acpi.h>
|
#include <acpi/acpi.h>
|
||||||
#include <asm/intr_remapping.h>
|
#include <asm/irq_remapping.h>
|
||||||
#include <asm/pci-direct.h>
|
#include <asm/pci-direct.h>
|
||||||
#include <asm/msidef.h>
|
#include <asm/msidef.h>
|
||||||
|
|
||||||
#include "intr_remapping.h"
|
#include "irq_remapping.h"
|
||||||
|
|
||||||
struct ioapic_scope {
|
struct ioapic_scope {
|
||||||
struct intel_iommu *iommu;
|
struct intel_iommu *iommu;
|
@ -2,7 +2,7 @@
|
|||||||
#include <linux/string.h>
|
#include <linux/string.h>
|
||||||
#include <linux/errno.h>
|
#include <linux/errno.h>
|
||||||
|
|
||||||
#include "intr_remapping.h"
|
#include "irq_remapping.h"
|
||||||
|
|
||||||
int irq_remapping_enabled;
|
int irq_remapping_enabled;
|
||||||
|
|
@ -19,8 +19,8 @@
|
|||||||
* remapping drivers but with no need to be visible outside of the IOMMU layer.
|
* remapping drivers but with no need to be visible outside of the IOMMU layer.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __INTR_REMAPPING_H
|
#ifndef __IRQ_REMAPPING_H
|
||||||
#define __INTR_REMAPPING_H
|
#define __IRQ_REMAPPING_H
|
||||||
|
|
||||||
#ifdef CONFIG_IRQ_REMAP
|
#ifdef CONFIG_IRQ_REMAP
|
||||||
|
|
||||||
@ -85,4 +85,4 @@ extern struct irq_remap_ops intel_irq_remap_ops;
|
|||||||
|
|
||||||
#endif /* CONFIG_IRQ_REMAP */
|
#endif /* CONFIG_IRQ_REMAP */
|
||||||
|
|
||||||
#endif /* __INTR_REMAPPING_H */
|
#endif /* __IRQ_REMAPPING_H */
|
Loading…
Reference in New Issue
Block a user