summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuhammad Usama Anjum <usama.anjum@collabora.com>2024-02-22 12:49:33 +0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-03-01 13:35:10 +0100
commit7a8a8a6a4f1e1a0585b2bed983b0c71e35901821 (patch)
tree000143e7127ef2c7d539a4f4fb5b1cbf59f1038e
parent20e1e1a2b8a4525301a76bd9afb856a7606a3a34 (diff)
downloadlinux-thead-7a8a8a6a4f1e1a0585b2bed983b0c71e35901821.tar.gz
linux-thead-7a8a8a6a4f1e1a0585b2bed983b0c71e35901821.tar.bz2
linux-thead-7a8a8a6a4f1e1a0585b2bed983b0c71e35901821.zip
selftests/iommu: fix the config fragment
[ Upstream commit 510325e5ac5f45c1180189d3bfc108c54bf64544 ] The config fragment doesn't follow the correct format to enable those config options which make the config options getting missed while merging with other configs. ➜ merge_config.sh -m .config tools/testing/selftests/iommu/config Using .config as base Merging tools/testing/selftests/iommu/config ➜ make olddefconfig .config:5295:warning: unexpected data: CONFIG_IOMMUFD .config:5296:warning: unexpected data: CONFIG_IOMMUFD_TEST While at it, add CONFIG_FAULT_INJECTION as well which is needed for CONFIG_IOMMUFD_TEST. If CONFIG_FAULT_INJECTION isn't present in base config (such as x86 defconfig), CONFIG_IOMMUFD_TEST doesn't get enabled. Fixes: 57f0988706fe ("iommufd: Add a selftest") Link: https://lore.kernel.org/r/20240222074934.71380-1-usama.anjum@collabora.com Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--tools/testing/selftests/iommu/config5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/testing/selftests/iommu/config b/tools/testing/selftests/iommu/config
index 6c4f901d6fed..110d73917615 100644
--- a/tools/testing/selftests/iommu/config
+++ b/tools/testing/selftests/iommu/config
@@ -1,2 +1,3 @@
-CONFIG_IOMMUFD
-CONFIG_IOMMUFD_TEST
+CONFIG_IOMMUFD=y
+CONFIG_FAULT_INJECTION=y
+CONFIG_IOMMUFD_TEST=y