Commit-ID: eef93fdb7cd41ae36794db0e765059dc1039e940 Gitweb: http://git.kernel.org/tip/eef93fdb7cd41ae36794db0e765059dc1039e940 Author: Joerg Roedel <joerg.roedel@xxxxxxx> AuthorDate: Fri, 30 Mar 2012 11:46:59 -0700 Committer: Joerg Roedel <joerg.roedel@xxxxxxx> CommitDate: Mon, 7 May 2012 14:34:58 +0200 iommu: Rename intr_remapping files to intel_intr_remapping The files contain code mostly relevant for the Intel implementation of interrupt remapping. Make that visible in the file names. Also inline intr_remapping.h into intr_remapping.c because it is only included there and the content is very small. So there is no reason for a seperate header file. Signed-off-by: Joerg Roedel <joerg.roedel@xxxxxxx> Acked-by: Yinghai Lu <yinghai@xxxxxxxxxx> Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Cc: Alex Williamson <alex.williamson@xxxxxxxxxx> Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx> Signed-off-by: Joerg Roedel <joerg.roedel@xxxxxxx> --- drivers/iommu/Makefile | 2 +- .../{intr_remapping.c => intel_intr_remapping.c} | 17 ++++++++++++++++- drivers/iommu/intr_remapping.h | 17 ----------------- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index 7ad7a3b..1533ebf 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) += intr_remapping.o +obj-$(CONFIG_IRQ_REMAP) += intel_intr_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/intr_remapping.c b/drivers/iommu/intel_intr_remapping.c similarity index 98% rename from drivers/iommu/intr_remapping.c rename to drivers/iommu/intel_intr_remapping.c index 6777ca0..212fff0 100644 --- a/drivers/iommu/intr_remapping.c +++ b/drivers/iommu/intel_intr_remapping.c @@ -10,10 +10,25 @@ #include <asm/smp.h> #include <asm/cpu.h> #include <linux/intel-iommu.h> -#include "intr_remapping.h" #include <acpi/acpi.h> #include <asm/pci-direct.h> +struct ioapic_scope { + struct intel_iommu *iommu; + unsigned int id; + unsigned int bus; /* PCI bus number */ + unsigned int devfn; /* PCI devfn number */ +}; + +struct hpet_scope { + struct intel_iommu *iommu; + u8 id; + unsigned int bus; + unsigned int devfn; +}; + +#define IR_X2APIC_MODE(mode) (mode ? (1 << 11) : 0) + static struct ioapic_scope ir_ioapic[MAX_IO_APICS]; static struct hpet_scope ir_hpet[MAX_HPET_TBS]; static int ir_ioapic_num, ir_hpet_num; diff --git a/drivers/iommu/intr_remapping.h b/drivers/iommu/intr_remapping.h deleted file mode 100644 index 5662fec..0000000 --- a/drivers/iommu/intr_remapping.h +++ /dev/null @@ -1,17 +0,0 @@ -#include <linux/intel-iommu.h> - -struct ioapic_scope { - struct intel_iommu *iommu; - unsigned int id; - unsigned int bus; /* PCI bus number */ - unsigned int devfn; /* PCI devfn number */ -}; - -struct hpet_scope { - struct intel_iommu *iommu; - u8 id; - unsigned int bus; - unsigned int devfn; -}; - -#define IR_X2APIC_MODE(mode) (mode ? (1 << 11) : 0) -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html