diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2017-02-08 13:13:26 -0700 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@redhat.com> | 2017-02-09 12:13:53 -0700 |
| commit | 0ca582fd0463106e277e1f723b4554b4d0e5f700 (patch) | |
| tree | d1120b16dab0518f5d55fe553eb7f96ae18bc40c /drivers/vfio | |
| parent | f790eb57e6ec8d77489755cc25a51c4409e2f590 (diff) | |
| download | linux-stable-0ca582fd0463106e277e1f723b4554b4d0e5f700.tar.gz linux-stable-0ca582fd0463106e277e1f723b4554b4d0e5f700.tar.bz2 linux-stable-0ca582fd0463106e277e1f723b4554b4d0e5f700.zip | |
vfio: Replace module request with softdep
Rather than doing a module request from within the init function, add
a soft dependency on the available IOMMU backend drivers. This makes
the dependency visible to userspace when picking modules for the
ram disk.
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Diffstat (limited to 'drivers/vfio')
| -rw-r--r-- | drivers/vfio/vfio.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c index 9901c4671e2f..57052b68f15a 100644 --- a/drivers/vfio/vfio.c +++ b/drivers/vfio/vfio.c @@ -2250,14 +2250,6 @@ static int __init vfio_init(void) pr_info(DRIVER_DESC " version: " DRIVER_VERSION "\n"); - /* - * Attempt to load known iommu-drivers. This gives us a working - * environment without the user needing to explicitly load iommu - * drivers. - */ - request_module_nowait("vfio_iommu_type1"); - request_module_nowait("vfio_iommu_spapr_tce"); - #ifdef CONFIG_VFIO_NOIOMMU vfio_register_iommu_driver(&vfio_noiommu_ops); #endif @@ -2297,3 +2289,4 @@ MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); MODULE_ALIAS_MISCDEV(VFIO_MINOR); MODULE_ALIAS("devname:vfio/vfio"); +MODULE_SOFTDEP("post: vfio_iommu_type1 vfio_iommu_spapr_tce"); |