diff options
author | Markus Elfring <elfring@users.sourceforge.net> | 2016-09-12 16:33:53 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@ozlabs.org> | 2016-09-13 00:32:47 -0400 |
commit | aad9e5ba243336d2b133e7fa9aace1a51d6fdae6 (patch) | |
tree | f650a42227e1c18b8ba409537ed939b1b152152a | |
parent | 90235dc19e5ccd85ad17ebbf51041770e87540a0 (diff) |
KVM: PPC: e500: Rename jump labels in kvmppc_e500_tlb_init()
Adjust jump labels according to the current Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
-rw-r--r-- | arch/powerpc/kvm/e500_mmu.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/powerpc/kvm/e500_mmu.c b/arch/powerpc/kvm/e500_mmu.c index 0a2eeb143e87..ddbf8f0284c0 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) | |||
907 | struct kvm_vcpu *vcpu = &vcpu_e500->vcpu; | 907 | struct kvm_vcpu *vcpu = &vcpu_e500->vcpu; |
908 | 908 | ||
909 | if (e500_mmu_host_init(vcpu_e500)) | 909 | if (e500_mmu_host_init(vcpu_e500)) |
910 | goto err; | 910 | goto free_vcpu; |
911 | 911 | ||
912 | vcpu_e500->gtlb_params[0].entries = KVM_E500_TLB0_SIZE; | 912 | vcpu_e500->gtlb_params[0].entries = KVM_E500_TLB0_SIZE; |
913 | vcpu_e500->gtlb_params[1].entries = KVM_E500_TLB1_SIZE; | 913 | 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) | |||
933 | sizeof(struct tlbe_ref), | 933 | sizeof(struct tlbe_ref), |
934 | GFP_KERNEL); | 934 | GFP_KERNEL); |
935 | if (!vcpu_e500->gtlb_priv[0]) | 935 | if (!vcpu_e500->gtlb_priv[0]) |
936 | goto err; | 936 | goto free_vcpu; |
937 | 937 | ||
938 | vcpu_e500->gtlb_priv[1] = kcalloc(vcpu_e500->gtlb_params[1].entries, | 938 | vcpu_e500->gtlb_priv[1] = kcalloc(vcpu_e500->gtlb_params[1].entries, |
939 | sizeof(struct tlbe_ref), | 939 | sizeof(struct tlbe_ref), |
940 | GFP_KERNEL); | 940 | GFP_KERNEL); |
941 | if (!vcpu_e500->gtlb_priv[1]) | 941 | if (!vcpu_e500->gtlb_priv[1]) |
942 | goto err; | 942 | goto free_vcpu; |
943 | 943 | ||
944 | vcpu_e500->g2h_tlb1_map = kcalloc(vcpu_e500->gtlb_params[1].entries, | 944 | vcpu_e500->g2h_tlb1_map = kcalloc(vcpu_e500->gtlb_params[1].entries, |
945 | sizeof(*vcpu_e500->g2h_tlb1_map), | 945 | sizeof(*vcpu_e500->g2h_tlb1_map), |
946 | GFP_KERNEL); | 946 | GFP_KERNEL); |
947 | if (!vcpu_e500->g2h_tlb1_map) | 947 | if (!vcpu_e500->g2h_tlb1_map) |
948 | goto err; | 948 | goto free_vcpu; |
949 | 949 | ||
950 | vcpu_mmu_init(vcpu, vcpu_e500->gtlb_params); | 950 | vcpu_mmu_init(vcpu, vcpu_e500->gtlb_params); |
951 | 951 | ||
952 | kvmppc_recalc_tlb1map_range(vcpu_e500); | 952 | kvmppc_recalc_tlb1map_range(vcpu_e500); |
953 | return 0; | 953 | return 0; |
954 | 954 | free_vcpu: | |
955 | err: | ||
956 | free_gtlb(vcpu_e500); | 955 | free_gtlb(vcpu_e500); |
957 | return -1; | 956 | return -1; |
958 | } | 957 | } |