Skip to content

Commit

Permalink
Merge tag 'vfio-v3.9-rc4' of git://github.com/awilliam/linux-vfio
Browse files Browse the repository at this point in the history
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
  • Loading branch information
torvalds committed Mar 20, 2013
2 parents ea4a0ce + 25e9789 commit 2ffdd7e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions drivers/vfio/pci/vfio_pci_config.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 1 addition & 0 deletions drivers/vfio/pci/vfio_pci_intrs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit 2ffdd7e

Please sign in to comment.