diff options
author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-05-07 11:03:22 +0000 |
---|---|---|
committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-05-07 11:03:22 +0000 |
commit | e43d547d72717b79d5e756658453b237fe16c110 (patch) | |
tree | 7961dd2c320083dce8433a836b983595e6936280 /drivers/vfio | |
parent | 3431b95888fa203fe81af87046713d3b538b8af3 (diff) | |
parent | b5dbcd05792a4bad2c9bb3c4658c854e72c444b7 (diff) |
Merge tag 'v5.4.117' into 5.4-2.3.x-imx
This is the 5.4.117 stable release
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'drivers/vfio')
-rw-r--r-- | drivers/vfio/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vfio/Kconfig b/drivers/vfio/Kconfig index 90c0525b1e0c..67d0bf4efa16 100644 --- a/drivers/vfio/Kconfig +++ b/drivers/vfio/Kconfig @@ -22,7 +22,7 @@ config VFIO_VIRQFD menuconfig VFIO tristate "VFIO Non-Privileged userspace driver framework" select IOMMU_API - select VFIO_IOMMU_TYPE1 if (X86 || S390 || ARM || ARM64) + select VFIO_IOMMU_TYPE1 if MMU && (X86 || S390 || ARM || ARM64) help VFIO provides a framework for secure userspace device drivers. See Documentation/driver-api/vfio.rst for more details. |