Skip to content

Commit 7cb79f4

Browse files
sean-jcbonzini
authored andcommitted
KVM: PPC: Fix refactoring goof in kvmppc_e500mc_init()
Fix a build error due to a mixup during a recent refactoring. The error was reported during code review, but the fixed up patch didn't make it into the final commit. Fixes: 474856bad921 ("KVM: PPC: Move processor compatibility check to module init") Link: https://lore.kernel.org/all/87cz93snqc.fsf@mpe.ellerman.id.au Cc: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Sean Christopherson <seanjc@google.com> Message-Id: <20230119182158.4026656-1-seanjc@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent f15a87c commit 7cb79f4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

arch/powerpc/kvm/booke.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1211,7 +1211,7 @@ int kvmppc_handle_exit(struct kvm_vcpu *vcpu, unsigned int exit_nr)
12111211

12121212
/*
12131213
* On cores with Vector category, KVM is loaded only if CONFIG_ALTIVEC,
1214-
* see kvmppc_core_check_processor_compat().
1214+
* see kvmppc_e500mc_check_processor_compat().
12151215
*/
12161216
#ifdef CONFIG_ALTIVEC
12171217
case BOOKE_INTERRUPT_ALTIVEC_UNAVAIL:

arch/powerpc/kvm/e500mc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ static void kvmppc_core_vcpu_put_e500mc(struct kvm_vcpu *vcpu)
168168
kvmppc_booke_vcpu_put(vcpu);
169169
}
170170

171-
int kvmppc_core_check_processor_compat(void)
171+
int kvmppc_e500mc_check_processor_compat(void)
172172
{
173173
int r;
174174

@@ -390,7 +390,7 @@ static int __init kvmppc_e500mc_init(void)
390390

391391
r = kvmppc_e500mc_check_processor_compat();
392392
if (r)
393-
return kvmppc_e500mc;
393+
goto err_out;
394394

395395
r = kvmppc_booke_init();
396396
if (r)

0 commit comments

Comments
 (0)