From: Rolf Eike Beer <eb@emlix.com>
To: Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>
Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org,
Robin Murphy <robin.murphy@arm.com>,
Jason Gunthorpe <jgg@ziepe.ca>, Kevin Tian <kevin.tian@intel.com>
Subject: [PATCH 6/6] iommu: make inclusion of iommufd directory conditional
Date: Thu, 20 Mar 2025 10:22:37 +0100 [thread overview]
Message-ID: <2243601.irdbgypaU6@devpool47.emlix.com> (raw)
In-Reply-To: <12652899.O9o76ZdvQC@devpool47.emlix.com>
Nothing in there is active if CONFIG_IOMMUFD is not enabled, so the whole
directory can depend on that switch as well.
Fixes: 2ff4bed7fee7 ("iommufd: File descriptor, context, kconfig and makefiles")
Signed-off-by: Rolf Eike Beer <eb@emlix.com>
---
drivers/iommu/Makefile | 3 ++-
drivers/iommu/iommufd/Makefile | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile
index 17133876f777..38ee96607acf 100644
--- a/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@ -1,8 +1,9 @@
# SPDX-License-Identifier: GPL-2.0
-obj-y += arm/ iommufd/
+obj-y += arm/
obj-$(CONFIG_AMD_IOMMU) += amd/
obj-$(CONFIG_INTEL_IOMMU) += intel/
obj-$(CONFIG_RISCV_IOMMU) += riscv/
+obj-$(CONFIG_IOMMUFD) += iommufd/
obj-$(CONFIG_IOMMU_API) += iommu.o
obj-$(CONFIG_IOMMU_API) += iommu-traces.o
obj-$(CONFIG_IOMMU_API) += iommu-sysfs.o
diff --git a/drivers/iommu/iommufd/Makefile b/drivers/iommu/iommufd/Makefile
index cb784da6cddc..071f2a504167 100644
--- a/drivers/iommu/iommufd/Makefile
+++ b/drivers/iommu/iommufd/Makefile
@@ -12,7 +12,7 @@ iommufd-y := \
iommufd-$(CONFIG_IOMMUFD_TEST) += selftest.o
-obj-$(CONFIG_IOMMUFD) += iommufd.o
+obj-y += iommufd.o
obj-$(CONFIG_IOMMUFD_DRIVER) += iova_bitmap.o
iommufd_driver-y := driver.o
--
2.49.0
--
Rolf Eike Beer
emlix GmbH
Headquarters: Berliner Str. 12, 37073 Göttingen, Germany
Phone +49 (0)551 30664-0, e-mail info@emlix.com
District Court of Göttingen, Registry Number HR B 3160
Managing Directors: Heike Jordan, Dr. Uwe Kracke
VAT ID No. DE 205 198 055
Office Berlin: Panoramastr. 1, 10178 Berlin, Germany
Office Bonn: Bachstr. 6, 53115 Bonn, Germany
http://www.emlix.com
emlix - your embedded Linux partner
next prev parent reply other threads:[~2025-03-20 9:31 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-20 9:01 [PATCHv2 0/6] make vendor specific subdirectory inclusion conditional Rolf Eike Beer
2025-03-20 9:05 ` [PATCH 1/6] iommu: remove duplicate selection of DMAR_TABLE Rolf Eike Beer
2025-03-21 1:56 ` Baolu Lu
2025-03-20 9:07 ` [PATCH 2/6] iommu: make inclusion of intel directory conditional Rolf Eike Beer
2025-03-21 2:04 ` Baolu Lu
2025-03-20 9:14 ` [PATCH 3/6] iommu: make inclusion of amd " Rolf Eike Beer
2025-03-21 2:06 ` Baolu Lu
2025-03-20 9:16 ` [PATCH 4/6] iommu: make inclusion of riscv " Rolf Eike Beer
2025-03-21 2:08 ` Baolu Lu
2025-03-20 9:19 ` [PATCH 5/6] iommu: make inclusion of arm/arm-smmu-v3 " Rolf Eike Beer
2025-03-21 2:11 ` Baolu Lu
2025-03-20 9:22 ` Rolf Eike Beer [this message]
2025-03-21 2:14 ` [PATCH 6/6] iommu: make inclusion of iommufd " Baolu Lu
2025-04-17 14:32 ` [PATCHv2 0/6] make vendor specific subdirectory inclusion conditional Joerg Roedel
2025-04-22 6:35 ` Rolf Eike Beer
-- strict thread matches above, loose matches on Subject: below --
2025-05-12 13:07 [PATCHv3 " Rolf Eike Beer
2025-05-12 13:15 ` [PATCH 6/6] iommu: make inclusion of iommufd directory conditional Rolf Eike Beer
2025-05-16 12:52 ` Joerg Roedel
2025-05-19 6:16 ` Rolf Eike Beer
2025-05-26 5:59 ` Rolf Eike Beer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2243601.irdbgypaU6@devpool47.emlix.com \
--to=eb@emlix.com \
--cc=iommu@lists.linux.dev \
--cc=jgg@ziepe.ca \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).