diff options
| author | Linus Torvalds | 2022-08-12 09:34:45 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2022-08-12 09:34:45 -0700 |
| commit | d16b418fac3de0d2ac854b3a9a1a59a0ebf2a0e9 (patch) | |
| tree | c5bafc125d8d63aade3b893bcb9cbc53cb1c8d90 /drivers | |
| parent | f75f5d58099ffe0a70ae96dfeb837b5c46399da3 (diff) | |
| parent | 0f3e72b5c8cfa0b57dc4fc7703a0a42dbc200ba9 (diff) | |
Merge tag 'vfio-v6.0-rc1pt2' of https://github.com/awilliam/linux-vfio
Pull another VFIO update from Alex Williamson:
- Rename vfio source file to more easily allow additional source
files in the upcoming development cycles (Jason Gunthorpe)
* tag 'vfio-v6.0-rc1pt2' of https://github.com/awilliam/linux-vfio:
vfio: Move vfio.c to vfio_main.c
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/vfio/Makefile | 2 | ||||
| -rw-r--r-- | drivers/vfio/vfio_main.c (renamed from drivers/vfio/vfio.c) | 0 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/vfio/Makefile b/drivers/vfio/Makefile index fee73f3d9480..1a32357592e3 100644 --- a/drivers/vfio/Makefile +++ b/drivers/vfio/Makefile @@ -1,6 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 vfio_virqfd-y := virqfd.o +vfio-y += vfio_main.o + obj-$(CONFIG_VFIO) += vfio.o obj-$(CONFIG_VFIO_VIRQFD) += vfio_virqfd.o obj-$(CONFIG_VFIO_IOMMU_TYPE1) += vfio_iommu_type1.o diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio_main.c index 7cb56c382c97..7cb56c382c97 100644 --- a/drivers/vfio/vfio.c +++ b/drivers/vfio/vfio_main.c |