Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0e13614 authored by Thadeu Lima de Souza Cascardo's avatar Thadeu Lima de Souza Cascardo Committed by Benjamin Herrenschmidt
Browse files

powerpc/kvm/book3s_pr: Return appropriate error when allocation fails 



err was overwritten by a previous function call, and checked to be 0. If
the following page allocation fails, 0 is going to be returned instead
of -ENOMEM.

Signed-off-by: default avatarThadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 2fb10672

arch/powerpc/kvm/book3s_pr.c

+3 −2
Original line number Diff line number Diff line
@@ -1047,11 +1047,12 @@ struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id) 
	if (err)

		goto free_shadow_vcpu;



	err = -ENOMEM;

	p = __get_free_page(GFP_KERNEL|__GFP_ZERO);

	/* the real shared page fills the last 4k of our page */

	vcpu->arch.shared = (void*)(p + PAGE_SIZE - 4096);

	if (!p)

		goto uninit_vcpu;

	/* the real shared page fills the last 4k of our page */

	vcpu->arch.shared = (void *)(p + PAGE_SIZE - 4096);



#ifdef CONFIG_PPC_BOOK3S_64

	/* default to book3s_64 (970fx) */