Messages in this thread Patch in this message | | | From | Li Yang <> | Subject | [PATCH] iommu/arm-smmu: fix the module name to be consistent with older kernel | Date | Tue, 11 Feb 2020 18:37:20 -0600 |
| |
Commit cd221bd24ff5 ("iommu/arm-smmu: Allow building as a module") introduced a side effect that changed the module name from arm-smmu to arm-smmu-mod. This breaks the users of kernel parameters for the driver (e.g. arm-smmu.disable_bypass). This patch changes the module name back to be consistent.
Signed-off-by: Li Yang <leoyang.li@nxp.com> --- drivers/iommu/Makefile | 4 ++-- drivers/iommu/{arm-smmu.c => arm-smmu-common.c} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename drivers/iommu/{arm-smmu.c => arm-smmu-common.c} (100%)
diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index 2104fb8afc06..f39e82e68640 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -14,8 +14,8 @@ obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o amd_iommu_quirks.o obj-$(CONFIG_AMD_IOMMU_DEBUGFS) += amd_iommu_debugfs.o obj-$(CONFIG_AMD_IOMMU_V2) += amd_iommu_v2.o -obj-$(CONFIG_ARM_SMMU) += arm-smmu-mod.o -arm-smmu-mod-objs += arm-smmu.o arm-smmu-impl.o arm-smmu-qcom.o +obj-$(CONFIG_ARM_SMMU) += arm-smmu.o +arm-smmu-objs := arm-smmu-common.o arm-smmu-impl.o arm-smmu-qcom.o obj-$(CONFIG_ARM_SMMU_V3) += arm-smmu-v3.o obj-$(CONFIG_DMAR_TABLE) += dmar.o obj-$(CONFIG_INTEL_IOMMU) += intel-iommu.o intel-pasid.o diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu-common.c similarity index 100% rename from drivers/iommu/arm-smmu.c rename to drivers/iommu/arm-smmu-common.c -- 2.17.1
| |