소스 검색

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>
Markus Elfring 9 년 전
부모
커밋
aad9e5ba24
1개의 변경된 파일5개의 추가작업 그리고 6개의 파일을 삭제
  1. 5 6
      arch/powerpc/kvm/e500_mmu.c

+ 5 - 6
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;
 	struct kvm_vcpu *vcpu = &vcpu_e500->vcpu;
 
 
 	if (e500_mmu_host_init(vcpu_e500))
 	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[0].entries = KVM_E500_TLB0_SIZE;
 	vcpu_e500->gtlb_params[1].entries = KVM_E500_TLB1_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),
 					  sizeof(struct tlbe_ref),
 					  GFP_KERNEL);
 					  GFP_KERNEL);
 	if (!vcpu_e500->gtlb_priv[0])
 	if (!vcpu_e500->gtlb_priv[0])
-		goto err;
+		goto free_vcpu;
 
 
 	vcpu_e500->gtlb_priv[1] = kcalloc(vcpu_e500->gtlb_params[1].entries,
 	vcpu_e500->gtlb_priv[1] = kcalloc(vcpu_e500->gtlb_params[1].entries,
 					  sizeof(struct tlbe_ref),
 					  sizeof(struct tlbe_ref),
 					  GFP_KERNEL);
 					  GFP_KERNEL);
 	if (!vcpu_e500->gtlb_priv[1])
 	if (!vcpu_e500->gtlb_priv[1])
-		goto err;
+		goto free_vcpu;
 
 
 	vcpu_e500->g2h_tlb1_map = kcalloc(vcpu_e500->gtlb_params[1].entries,
 	vcpu_e500->g2h_tlb1_map = kcalloc(vcpu_e500->gtlb_params[1].entries,
 					  sizeof(*vcpu_e500->g2h_tlb1_map),
 					  sizeof(*vcpu_e500->g2h_tlb1_map),
 					  GFP_KERNEL);
 					  GFP_KERNEL);
 	if (!vcpu_e500->g2h_tlb1_map)
 	if (!vcpu_e500->g2h_tlb1_map)
-		goto err;
+		goto free_vcpu;
 
 
 	vcpu_mmu_init(vcpu, vcpu_e500->gtlb_params);
 	vcpu_mmu_init(vcpu, vcpu_e500->gtlb_params);
 
 
 	kvmppc_recalc_tlb1map_range(vcpu_e500);
 	kvmppc_recalc_tlb1map_range(vcpu_e500);
 	return 0;
 	return 0;
-
-err:
+ free_vcpu:
 	free_gtlb(vcpu_e500);
 	free_gtlb(vcpu_e500);
 	return -1;
 	return -1;
 }
 }