diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-20 14:22:45 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-20 14:22:45 -0700 |
| commit | d25e6b0b326278a1096e8334584c3e64517057a3 (patch) | |
| tree | 3c914b877adf9615c7158b58705478e56c9b4247 /arch/x86/kvm/lapic.c | |
| parent | e44dea35ccb78ab7dc3a75ccec71d7d6f35017c4 (diff) | |
| parent | 40ffa93791985ab300fd488072e9f37ccf72e88c (diff) | |
Merge branch 'x86/cleanups' into x86/trampoline
Diffstat (limited to 'arch/x86/kvm/lapic.c')
| -rw-r--r-- | arch/x86/kvm/lapic.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 77d8c0f4817d..22b06f7660f4 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -1056,14 +1056,13 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu) vcpu->arch.apic = apic; - apic->regs_page = alloc_page(GFP_KERNEL); + apic->regs_page = alloc_page(GFP_KERNEL|__GFP_ZERO); if (apic->regs_page == NULL) { printk(KERN_ERR "malloc apic regs error for vcpu %x\n", vcpu->vcpu_id); goto nomem_free_apic; } apic->regs = page_address(apic->regs_page); - memset(apic->regs, 0, PAGE_SIZE); apic->vcpu = vcpu; hrtimer_init(&apic->lapic_timer.timer, CLOCK_MONOTONIC, |