diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-07-27 23:28:28 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-07-27 23:28:28 -0700 |
| commit | d3608b5681d238605b7da6be62244e803e24c649 (patch) | |
| tree | 1fc47e9f58e6e938eefd40904745a60986739bde /arch/x86/kvm/x86.c | |
| parent | 650fb4393dff543bc980d361555c489fbdeed088 (diff) | |
| parent | 113fc5a6e8c2288619ff7e8187a6f556b7e0d372 (diff) | |
| download | op-kernel-dev-d3608b5681d238605b7da6be62244e803e24c649.zip op-kernel-dev-d3608b5681d238605b7da6be62244e803e24c649.tar.gz | |
Merge remote branch 'origin/x86/urgent' into x86/asm
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 6127468..33f0a84 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1562,7 +1562,7 @@ static int msr_io(struct kvm_vcpu *vcpu, struct kvm_msrs __user *user_msrs, r = -ENOMEM; size = sizeof(struct kvm_msr_entry) * msrs.nmsrs; - entries = vmalloc(size); + entries = kmalloc(size, GFP_KERNEL); if (!entries) goto out; @@ -1581,7 +1581,7 @@ static int msr_io(struct kvm_vcpu *vcpu, struct kvm_msrs __user *user_msrs, r = n; out_free: - vfree(entries); + kfree(entries); out: return r; } |
