Skip to content

Commit 50a1317

Browse files
committed
Merge tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd
Pull iommufd fixes from Jason Gunthorpe: "Two fixes for the selftests: - CONFIG_IOMMUFD_TEST needs CONFIG_IOMMUFD_DRIVER to work - The kconfig fragment sshould include fault injection so the fault injection test can work" * tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd: iommufd: Add config needed for iommufd_fail_nth iommufd: Add missing IOMMUFD_DRIVER kconfig for the selftest
2 parents 2bf5dd7 + 2760c51 commit 50a1317

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

drivers/iommu/iommufd/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ config IOMMUFD_TEST
3737
depends on DEBUG_KERNEL
3838
depends on FAULT_INJECTION
3939
depends on RUNTIME_TESTING_MENU
40+
select IOMMUFD_DRIVER
4041
default n
4142
help
4243
This is dangerous, do not enable unless running

tools/testing/selftests/iommu/config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
CONFIG_IOMMUFD=y
2+
CONFIG_FAULT_INJECTION_DEBUG_FS=y
23
CONFIG_FAULT_INJECTION=y
34
CONFIG_IOMMUFD_TEST=y
5+
CONFIG_FAILSLAB=y

0 commit comments

Comments
 (0)