Skip to content

Commit a3ff25f

Browse files
committed
KVM: vmx: rename pi_init to avoid conflict with paride
allyesconfig results in: ld: drivers/block/paride/paride.o: in function `pi_init': (.text+0x1340): multiple definition of `pi_init'; arch/x86/kvm/vmx/posted_intr.o:posted_intr.c:(.init.text+0x0): first defined here make: *** [Makefile:1164: vmlinux] Error 1 because commit: commit 8888cdd Author: Xiaoyao Li <xiaoyao.li@intel.com> Date: Wed Sep 23 11:31:11 2020 -0700 KVM: VMX: Extract posted interrupt support to separate files added another pi_init(), though one already existed in the paride code. Reported-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent 764388c commit a3ff25f

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

arch/x86/kvm/vmx/posted_intr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ void pi_wakeup_handler(void)
222222
spin_unlock(&per_cpu(blocked_vcpu_on_cpu_lock, cpu));
223223
}
224224

225-
void __init pi_init(int cpu)
225+
void __init pi_init_cpu(int cpu)
226226
{
227227
INIT_LIST_HEAD(&per_cpu(blocked_vcpu_on_cpu, cpu));
228228
spin_lock_init(&per_cpu(blocked_vcpu_on_cpu_lock, cpu));

arch/x86/kvm/vmx/posted_intr.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ void vmx_vcpu_pi_put(struct kvm_vcpu *vcpu);
9191
int pi_pre_block(struct kvm_vcpu *vcpu);
9292
void pi_post_block(struct kvm_vcpu *vcpu);
9393
void pi_wakeup_handler(void);
94-
void __init pi_init(int cpu);
94+
void __init pi_init_cpu(int cpu);
9595
bool pi_has_pending_interrupt(struct kvm_vcpu *vcpu);
9696
int pi_update_irte(struct kvm *kvm, unsigned int host_irq, uint32_t guest_irq,
9797
bool set);
9898

99-
#endif /* __KVM_X86_VMX_POSTED_INTR_H */
99+
#endif /* __KVM_X86_VMX_POSTED_INTR_H */

arch/x86/kvm/vmx/vmx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8004,7 +8004,7 @@ static int __init vmx_init(void)
80048004
for_each_possible_cpu(cpu) {
80058005
INIT_LIST_HEAD(&per_cpu(loaded_vmcss_on_cpu, cpu));
80068006

8007-
pi_init(cpu);
8007+
pi_init_cpu(cpu);
80088008
}
80098009

80108010
#ifdef CONFIG_KEXEC_CORE

0 commit comments

Comments
 (0)