projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 335b0e98 SL |
1 | From 8dbe0f4e044087fc5fcee670e1135450395e5fb7 Mon Sep 17 00:00:00 2001 |
| 2 | From: Sasha Levin <sashal@kernel.org> | |
| 3 | Date: Fri, 16 Jul 2021 15:39:12 -0300 | |
| 4 | Subject: vfio: Use config not menuconfig for VFIO_NOIOMMU | |
| 5 | ||
| 6 | From: Jason Gunthorpe <jgg@nvidia.com> | |
| 7 | ||
| 8 | [ Upstream commit 26c22cfde5dd6e63f25c48458b0185dcb0fbb2fd ] | |
| 9 | ||
| 10 | VFIO_NOIOMMU is supposed to be an element in the VFIO menu, not start | |
| 11 | a new menu. Correct this copy-paste mistake. | |
| 12 | ||
| 13 | Fixes: 03a76b60f8ba ("vfio: Include No-IOMMU mode") | |
| 14 | Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> | |
| 15 | Reviewed-by: Cornelia Huck <cohuck@redhat.com> | |
| 16 | Link: https://lore.kernel.org/r/0-v1-3f0b685c3679+478-vfio_menuconfig_jgg@nvidia.com | |
| 17 | Signed-off-by: Alex Williamson <alex.williamson@redhat.com> | |
| 18 | Signed-off-by: Sasha Levin <sashal@kernel.org> | |
| 19 | --- | |
| 20 | drivers/vfio/Kconfig | 2 +- | |
| 21 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 22 | ||
| 23 | diff --git a/drivers/vfio/Kconfig b/drivers/vfio/Kconfig | |
| 24 | index 67d0bf4efa16..e44bf736e2b2 100644 | |
| 25 | --- a/drivers/vfio/Kconfig | |
| 26 | +++ b/drivers/vfio/Kconfig | |
| 27 | @@ -29,7 +29,7 @@ menuconfig VFIO | |
| 28 | ||
| 29 | If you don't know what to do here, say N. | |
| 30 | ||
| 31 | -menuconfig VFIO_NOIOMMU | |
| 32 | +config VFIO_NOIOMMU | |
| 33 | bool "VFIO No-IOMMU support" | |
| 34 | depends on VFIO | |
| 35 | help | |
| 36 | -- | |
| 37 | 2.30.2 | |
| 38 |