diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-11 06:49:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-11 06:49:24 -0400 |
| commit | 27a9716bc80448f7e98fb1fb316daba241a4c539 (patch) | |
| tree | d9a82dc1e1eddd1ff2a27d558149ad8323975134 /drivers/pci | |
| parent | e98d6e7f7625ed60c7bc1d39aeb2375ed3918fd5 (diff) | |
| parent | 93899a679fd6b2534b5c297d9316bae039ebcbe1 (diff) | |
| download | talos-op-linux-27a9716bc80448f7e98fb1fb316daba241a4c539.tar.gz talos-op-linux-27a9716bc80448f7e98fb1fb316daba241a4c539.zip | |
Merge tag 'vfio-v3.18-rc1' of git://github.com/awilliam/linux-vfio
Pull VFIO updates from Alex Williamson:
- Nested IOMMU extension to type1 (Will Deacon)
- Restore MSIx message before enabling (Gavin Shan)
- Fix remove path locking (Alex Williamson)
* tag 'vfio-v3.18-rc1' of git://github.com/awilliam/linux-vfio:
vfio-pci: Fix remove path locking
drivers/vfio: Export vfio_spapr_iommu_eeh_ioctl() with GPL
vfio/pci: Restore MSIx message prior to enabling
PCI: Export MSI message relevant functions
vfio/iommu_type1: add new VFIO_TYPE1_NESTING_IOMMU IOMMU type
iommu: introduce domain attribute for nesting IOMMUs
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/msi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 2f7c92c4757a..9fab30af0e75 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -302,6 +302,7 @@ void get_cached_msi_msg(unsigned int irq, struct msi_msg *msg) __get_cached_msi_msg(entry, msg); } +EXPORT_SYMBOL_GPL(get_cached_msi_msg); void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg) { @@ -346,6 +347,7 @@ void write_msi_msg(unsigned int irq, struct msi_msg *msg) __write_msi_msg(entry, msg); } +EXPORT_SYMBOL_GPL(write_msi_msg); static void free_msi_irqs(struct pci_dev *dev) { |
