diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-10 13:24:24 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-10 13:24:24 +1100 |
| commit | 7f36522fa5c8192dccee0f0a414f1b7b336b9c87 (patch) | |
| tree | 443ab002a359443792f43c48790e91539a01e4d4 /arch/x86/kvm/x86.c | |
| parent | bab31490ee78b5c5531bae6d54d411a49d2c2f30 (diff) | |
| parent | 28415881a8fced951563443d0a95f9f14cea8687 (diff) | |
Merge branch 'akpm/master'
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 1faf620a6fdc..7f9e6ff53a18 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -8198,13 +8198,13 @@ int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot, slot->base_gfn, level) + 1; slot->arch.rmap[i] = - kvm_kvzalloc(lpages * sizeof(*slot->arch.rmap[i])); + kvzalloc(lpages * sizeof(*slot->arch.rmap[i]), GFP_KERNEL); if (!slot->arch.rmap[i]) goto out_free; if (i == 0) continue; - linfo = kvm_kvzalloc(lpages * sizeof(*linfo)); + linfo = kvzalloc(lpages * sizeof(*linfo), GFP_KERNEL); if (!linfo) goto out_free; |