git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[sfrench/cifs-2.6.git]
/
virt
/
kvm
/
coalesced_mmio.c
diff --git
a/virt/kvm/coalesced_mmio.c
b/virt/kvm/coalesced_mmio.c
index 5169736377a3b88cb6d2c7abc7639e2da439cf64..36e258029649c719fec91a1feb7306604ae90ab9 100644
(file)
--- a/
virt/kvm/coalesced_mmio.c
+++ b/
virt/kvm/coalesced_mmio.c
@@
-10,6
+10,7
@@
#include "iodev.h"
#include <linux/kvm_host.h>
+#include <linux/slab.h>
#include <linux/kvm.h>
#include "coalesced_mmio.h"