diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-01 09:27:34 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-01 09:27:34 -0700 |
commit | 4f23174981ebc2055f71da41b5f3a310b1015883 (patch) | |
tree | a9e2d4bcac84c75b2aeb4dfc07024b53d729ec3c /arch/mips | |
parent | 16874b2cb867d3eb63ed838f2847143e11556708 (diff) | |
parent | 9a630d15f16dbe4fec7ef5a4bc570cd46774a968 (diff) | |
download | linux-4f23174981ebc2055f71da41b5f3a310b1015883.tar.gz linux-4f23174981ebc2055f71da41b5f3a310b1015883.tar.bz2 linux-4f23174981ebc2055f71da41b5f3a310b1015883.zip |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fixes from Paolo Bonzini:
"A bunch of one-liners (except the s390 one).
The two more serious bugs ("KVM: SVM: Fix CPL export via SS.DPL" and
"KVM: s390: add sie.h uapi header file to Kbuild and remove header
dependency") were introduced in the 3.16 merge window"
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: SVM: Fix CPL export via SS.DPL
KVM: s390: add sie.h uapi header file to Kbuild and remove header dependency
MIPS: KVM: Fix memory leak on VCPU
KVM: x86: preserve the high 32-bits of the PAT register
kvm: fix wrong address when writing Hyper-V tsc page
KVM: x86: Increase the number of fixed MTRR regs to 10
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/kvm/kvm_mips.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/kvm/kvm_mips.c b/arch/mips/kvm/kvm_mips.c index cd5e4f568439..f3c56a182fd8 100644 --- a/arch/mips/kvm/kvm_mips.c +++ b/arch/mips/kvm/kvm_mips.c @@ -384,6 +384,7 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu) kfree(vcpu->arch.guest_ebase); kfree(vcpu->arch.kseg0_commpage); + kfree(vcpu); } void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) |