diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-15 13:01:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-15 13:01:01 -0800 |
| commit | 37cea93b99d2d89bef3adcb4632d71e1f377c447 (patch) | |
| tree | 62ebd3c1d28bec1d99b09ce9a968094e2e57dbb7 /include/linux | |
| parent | cc80fe0eefbbbd7b4e32f631bb2fa639d76af075 (diff) | |
| parent | d4f50ee2f5b45fc4d9e4142a52edf8b7935a9275 (diff) | |
| download | linux-37cea93b99d2d89bef3adcb4632d71e1f377c447.tar.gz linux-37cea93b99d2d89bef3adcb4632d71e1f377c447.tar.bz2 linux-37cea93b99d2d89bef3adcb4632d71e1f377c447.zip | |
Merge tag 'vfio-v4.5-rc1' of git://github.com/awilliam/linux-vfio
Pull VFIO updates from Alex Williamson:
- Fixes in AMD xgbe reset, spapr structure padding, type 1 flags (Dan
Carpenter, Alexey Kardashevskiy, Pierre Morel)
- Re-introduce no-iommu mode, with a user this time (Alex Williamson)
* tag 'vfio-v4.5-rc1' of git://github.com/awilliam/linux-vfio:
vfio/iommu_type1: make use of info.flags
vfio: Include No-IOMMU mode
vfio: Add explicit alignments in vfio_iommu_spapr_tce_create
VFIO: platform: reset: fix a warning message condition
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/vfio.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/vfio.h b/include/linux/vfio.h index ddb440975382..610a86a892b8 100644 --- a/include/linux/vfio.h +++ b/include/linux/vfio.h @@ -44,6 +44,9 @@ struct vfio_device_ops { void (*request)(void *device_data, unsigned int count); }; +extern struct iommu_group *vfio_iommu_group_get(struct device *dev); +extern void vfio_iommu_group_put(struct iommu_group *group, struct device *dev); + extern int vfio_add_group_dev(struct device *dev, const struct vfio_device_ops *ops, void *device_data); |