aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/lapic.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kvm/lapic.c')
-rw-r--r--arch/x86/kvm/lapic.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 4b6c2da7265c..991fdf7fc17f 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -181,7 +181,8 @@ static void recalculate_apic_map(struct kvm *kvm)
181 max_id = max(max_id, kvm_x2apic_id(vcpu->arch.apic)); 181 max_id = max(max_id, kvm_x2apic_id(vcpu->arch.apic));
182 182
183 new = kvzalloc(sizeof(struct kvm_apic_map) + 183 new = kvzalloc(sizeof(struct kvm_apic_map) +
184 sizeof(struct kvm_lapic *) * ((u64)max_id + 1), GFP_KERNEL); 184 sizeof(struct kvm_lapic *) * ((u64)max_id + 1),
185 GFP_KERNEL_ACCOUNT);
185 186
186 if (!new) 187 if (!new)
187 goto out; 188 goto out;
@@ -2259,13 +2260,13 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu)
2259 ASSERT(vcpu != NULL); 2260 ASSERT(vcpu != NULL);
2260 apic_debug("apic_init %d\n", vcpu->vcpu_id); 2261 apic_debug("apic_init %d\n", vcpu->vcpu_id);
2261 2262
2262 apic = kzalloc(sizeof(*apic), GFP_KERNEL); 2263 apic = kzalloc(sizeof(*apic), GFP_KERNEL_ACCOUNT);
2263 if (!apic) 2264 if (!apic)
2264 goto nomem; 2265 goto nomem;
2265 2266
2266 vcpu->arch.apic = apic; 2267 vcpu->arch.apic = apic;
2267 2268
2268 apic->regs = (void *)get_zeroed_page(GFP_KERNEL); 2269 apic->regs = (void *)get_zeroed_page(GFP_KERNEL_ACCOUNT);
2269 if (!apic->regs) { 2270 if (!apic->regs) {
2270 printk(KERN_ERR "malloc apic regs error for vcpu %x\n", 2271 printk(KERN_ERR "malloc apic regs error for vcpu %x\n",
2271 vcpu->vcpu_id); 2272 vcpu->vcpu_id);