diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-19 21:25:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-19 21:25:20 -0400 |
| commit | 2ffdd7e23cde5a8b94d41ec0adfdd58cffe67f3a (patch) | |
| tree | a15c29a0a0fd2c7b4c4b05bbd299c5cc2edd16f6 /drivers | |
| parent | ea4a0ce11160200410abbabd44ec9e75e93a95be (diff) | |
| parent | 25e9789ddd9d14a8971f4a421d04f282719ab733 (diff) | |
Merge tag 'vfio-v3.9-rc4' of git://github.com/awilliam/linux-vfio
Pull vfio fix from Alex Williamson.
* tag 'vfio-v3.9-rc4' of git://github.com/awilliam/linux-vfio:
vfio: include <linux/slab.h> for kmalloc
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/vfio/pci/vfio_pci_config.c | 1 | ||||
| -rw-r--r-- | drivers/vfio/pci/vfio_pci_intrs.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/vfio/pci/vfio_pci_config.c b/drivers/vfio/pci/vfio_pci_config.c index 964ff22bf281..aeb00fc2d3be 100644 --- a/drivers/vfio/pci/vfio_pci_config.c +++ b/drivers/vfio/pci/vfio_pci_config.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
| 28 | #include <linux/uaccess.h> | 28 | #include <linux/uaccess.h> |
| 29 | #include <linux/vfio.h> | 29 | #include <linux/vfio.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | 31 | ||
| 31 | #include "vfio_pci_private.h" | 32 | #include "vfio_pci_private.h" |
| 32 | 33 | ||
diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c index 3639371fa697..a96509187deb 100644 --- a/drivers/vfio/pci/vfio_pci_intrs.c +++ b/drivers/vfio/pci/vfio_pci_intrs.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/vfio.h> | 22 | #include <linux/vfio.h> |
| 23 | #include <linux/wait.h> | 23 | #include <linux/wait.h> |
| 24 | #include <linux/workqueue.h> | 24 | #include <linux/workqueue.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #include "vfio_pci_private.h" | 27 | #include "vfio_pci_private.h" |
| 27 | 28 | ||