Skip to content

Commit 052f064

Browse files
author
Marc Zyngier
committed
KVM: arm64: Move kvm_arch_vcpu_run_pid_change() out of line
Having kvm_arch_vcpu_run_pid_change() inline doesn't bring anything to the table. Move it next to kvm_vcpu_first_run_init(), which will be convenient for what is next to come. Reviewed-by: Andrew Jones <[email protected]> Signed-off-by: Marc Zyngier <[email protected]>
1 parent bff01a6 commit 052f064

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

arch/arm64/include/asm/kvm_host.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -749,12 +749,7 @@ static inline bool kvm_pmu_counter_deferred(struct perf_event_attr *attr)
749749
void kvm_arch_vcpu_load_debug_state_flags(struct kvm_vcpu *vcpu);
750750
void kvm_arch_vcpu_put_debug_state_flags(struct kvm_vcpu *vcpu);
751751

752-
#ifdef CONFIG_KVM /* Avoid conflicts with core headers if CONFIG_KVM=n */
753-
static inline int kvm_arch_vcpu_run_pid_change(struct kvm_vcpu *vcpu)
754-
{
755-
return kvm_arch_vcpu_run_map_fp(vcpu);
756-
}
757-
752+
#ifdef CONFIG_KVM
758753
void kvm_set_pmu_events(u32 set, struct perf_event_attr *attr);
759754
void kvm_clr_pmu_events(u32 clr);
760755

arch/arm64/kvm/arm.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,11 @@ static void update_vmid(struct kvm_vmid *vmid)
584584
spin_unlock(&kvm_vmid_lock);
585585
}
586586

587+
int kvm_arch_vcpu_run_pid_change(struct kvm_vcpu *vcpu)
588+
{
589+
return kvm_arch_vcpu_run_map_fp(vcpu);
590+
}
591+
587592
static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu)
588593
{
589594
struct kvm *kvm = vcpu->kvm;

0 commit comments

Comments
 (0)