Browse Source

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
Linus Torvalds 12 years ago
parent
commit
2ffdd7e23c
2 changed files with 2 additions and 0 deletions
  1. 1 0
      drivers/vfio/pci/vfio_pci_config.c
  2. 1 0
      drivers/vfio/pci/vfio_pci_intrs.c

+ 1 - 0
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"
 

+ 1 - 0
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"