From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753295AbbLUXyi (ORCPT ); Mon, 21 Dec 2015 18:54:38 -0500 Received: from zeniv.linux.org.uk ([195.92.253.2]:33103 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752360AbbLUXsK (ORCPT ); Mon, 21 Dec 2015 18:48:10 -0500 From: Al Viro To: linux-kernel@vger.kernel.org Cc: Linus Torvalds Subject: [POC][PATCH 63/83] switch kvmppc_core_vcpu_create_pr() to get_free_page() Date: Mon, 21 Dec 2015 23:47:36 +0000 Message-Id: <1450741676-5865-63-git-send-email-viro@ZenIV.linux.org.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <20151221234615.GW20997@ZenIV.linux.org.uk> References: <20151221234615.GW20997@ZenIV.linux.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Al Viro Signed-off-by: Al Viro --- arch/powerpc/kvm/book3s_pr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c index 3775664..9bdf9e3 100644 --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c @@ -1375,7 +1375,7 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_pr(struct kvm *kvm, struct kvmppc_vcpu_book3s *vcpu_book3s; struct kvm_vcpu *vcpu; int err = -ENOMEM; - unsigned long p; + void *p; vcpu = kmem_cache_zalloc(kvm_vcpu_cache, GFP_KERNEL); if (!vcpu) @@ -1398,10 +1398,10 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_pr(struct kvm *kvm, goto free_shadow_vcpu; err = -ENOMEM; - p = __get_free_page(GFP_KERNEL|__GFP_ZERO); + p = get_free_page(GFP_KERNEL|__GFP_ZERO); if (!p) goto uninit_vcpu; - vcpu->arch.shared = (void *)p; + vcpu->arch.shared = p; #ifdef CONFIG_PPC_BOOK3S_64 /* Always start the shared struct in native endian mode */ #ifdef __BIG_ENDIAN__ -- 2.1.4