From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757414AbcILVAo (ORCPT ); Mon, 12 Sep 2016 17:00:44 -0400 Received: from mout.web.de ([217.72.192.78]:60855 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757136AbcILVAi (ORCPT ); Mon, 12 Sep 2016 17:00:38 -0400 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> Cc: Alexander Graf , Benjamin Herrenschmidt , Michael Ellerman , Paolo Bonzini , =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= , LKML , kernel-janitors@vger.kernel.org, Julia Lawall 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> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit 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:RPGKmCzxhyM=:46UfpqbIbO1Fme2HHq4xEZ C4t/B2F4x7YbAGl1QxUSHiQTsn0eMzGuHwxMoaWdN97+gfyd3jLakPsu9qvSn02gOH4Vd1XoI tUJAn1HbfS8q1CkaI+u+SB3jpwaQazZLuywTmgGAKXU3D/N7aU2i+Tsp1DSK1eGLPWP3aCrFL l6zCzlX8dryT+s+ffTL6HhYsy4ICmAiIp/+MnVC60mjihS+h635UU04urZHTnxDt72OHQbUp2 qtWa2rAjYuAejeSGN75p0iTzspeTRUZ2SxQh1gn4SrV6ZyKIQL+aNqDxhEmw/QKEKOubmJwqE MCZnMzVpMfNL9FoXF4mvF+XHFyOaLL4knlXPO68Q/XRXlhlHJjCpHCT/p9RJq1ANf+awz/ewA D1M3iN2yyOz6jIOvWqWjqiAv2CfIjZzlCugaRvQU6OHcjROJmwiFs3JctXIteGAvbCz/R8e/h OYnMchnl6rBMlnryTq0J5Rk6jM1O3+FB5iLFwqR3+eeMrvcFumWLQB/CmPXVT4rqbpOzLC80f xXNDZufxH3qw0o92holeZzg8W9IZ8wL2YpvfIoy0+GtIq6oMWA1o7KyBIqEaRL6e8Ngustq83 Wv1p3QGYbFVh/2XOBxgTX5l7Bxib3MGUYl2ofageITuVm3sE6+sv1Zx/PS7intvI2yS3UA9yH 83lX+0jRForSIV++9NdbNU/XqT0hozsxWM1RoKiMMr6Z3UwvxRe05fpvknZ2i3Fnf6X/kDxEA r2AOqpkMYNZDyyDC0F20G/GhF8wBSgb5FeI3q7kk1SZxVarlABQTO5urVoumpLznKsYwdB5l2 9IdDolj Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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; } -- 2.10.0