lkml.org 
[lkml]   [2016]   [Sep]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH] KVM: PPC: e500: Rename jump labels in kvmppc_e500_tlb_init()
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    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 <elfring@users.sourceforge.net>
    ---

    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

    \
     
     \ /
      Last update: 2016-09-17 09:59    [W:4.019 / U:0.824 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site