Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ffdd7e2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ea4a0ce1 25e9789d

drivers/vfio/pci/vfio_pci_config.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/pci.h>

#include <linux/pci.h>

#include <linux/uaccess.h>

#include <linux/uaccess.h>

#include <linux/vfio.h>

#include <linux/vfio.h>

#include <linux/slab.h>





#include "vfio_pci_private.h"

#include "vfio_pci_private.h"

drivers/vfio/pci/vfio_pci_intrs.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/vfio.h>

#include <linux/vfio.h>

#include <linux/wait.h>

#include <linux/wait.h>

#include <linux/workqueue.h>

#include <linux/workqueue.h>

#include <linux/slab.h>





#include "vfio_pci_private.h"

#include "vfio_pci_private.h"