diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2025-05-31 07:43:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-05-31 07:43:16 -0700 |
| commit | 9d49da438819c5dd82840eb63d929edbdccb80d8 (patch) | |
| tree | 4087201dd1ae09a27f17019ce2033f80a54e284d | |
| parent | Merge tag 'trace-ringbuffer-v6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace (diff) | |
| download | wireguard-linux-9d49da438819c5dd82840eb63d929edbdccb80d8.tar.xz wireguard-linux-9d49da438819c5dd82840eb63d929edbdccb80d8.zip | |
Revert "iommu: make inclusion of arm/arm-smmu-v3 directory conditional"
This reverts commit e436576b0231542f6f233279f0972989232575a8.
That commit is very broken, and seems to have missed the fact that
CONFIG_ARM_SMMU_V3 is not just a yes-or-no thing, but also can be
modular.
So it caused build errors on arm64 allmodconfig setups:
ERROR: modpost: "arm_smmu_make_cdtable_ste" [drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-test.ko] undefined!
ERROR: modpost: "arm_smmu_make_s2_domain_ste" [drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-test.ko] undefined!
ERROR: modpost: "arm_smmu_make_s1_cd" [drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-test.ko] undefined!
...
(and six more symbols just the same).
Link: https://lore.kernel.org/all/CAHk-=wh4qRwm7AQ8sBmQj7qECzgAhj4r73RtCDfmHo5SdcN0Jw@mail.gmail.com/
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Rolf Eike Beer <eb@emlix.com>
Cc: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/iommu/arm/Makefile | 3 | ||||
| -rw-r--r-- | drivers/iommu/arm/arm-smmu-v3/Makefile | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/iommu/arm/Makefile b/drivers/iommu/arm/Makefile index 35a7e13eef34..0f9efeab709f 100644 --- a/drivers/iommu/arm/Makefile +++ b/drivers/iommu/arm/Makefile @@ -1,3 +1,2 @@ # SPDX-License-Identifier: GPL-2.0 -obj-y += arm-smmu/ -obj-$(CONFIG_ARM_SMMU_V3) += arm-smmu-v3/ +obj-y += arm-smmu/ arm-smmu-v3/ diff --git a/drivers/iommu/arm/arm-smmu-v3/Makefile b/drivers/iommu/arm/arm-smmu-v3/Makefile index 6cc7c8557b9e..493a659cc66b 100644 --- a/drivers/iommu/arm/arm-smmu-v3/Makefile +++ b/drivers/iommu/arm/arm-smmu-v3/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -obj-y += arm_smmu_v3.o +obj-$(CONFIG_ARM_SMMU_V3) += arm_smmu_v3.o arm_smmu_v3-y := arm-smmu-v3.o arm_smmu_v3-$(CONFIG_ARM_SMMU_V3_IOMMUFD) += arm-smmu-v3-iommufd.o arm_smmu_v3-$(CONFIG_ARM_SMMU_V3_SVA) += arm-smmu-v3-sva.o |