tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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 2ffdd7e2 ea4a0ce1

+2
unified split
+1
drivers/vfio/pci/vfio_pci_config.c
··· 27 #include <linux/pci.h> 28 #include <linux/uaccess.h> 29 #include <linux/vfio.h> 30 31 #include "vfio_pci_private.h" 32
··· 27 #include <linux/pci.h> 28 #include <linux/uaccess.h> 29 #include <linux/vfio.h> 30 + #include <linux/slab.h> 31 32 #include "vfio_pci_private.h" 33
+1
drivers/vfio/pci/vfio_pci_intrs.c
··· 22 #include <linux/vfio.h> 23 #include <linux/wait.h> 24 #include <linux/workqueue.h> 25 26 #include "vfio_pci_private.h" 27
··· 22 #include <linux/vfio.h> 23 #include <linux/wait.h> 24 #include <linux/workqueue.h> 25 + #include <linux/slab.h> 26 27 #include "vfio_pci_private.h" 28