diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-28 19:41:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-28 19:41:58 -0800 |
| commit | 1984f65c2fbc0d2b557d6e89ece9b39267e215c6 (patch) | |
| tree | cfaec61ef718812e0ba4c06cb8c3338af71fe1f7 /drivers/vfio/mdev/mdev_sysfs.c | |
| parent | f346b0becb1bc62e45495f9cdbae3eef35d0b635 (diff) | |
| parent | 8ba35b3a0046d6573c98f00461d9bd1b86250d35 (diff) | |
Merge tag 'vfio-v4.21-rc1' of git://github.com/awilliam/linux-vfio
Pull VFIO updates from Alex Williamson:
- Replace global vfio-pci lock with per bus lock to allow concurrent
open and release (Alex Williamson)
- Declare mdev function as static (Paolo Cretaro)
- Convert char to u8 in mdev/mtty sample driver (Nathan Chancellor)
* tag 'vfio-v4.21-rc1' of git://github.com/awilliam/linux-vfio:
vfio-mdev/samples: Use u8 instead of char for handle functions
vfio/mdev: add static modifier to add_mdev_supported_type
vfio/pci: Parallelize device open and release
Diffstat (limited to 'drivers/vfio/mdev/mdev_sysfs.c')
| -rw-r--r-- | drivers/vfio/mdev/mdev_sysfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/vfio/mdev/mdev_sysfs.c b/drivers/vfio/mdev/mdev_sysfs.c index 249472f05509..ce5dd219f2c8 100644 --- a/drivers/vfio/mdev/mdev_sysfs.c +++ b/drivers/vfio/mdev/mdev_sysfs.c @@ -92,8 +92,8 @@ static struct kobj_type mdev_type_ktype = { .release = mdev_type_release, }; -struct mdev_type *add_mdev_supported_type(struct mdev_parent *parent, - struct attribute_group *group) +static struct mdev_type *add_mdev_supported_type(struct mdev_parent *parent, + struct attribute_group *group) { struct mdev_type *type; int ret; |