From 199f006a0da978a5837a456bfed9a26482a3bae0 Mon Sep 17 00:00:00 2001 From: Suresh Siddha Date: Fri, 30 Mar 2012 11:47:08 -0700 Subject: [PATCH] --- yaml --- r: 302723 b: refs/heads/master c: 8a8f422d3b4f2cde8e0e1d31638279a26a886a82 h: refs/heads/master i: 302721: d37c215a75260b0b38faac12e7c05e987aa6538c 302719: 04fb773c861b88c69f43c8b774728f1a19cdfed0 v: v3 --- [refs] | 2 +- .../ia64/include/asm/{intr_remapping.h => irq_remapping.h} | 0 .../x86/include/asm/{intr_remapping.h => irq_remapping.h} | 6 +++--- trunk/arch/x86/kernel/apic/apic.c | 2 +- trunk/arch/x86/kernel/apic/io_apic.c | 2 +- trunk/drivers/iommu/Makefile | 2 +- trunk/drivers/iommu/dmar.c | 2 +- trunk/drivers/iommu/intel-iommu.c | 2 +- .../iommu/{intel_intr_remapping.c => intel_irq_remapping.c} | 4 ++-- trunk/drivers/iommu/{intr_remapping.c => irq_remapping.c} | 2 +- trunk/drivers/iommu/{intr_remapping.h => irq_remapping.h} | 6 +++--- 11 files changed, 15 insertions(+), 15 deletions(-) rename trunk/arch/ia64/include/asm/{intr_remapping.h => irq_remapping.h} (100%) rename trunk/arch/x86/include/asm/{intr_remapping.h => irq_remapping.h} (97%) rename trunk/drivers/iommu/{intel_intr_remapping.c => intel_irq_remapping.c} (99%) rename trunk/drivers/iommu/{intr_remapping.c => irq_remapping.c} (99%) rename trunk/drivers/iommu/{intr_remapping.h => irq_remapping.h} (96%) diff --git a/[refs] b/[refs] index 9907e72d3b95..836f1c3f9c7d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95a02e976c39d63716b8c7c226bc530a2041536f +refs/heads/master: 8a8f422d3b4f2cde8e0e1d31638279a26a886a82 diff --git a/trunk/arch/ia64/include/asm/intr_remapping.h b/trunk/arch/ia64/include/asm/irq_remapping.h similarity index 100% rename from trunk/arch/ia64/include/asm/intr_remapping.h rename to trunk/arch/ia64/include/asm/irq_remapping.h diff --git a/trunk/arch/x86/include/asm/intr_remapping.h b/trunk/arch/x86/include/asm/irq_remapping.h similarity index 97% rename from trunk/arch/x86/include/asm/intr_remapping.h rename to trunk/arch/x86/include/asm/irq_remapping.h index f9cbbcb2956e..dcb0c7231028 100644 --- a/trunk/arch/x86/include/asm/intr_remapping.h +++ b/trunk/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/trunk/arch/x86/kernel/apic/apic.c b/trunk/arch/x86/kernel/apic/apic.c index c02c666c4628..3722179a49db 100644 --- a/trunk/arch/x86/kernel/apic/apic.c +++ b/trunk/arch/x86/kernel/apic/apic.c @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include diff --git a/trunk/arch/x86/kernel/apic/io_apic.c b/trunk/arch/x86/kernel/apic/io_apic.c index abbbcd4d1d71..ef0648cd7084 100644 --- a/trunk/arch/x86/kernel/apic/io_apic.c +++ b/trunk/arch/x86/kernel/apic/io_apic.c @@ -57,7 +57,7 @@ #include #include #include -#include +#include #include #include diff --git a/trunk/drivers/iommu/Makefile b/trunk/drivers/iommu/Makefile index 823e1cf8708f..3e5e82ae9f0d 100644 --- a/trunk/drivers/iommu/Makefile +++ b/trunk/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/trunk/drivers/iommu/dmar.c b/trunk/drivers/iommu/dmar.c index ee74f698eef8..5ef65cf66152 100644 --- a/trunk/drivers/iommu/dmar.c +++ b/trunk/drivers/iommu/dmar.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #define PREFIX "DMAR: " diff --git a/trunk/drivers/iommu/intel-iommu.c b/trunk/drivers/iommu/intel-iommu.c index cef5b8226f3d..bf2fbaad5e22 100644 --- a/trunk/drivers/iommu/intel-iommu.c +++ b/trunk/drivers/iommu/intel-iommu.c @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include diff --git a/trunk/drivers/iommu/intel_intr_remapping.c b/trunk/drivers/iommu/intel_irq_remapping.c similarity index 99% rename from trunk/drivers/iommu/intel_intr_remapping.c rename to trunk/drivers/iommu/intel_irq_remapping.c index efeb601c782f..b4d39507681a 100644 --- a/trunk/drivers/iommu/intel_intr_remapping.c +++ b/trunk/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/trunk/drivers/iommu/intr_remapping.c b/trunk/drivers/iommu/irq_remapping.c similarity index 99% rename from trunk/drivers/iommu/intr_remapping.c rename to trunk/drivers/iommu/irq_remapping.c index 523a7b3a1205..1cf350e02da8 100644 --- a/trunk/drivers/iommu/intr_remapping.c +++ b/trunk/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/trunk/drivers/iommu/intr_remapping.h b/trunk/drivers/iommu/irq_remapping.h similarity index 96% rename from trunk/drivers/iommu/intr_remapping.h rename to trunk/drivers/iommu/irq_remapping.h index bd5d98fec148..b12974cc1dfe 100644 --- a/trunk/drivers/iommu/intr_remapping.h +++ b/trunk/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 */