projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'kvm-3.10-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[platform/upstream/kernel-adaptation-pc.git]
/
arch
/
powerpc
/
kvm
/
book3s_pr.c
diff --git
a/arch/powerpc/kvm/book3s_pr.c
b/arch/powerpc/kvm/book3s_pr.c
index
d09baf1
..
bdc40b8
100644
(file)
--- a/
arch/powerpc/kvm/book3s_pr.c
+++ b/
arch/powerpc/kvm/book3s_pr.c
@@
-1037,7
+1037,7
@@
struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id)
if (!vcpu_book3s)
goto out;
- vcpu_book3s->shadow_vcpu =
(struct kvmppc_book3s_shadow_vcpu *)
+ vcpu_book3s->shadow_vcpu =
kzalloc(sizeof(*vcpu_book3s->shadow_vcpu), GFP_KERNEL);
if (!vcpu_book3s->shadow_vcpu)
goto free_vcpu;