diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-20 00:02:21 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-20 00:02:21 +0300 |
commit | 50a1317fd18acc2793edcb1d078909527c273a9e (patch) | |
tree | 9ae95efd33206146f586c2cc67efeb39e334f0a6 /tools | |
parent | 2bf5dd7c735c837fcd847831f96e3239471363bc (diff) | |
parent | 2760c51b8040d7cffedc337939e7475a17cc4b19 (diff) | |
download | linux-50a1317fd18acc2793edcb1d078909527c273a9e.tar.xz |
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
Diffstat (limited to 'tools')
-rw-r--r-- | tools/testing/selftests/iommu/config | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/testing/selftests/iommu/config b/tools/testing/selftests/iommu/config index 110d73917615..02a2a1b267c1 100644 --- a/tools/testing/selftests/iommu/config +++ b/tools/testing/selftests/iommu/config @@ -1,3 +1,5 @@ CONFIG_IOMMUFD=y +CONFIG_FAULT_INJECTION_DEBUG_FS=y CONFIG_FAULT_INJECTION=y CONFIG_IOMMUFD_TEST=y +CONFIG_FAILSLAB=y |