diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-17 09:07:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-17 09:07:37 +0200 |
| commit | 15a0654851382faaf41a8da6d4e10201091246b9 (patch) | |
| tree | 810678e1b3d71b5b6e3c2422c6dddc6d3065caed /arch/powerpc/kvm/book3s_64_mmu_hv.c | |
| parent | 7f1534e172f5eb9c215a25d73ee9ef57eb1582ba (diff) | |
| parent | 4f7d029b9bf009fbee76bb10c0c4351a1870d2f3 (diff) | |
Merge 4.11-rc7 into tty-next
We want the tty patch revert in here to handle merges and future work
properly.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/powerpc/kvm/book3s_64_mmu_hv.c')
| -rw-r--r-- | arch/powerpc/kvm/book3s_64_mmu_hv.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c index 8c68145ba1bd..710e491206ed 100644 --- a/arch/powerpc/kvm/book3s_64_mmu_hv.c +++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c @@ -1487,6 +1487,10 @@ long kvm_vm_ioctl_resize_hpt_prepare(struct kvm *kvm, /* start new resize */ resize = kzalloc(sizeof(*resize), GFP_KERNEL); + if (!resize) { + ret = -ENOMEM; + goto out; + } resize->order = shift; resize->kvm = kvm; INIT_WORK(&resize->work, resize_hpt_prepare_work); |