From: Mukesh Rathor <[email protected]> This file actually implements irq remapping, so rename to more appropriate hyperv-irq.c. A new file named hyperv-iommu.c will be introduced later. Also, move CONFIG_IRQ_REMAP out of the file and add to Makefile.
Signed-off-by: Mukesh Rathor <[email protected]> --- MAINTAINERS | 2 +- drivers/iommu/Kconfig | 1 + drivers/iommu/Makefile | 2 +- drivers/iommu/{hyperv-iommu.c => hyperv-irq.c} | 4 ---- 4 files changed, 3 insertions(+), 6 deletions(-) rename drivers/iommu/{hyperv-iommu.c => hyperv-irq.c} (99%) diff --git a/MAINTAINERS b/MAINTAINERS index 5b11839cba9d..381a0e086382 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11741,7 +11741,7 @@ F: drivers/hid/hid-hyperv.c F: drivers/hv/ F: drivers/infiniband/hw/mana/ F: drivers/input/serio/hyperv-keyboard.c -F: drivers/iommu/hyperv-iommu.c +F: drivers/iommu/hyperv-irq.c F: drivers/net/ethernet/microsoft/ F: drivers/net/hyperv/ F: drivers/pci/controller/pci-hyperv-intf.c diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index 99095645134f..b4cc2b42b338 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -355,6 +355,7 @@ config HYPERV_IOMMU bool "Hyper-V IRQ Handling" depends on HYPERV && X86 select IOMMU_API + select IRQ_REMAP default HYPERV help Stub IOMMU driver to handle IRQs to support Hyper-V Linux diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index 8e8843316c4b..598c39558e7d 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -30,7 +30,7 @@ obj-$(CONFIG_TEGRA_IOMMU_SMMU) += tegra-smmu.o obj-$(CONFIG_EXYNOS_IOMMU) += exynos-iommu.o obj-$(CONFIG_FSL_PAMU) += fsl_pamu.o fsl_pamu_domain.o obj-$(CONFIG_S390_IOMMU) += s390-iommu.o -obj-$(CONFIG_HYPERV_IOMMU) += hyperv-iommu.o +obj-$(CONFIG_HYPERV_IOMMU) += hyperv-irq.o obj-$(CONFIG_VIRTIO_IOMMU) += virtio-iommu.o obj-$(CONFIG_IOMMU_SVA) += iommu-sva.o obj-$(CONFIG_IOMMU_IOPF) += io-pgfault.o diff --git a/drivers/iommu/hyperv-iommu.c b/drivers/iommu/hyperv-irq.c similarity index 99% rename from drivers/iommu/hyperv-iommu.c rename to drivers/iommu/hyperv-irq.c index 0961ac805944..1944440a5004 100644 --- a/drivers/iommu/hyperv-iommu.c +++ b/drivers/iommu/hyperv-irq.c @@ -24,8 +24,6 @@ #include "irq_remapping.h" -#ifdef CONFIG_IRQ_REMAP - /* * According 82093AA IO-APIC spec , IO APIC has a 24-entry Interrupt * Redirection Table. Hyper-V exposes one single IO-APIC and so define @@ -330,5 +328,3 @@ static const struct irq_domain_ops hyperv_root_ir_domain_ops = { .alloc = hyperv_root_irq_remapping_alloc, .free = hyperv_root_irq_remapping_free, }; - -#endif -- 2.51.2.vfs.0.1
