From 8a8f422d3b4f2cde8e0e1d31638279a26a886a82 Mon Sep 17 00:00:00 2001 From: Suresh Siddha Date: Fri, 30 Mar 2012 11:47:08 -0700 Subject: [PATCH] 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 Cc: Joerg Roedel Cc: Yinghai Lu Cc: David Woodhouse Cc: Alex Williamson Signed-off-by: Joerg Roedel --- arch/ia64/include/asm/{intr_remapping.h => irq_remapping.h} | 0 arch/x86/include/asm/{intr_remapping.h => irq_remapping.h} | 6 +++--- arch/x86/kernel/apic/apic.c | 2 +- arch/x86/kernel/apic/io_apic.c | 2 +- drivers/iommu/Makefile | 2 +- drivers/iommu/dmar.c | 2 +- drivers/iommu/intel-iommu.c | 2 +- .../iommu/{intel_intr_remapping.c => intel_irq_remapping.c} | 4 ++-- drivers/iommu/{intr_remapping.c => irq_remapping.c} | 2 +- drivers/iommu/{intr_remapping.h => irq_remapping.h} | 6 +++--- 10 files changed, 14 insertions(+), 14 deletions(-) rename arch/ia64/include/asm/{intr_remapping.h => irq_remapping.h} (100%) rename arch/x86/include/asm/{intr_remapping.h => irq_remapping.h} (97%) rename drivers/iommu/{intel_intr_remapping.c => intel_irq_remapping.c} (99%) rename drivers/iommu/{intr_remapping.c => irq_remapping.c} (99%) rename drivers/iommu/{intr_remapping.h => irq_remapping.h} (96%) diff --git a/arch/ia64/include/asm/intr_remapping.h b/arch/ia64/include/asm/irq_remapping.h similarity index 100% rename from arch/ia64/include/asm/intr_remapping.h rename to arch/ia64/include/asm/irq_remapping.h diff --git a/arch/x86/include/asm/intr_remapping.h b/arch/x86/include/asm/irq_remapping.h similarity index 97% rename from arch/x86/include/asm/intr_remapping.h rename to arch/x86/include/asm/irq_remapping.h index f9cbbcb2956ebd..dcb0c723102855 100644 --- a/arch/x86/include/asm/intr_remapping.h +++ b/arch/x86/include/asm/irq_remapping.h @@ -19,8 +19,8 @@ * the x86 interrupt management code. */ -#ifndef __X86_INTR_REMAPPING_H -#define __X86_INTR_REMAPPING_H +#ifndef __X86_IRQ_REMAPPING_H +#define __X86_IRQ_REMAPPING_H #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 /* __X86_INTR_REMAPPING_H */ +#endif /* __X86_IRQ_REMAPPING_H */ diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index c02c666c462862..3722179a49db6d 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index abbbcd4d1d7197..ef0648cd7084a0 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -57,7 +57,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index 823e1cf8708f4f..3e5e82ae9f0de9 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -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_DMAR_TABLE) += dmar.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_IOVMM) += omap-iovmm.o obj-$(CONFIG_OMAP_IOMMU_DEBUG) += omap-iommu-debug.o diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index ee74f698eef817..5ef65cf661528b 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #define PREFIX "DMAR: " diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index cef5b8226f3d0f..bf2fbaad5e2295 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/iommu/intel_intr_remapping.c b/drivers/iommu/intel_irq_remapping.c similarity index 99% rename from drivers/iommu/intel_intr_remapping.c rename to drivers/iommu/intel_irq_remapping.c index efeb601c782f9b..b4d39507681a41 100644 --- a/drivers/iommu/intel_intr_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c @@ -11,11 +11,11 @@ #include #include #include -#include +#include #include #include -#include "intr_remapping.h" +#include "irq_remapping.h" struct ioapic_scope { struct intel_iommu *iommu; diff --git a/drivers/iommu/intr_remapping.c b/drivers/iommu/irq_remapping.c similarity index 99% rename from drivers/iommu/intr_remapping.c rename to drivers/iommu/irq_remapping.c index 523a7b3a120553..1cf350e02da8a2 100644 --- a/drivers/iommu/intr_remapping.c +++ b/drivers/iommu/irq_remapping.c @@ -2,7 +2,7 @@ #include #include -#include "intr_remapping.h" +#include "irq_remapping.h" int irq_remapping_enabled; diff --git a/drivers/iommu/intr_remapping.h b/drivers/iommu/irq_remapping.h similarity index 96% rename from drivers/iommu/intr_remapping.h rename to drivers/iommu/irq_remapping.h index bd5d98fec14827..b12974cc1dfe73 100644 --- a/drivers/iommu/intr_remapping.h +++ b/drivers/iommu/irq_remapping.h @@ -19,8 +19,8 @@ * remapping drivers but with no need to be visible outside of the IOMMU layer. */ -#ifndef __INTR_REMAPPING_H -#define __INTR_REMAPPING_H +#ifndef __IRQ_REMAPPING_H +#define __IRQ_REMAPPING_H #ifdef CONFIG_IRQ_REMAP @@ -85,4 +85,4 @@ extern struct irq_remap_ops intel_irq_remap_ops; #endif /* CONFIG_IRQ_REMAP */ -#endif /* __INTR_REMAPPING_H */ +#endif /* __IRQ_REMAPPING_H */