diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-19 18:25:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-19 18:25:20 -0700 |
| commit | 2ffdd7e23cde5a8b94d41ec0adfdd58cffe67f3a (patch) | |
| tree | a15c29a0a0fd2c7b4c4b05bbd299c5cc2edd16f6 | |
| parent | Merge git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| parent | vfio: include <linux/slab.h> for kmalloc (diff) | |
| download | linux-dev-2ffdd7e23cde5a8b94d41ec0adfdd58cffe67f3a.tar.xz linux-dev-2ffdd7e23cde5a8b94d41ec0adfdd58cffe67f3a.zip | |
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
| -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 @@ #include <linux/pci.h> #include <linux/uaccess.h> #include <linux/vfio.h> +#include <linux/slab.h> #include "vfio_pci_private.h" 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 @@ #include <linux/vfio.h> #include <linux/wait.h> #include <linux/workqueue.h> +#include <linux/slab.h> #include "vfio_pci_private.h" |