git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...
[pandora-kernel.git]
/
arch
/
powerpc
/
kvm
/
e500.c
diff --git
a/arch/powerpc/kvm/e500.c
b/arch/powerpc/kvm/e500.c
index
efa1198
..
bc2b400
100644
(file)
--- a/
arch/powerpc/kvm/e500.c
+++ b/
arch/powerpc/kvm/e500.c
@@
-13,6
+13,7
@@
*/
#include <linux/kvm_host.h>
*/
#include <linux/kvm_host.h>
+#include <linux/slab.h>
#include <linux/err.h>
#include <asm/reg.h>
#include <linux/err.h>
#include <asm/reg.h>
@@
-160,7
+161,7
@@
static int __init kvmppc_e500_init(void)
flush_icache_range(kvmppc_booke_handlers,
kvmppc_booke_handlers + max_ivor + kvmppc_handler_len);
flush_icache_range(kvmppc_booke_handlers,
kvmppc_booke_handlers + max_ivor + kvmppc_handler_len);
- return kvm_init(NULL, sizeof(struct kvmppc_vcpu_e500), THIS_MODULE);
+ return kvm_init(NULL, sizeof(struct kvmppc_vcpu_e500),
0,
THIS_MODULE);
}
static void __init kvmppc_e500_exit(void)
}
static void __init kvmppc_e500_exit(void)