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,
Jerry Snitselaar <jsnitsel@redhat.com>,
Lu Baolu <baolu.lu@linux.intel.com>
Subject: [PATCH 2/4] iommu: make inclusion of intel directory conditional
Date: Tue, 11 Mar 2025 11:10:17 +0100 [thread overview]
Message-ID: <3271463.5fSG56mABF@devpool47.emlix.com> (raw)
In-Reply-To: <2301497.iZASKD2KPV@devpool47.emlix.com>
Nothing in there is active if CONFIG_INTEL_IOMMU is not enabled, so the whole
directory can depend on that switch as well.
Fixes: ab65ba57e3ac ("iommu/vt-d: Move Kconfig and Makefile bits down into intel directory")
Signed-off-by: Rolf Eike Beer <eb@emlix.com>
---
drivers/iommu/Makefile | 3 ++-
drivers/iommu/intel/Makefile | 2 --
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile
index 5e5a83c6c2aa..ed673c8fd056 100644
--- a/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
-obj-y += amd/ intel/ arm/ iommufd/ riscv/
+obj-y += amd/ arm/ iommufd/ riscv/
+obj-$(CONFIG_INTEL_IOMMU) += intel/
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/intel/Makefile b/drivers/iommu/intel/Makefile
index 6c7528130cf9..7007db03b351 100644
--- a/drivers/iommu/intel/Makefile
+++ b/drivers/iommu/intel/Makefile
@@ -5,7 +5,5 @@ obj-$(CONFIG_DMAR_TABLE) += trace.o
obj-$(CONFIG_DMAR_PERF) += perf.o
obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) += debugfs.o
obj-$(CONFIG_INTEL_IOMMU_SVM) += svm.o
-ifdef CONFIG_INTEL_IOMMU
obj-$(CONFIG_IRQ_REMAP) += irq_remapping.o
-endif
obj-$(CONFIG_INTEL_IOMMU_PERF_EVENTS) += perfmon.o
--
2.48.1
--
Rolf Eike Beer
We are nominated for the embedded award Visit us at the embedded
world 2025 March 11th to 13th, 2025 | Nuremberg Find us in hall 4 at
booth 336
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-11 10:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-11 10:04 [PATCH 0/4] make vendor specific subdirectory inclusion conditional Rolf Eike Beer
2025-03-11 10:07 ` [PATCH 1/4] iommu: remove duplicate selection of DMAR_TABLE Rolf Eike Beer
2025-03-11 10:10 ` Rolf Eike Beer [this message]
2025-03-11 10:12 ` [PATCH 3/4] iommu: make inclusion of amd directory conditional Rolf Eike Beer
2025-03-11 10:15 ` [PATCH 4/4] iommu: make inclusion of riscv " Rolf Eike Beer
2025-03-20 8:07 ` Joerg Roedel
2025-03-20 8:10 ` Rolf Eike Beer
2025-03-20 8:15 ` Joerg Roedel
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=3271463.5fSG56mABF@devpool47.emlix.com \
--to=eb@emlix.com \
--cc=baolu.lu@linux.intel.com \
--cc=iommu@lists.linux.dev \
--cc=joro@8bytes.org \
--cc=jsnitsel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--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