diff options
author | Michael Mueller <mimu@linux.vnet.ibm.com> | 2013-06-12 07:54:54 -0400 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-06-17 11:06:42 -0400 |
commit | b110feaf4d0bbc31802589ea6b956389afdabcee (patch) | |
tree | 6914868ec0e9cf32b92824f7ba1295182c164e4a /arch/s390 | |
parent | 69d0d3a3160690cf64ea3bf484ca1f9d7a1bf798 (diff) |
KVM: s390: code cleanup to use common vcpu slab cache
cleanup of arch specific code to use common code provided vcpu slab cache
instead of kzalloc() provided memory
Signed-off-by: Michael Mueller <mimu@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/kvm/kvm-s390.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 426e259b6a69..a3183651ff45 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c | |||
@@ -278,7 +278,7 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) | |||
278 | 278 | ||
279 | free_page((unsigned long)(vcpu->arch.sie_block)); | 279 | free_page((unsigned long)(vcpu->arch.sie_block)); |
280 | kvm_vcpu_uninit(vcpu); | 280 | kvm_vcpu_uninit(vcpu); |
281 | kfree(vcpu); | 281 | kmem_cache_free(kvm_vcpu_cache, vcpu); |
282 | } | 282 | } |
283 | 283 | ||
284 | static void kvm_free_vcpus(struct kvm *kvm) | 284 | static void kvm_free_vcpus(struct kvm *kvm) |
@@ -408,7 +408,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, | |||
408 | 408 | ||
409 | rc = -ENOMEM; | 409 | rc = -ENOMEM; |
410 | 410 | ||
411 | vcpu = kzalloc(sizeof(struct kvm_vcpu), GFP_KERNEL); | 411 | vcpu = kmem_cache_zalloc(kvm_vcpu_cache, GFP_KERNEL); |
412 | if (!vcpu) | 412 | if (!vcpu) |
413 | goto out; | 413 | goto out; |
414 | 414 | ||
@@ -453,7 +453,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, | |||
453 | out_free_sie_block: | 453 | out_free_sie_block: |
454 | free_page((unsigned long)(vcpu->arch.sie_block)); | 454 | free_page((unsigned long)(vcpu->arch.sie_block)); |
455 | out_free_cpu: | 455 | out_free_cpu: |
456 | kfree(vcpu); | 456 | kmem_cache_free(kvm_vcpu_cache, vcpu); |
457 | out: | 457 | out: |
458 | return ERR_PTR(rc); | 458 | return ERR_PTR(rc); |
459 | } | 459 | } |