From patchwork Mon Sep 12 21:00:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 669009 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sY0w92gxSz9sdg for ; Tue, 13 Sep 2016 07:15:53 +1000 (AEST) Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3sY0w91tv1zDsWl for ; Tue, 13 Sep 2016 07:15:53 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org X-Greylist: delayed 502 seconds by postgrey-1.36 at bilbo; Tue, 13 Sep 2016 07:14:48 AEST Received: from mout.web.de (mout.web.de [212.227.17.11]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3sY0tw0Qt1zDrfR for ; Tue, 13 Sep 2016 07:14:47 +1000 (AEST) Received: from [192.168.1.3] ([77.182.57.148]) by smtp.web.de (mrweb103) with ESMTPSA (Nemesis) id 0Ljrlt-1bCQRc2d8D-00bthp; Mon, 12 Sep 2016 23:00:17 +0200 Subject: [PATCH] KVM: PPC: e500: Rename jump labels in kvmppc_e500_tlb_init() To: Paul Mackerras , kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org References: <566ABCD9.1060404@users.sourceforge.net> <165cb42e-f9fe-83ad-7c4c-299a805dbe6e@users.sourceforge.net> <20160911232547.GA9873@fergus.ozlabs.ibm.com> From: SF Markus Elfring Message-ID: Date: Mon, 12 Sep 2016 23:00:08 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <20160911232547.GA9873@fergus.ozlabs.ibm.com> X-Provags-ID: V03:K0:OUgehHC5v1mqxUV2YC9+WgNQfggdtxOwY/H0w/whkGqqMgR8VXO 3dhGdSIOALmhFfyPaTBd7anb/DqyuxE4mR4nVnlFcYjBfJxHUcoeofV57Yo1EWTxL/BXRo4 u+r7lCcxPQUhozP0x2u76Rpn2dcCXnnD+XgNdvpgvhU4zI5nZijkoFboicGTgEV68/ufmPK FTiK7WyKWKXKv6YM3euYg== X-UI-Out-Filterresults: notjunk:1; V01:K0:6DX0rwMimQc=:2dYEFPPh6ghEkIZG3XaZ3R F6UbbAgjhHPkRA7mSSwYsTk6g3AtKMAn0p6pazcFBizDrwGcP2Tzn1JSsKWaYOEhbsJq2Mfxr AKeZS/4gCHRnHwmlkfaDEobTxMJEP8N2qIzACgXPiCg5ZMo5KFPOEJi8DCgfV8PKhvbFqFBQz 9Nc27T/HTeqwL+sP8f3FXcwNvYyRep3SxJCzi0lQbUyomEOl5fNGlz7q7w+yb7PClaXBh33vM HGy7R8Fc1Uv7YDvfbiulWjv14N62ixd6v+plGOEKUlutLT+bbvo6EKiMDPZJoZvul1vjkJNZC 3wn1+wTlVpn4Whd3Z3O5I3YZ4IdFrapm6j6mCnyhkE8mdzOAgE1hnQXeXotdAXKjGkIArwQZK sd1vX55Ii5C/bpSWeciNthUATwwf47HEBBh2/75yR0f4rirF1mz7zj4DIzm3+93wOOMhN6AhB GxPA6cxy0TFj8SmrA+x+6ouZnfzWOF4ytcsuHRkBOW/PijEJxCE+PzOdC5kDkgjqfgWfNS+k5 xYvlkyE6DWrP4XC6uA0iWrsFmgfGuSLh/4ozy4t9kR5gebzeRLJAxqTFAgyWCP8C00uyVXMOb YbaLyGRKzb2Trkq55eJ3hcII2VQi0jQXui+8bSFh4SAv310VigHGH6UWUuJWFqPtIYEjoMG39 HhnL8XKtl1eFcO0Sd6HrPqLBKUDF5MlogHGGUKOYVgJZCUGHmeoRoOsC1kpBxGyGWMw9KflCh tFdCbNPH5j0tzIkTiYLI7pDC7fiYcRZCARafvOczcPSokA8iXQWCvw96s6sngQTj31Kd+6dLD f30akzj X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= , kernel-janitors@vger.kernel.org, LKML , Julia Lawall , Paolo Bonzini , Alexander Graf Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Markus Elfring Date: Mon, 12 Sep 2016 22:33:53 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- Thanks that five update steps could be integrated into the branch "kvm-ppc-next" of another source code repository. > With this I get a compile error: > > CC arch/powerpc/kvm/e500_mmu.o > /home/paulus/kernel/kvm/arch/powerpc/kvm/e500_mmu.c: In function ‘kvmppc_e500_tlb_init’: > /home/paulus/kernel/kvm/arch/powerpc/kvm/e500_mmu.c:910:3: error: label ‘err’ used but not defined > goto err; > ^ > /home/paulus/kernel/kvm/scripts/Makefile.build:289: recipe for target 'arch/powerpc/kvm/e500_mmu.o' failed > make[2]: *** [arch/powerpc/kvm/e500_mmu.o] Error 1 I overlooked a single goto statement there somehow. I hope that you like my second approach for this function implementation better. arch/powerpc/kvm/e500_mmu.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/kvm/e500_mmu.c b/arch/powerpc/kvm/e500_mmu.c index 0a2eeb1..ddbf8f0 100644 --- a/arch/powerpc/kvm/e500_mmu.c +++ b/arch/powerpc/kvm/e500_mmu.c @@ -907,7 +907,7 @@ int kvmppc_e500_tlb_init(struct kvmppc_vcpu_e500 *vcpu_e500) struct kvm_vcpu *vcpu = &vcpu_e500->vcpu; if (e500_mmu_host_init(vcpu_e500)) - goto err; + goto free_vcpu; vcpu_e500->gtlb_params[0].entries = KVM_E500_TLB0_SIZE; vcpu_e500->gtlb_params[1].entries = KVM_E500_TLB1_SIZE; @@ -933,26 +933,25 @@ int kvmppc_e500_tlb_init(struct kvmppc_vcpu_e500 *vcpu_e500) sizeof(struct tlbe_ref), GFP_KERNEL); if (!vcpu_e500->gtlb_priv[0]) - goto err; + goto free_vcpu; vcpu_e500->gtlb_priv[1] = kcalloc(vcpu_e500->gtlb_params[1].entries, sizeof(struct tlbe_ref), GFP_KERNEL); if (!vcpu_e500->gtlb_priv[1]) - goto err; + goto free_vcpu; vcpu_e500->g2h_tlb1_map = kcalloc(vcpu_e500->gtlb_params[1].entries, sizeof(*vcpu_e500->g2h_tlb1_map), GFP_KERNEL); if (!vcpu_e500->g2h_tlb1_map) - goto err; + goto free_vcpu; vcpu_mmu_init(vcpu, vcpu_e500->gtlb_params); kvmppc_recalc_tlb1map_range(vcpu_e500); return 0; - -err: + free_vcpu: free_gtlb(vcpu_e500); return -1; }