From patchwork Sun Aug 28 17:19:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 663398 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 [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sMhSD44Yjz9s4n for ; Mon, 29 Aug 2016 03:22:52 +1000 (AEST) Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3sMhSD3F9VzDrg3 for ; Mon, 29 Aug 2016 03:22:52 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mout.web.de (mout.web.de [212.227.17.12]) (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 3sMhPB0LkFzDrgY for ; Mon, 29 Aug 2016 03:20:13 +1000 (AEST) Received: from [192.168.1.3] ([77.181.152.74]) by smtp.web.de (mrweb101) with ESMTPSA (Nemesis) id 0LnB1F-1bCOQA2DQj-00hJLv; Sun, 28 Aug 2016 19:19:23 +0200 Subject: [PATCH 6/6] KVM: PPC: e500: Rename jump labels in kvmppc_e500_tlb_init() To: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Alexander Graf , Benjamin Herrenschmidt , Michael Ellerman , Paolo Bonzini , Paul Mackerras , =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= References: <566ABCD9.1060404@users.sourceforge.net> From: SF Markus Elfring Message-ID: <165cb42e-f9fe-83ad-7c4c-299a805dbe6e@users.sourceforge.net> Date: Sun, 28 Aug 2016 19:19:22 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: X-Provags-ID: V03:K0:4y7dtrXiuSOnAI7SPstz6SV3fYQ/VE+P6nANv/noEnkh7df7YIG 50i9so8OOeRyZ+/eFJynRObe3N6fKMLomymSR1OCt4eCFrykSRcIkFmVB2dU8eAMVVEmEpd FMADD1zabEnyS8nuWcd6XUkTaaE4wvUAtO0mGJIBl3W0BY4dbkW8h/kj/OeSPN5JIEUs1Om xrIRz/DuJX2v2nPpwxhYA== X-UI-Out-Filterresults: notjunk:1; V01:K0:96iljmzt8mw=:yoRxBjn2AutVLKlUBc7Klf 4Ocz4OkgdQvMUw0ioToShv3wlEKNIUZWmwFyvPjWVr1Rb+KfAtu03iCixCuISDXiqyXfnZgLM HLywCpKB07rGkh7ZKEwVc6F/MrmLZLSRWsxI7d7q9Uf+5NiZAIod3tlufNQy/rVh9ZuUZ2mfy cPePE+8xC/rnzgWjEEY9HQs/QSC/I+GgFTbSwmcVSkL2wpyRDpJ+lGi/e/grQ0KlZZyp9nqVF uANctu69qJ2TNbeQXo7GGSGzGK4A1ptIoAwj1ar5e7o/uhvrx6A9J1ev9vtmp/OXCt22Dt5Q1 WWNoMcuQ/90w7byBs/08ZRJNJKM34jxCNeKwFn7K/EDpPPC5W0i2ZQd4hS9eDRHuq08EMfKFR kEVimWKeoiJLvyJMlgptgnMx5565pW6lNz/VnO8TKc+H9wSKY8LyWdmHoLRwZdcFx/t1rZO5H dz2oLpbkKuHCi81BMRV7cT4oncO+bdziAr3W/kMMlKtuLqyEhsDnl/AdxQvxgwqQeWXdFun6j rLxFXd4FtmtsYSDhzg/QdqqCvU2FDBtlXdT0Idir4pv4VMyP/EHs1GkkTZbw39684Qiscy8Kd cbgNm1sxoVnoQexOUHVG5M2uhJ2q1tzx19xDMAV2xU+NIc4rb6AThtWACoE1J0qAhU7uVDSGd 8n+IR0+41dHtNgAiMHdTcsrmqzBOxC9ZJyIehNBLKK+G45RRO0hOVGfY3RfHJeVyHXNtA4fUP 9qkcSbHQv/jKQxVLBNiDBTO6AjAEtwAkoWqYY74BpgjLMUigRoTRo00q2/VLUT5gk8kxJ5Fc2 CIfKujG 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: Julia Lawall , kernel-janitors@vger.kernel.org, LKML Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Markus Elfring Date: Sun, 28 Aug 2016 18:45:26 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- arch/powerpc/kvm/e500_mmu.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/kvm/e500_mmu.c b/arch/powerpc/kvm/e500_mmu.c index 0a2eeb1..da8f22b 100644 --- a/arch/powerpc/kvm/e500_mmu.c +++ b/arch/powerpc/kvm/e500_mmu.c @@ -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; }