projects
/
cascardo
/
linux.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/lethal/fbdev-2.6
[cascardo/linux.git]
/
arch
/
powerpc
/
kvm
/
powerpc.c
diff --git
a/arch/powerpc/kvm/powerpc.c
b/arch/powerpc/kvm/powerpc.c
index
38f756f
..
9975846
100644
(file)
--- a/
arch/powerpc/kvm/powerpc.c
+++ b/
arch/powerpc/kvm/powerpc.c
@@
-145,18
+145,12
@@
void kvm_arch_check_processor_compat(void *rtn)
*(int *)rtn = kvmppc_core_check_processor_compat();
}
*(int *)rtn = kvmppc_core_check_processor_compat();
}
-
struct kvm *kvm_arch_create_vm(void
)
+
int kvm_arch_init_vm(struct kvm *kvm
)
{
{
- struct kvm *kvm;
-
- kvm = kzalloc(sizeof(struct kvm), GFP_KERNEL);
- if (!kvm)
- return ERR_PTR(-ENOMEM);
-
- return kvm;
+ return 0;
}
}
-
static void kvmppc_free_vcpus
(struct kvm *kvm)
+
void kvm_arch_destroy_vm
(struct kvm *kvm)
{
unsigned int i;
struct kvm_vcpu *vcpu;
{
unsigned int i;
struct kvm_vcpu *vcpu;
@@
-176,14
+170,6
@@
void kvm_arch_sync_events(struct kvm *kvm)
{
}
{
}
-void kvm_arch_destroy_vm(struct kvm *kvm)
-{
- kvmppc_free_vcpus(kvm);
- kvm_free_physmem(kvm);
- cleanup_srcu_struct(&kvm->srcu);
- kfree(kvm);
-}
-
int kvm_dev_ioctl_check_extension(long ext)
{
int r;
int kvm_dev_ioctl_check_extension(long ext)
{
int r;