aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/arch/x86/kvm/vmx/vmx.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2020-10-24 04:08:37 -0400
committerPaolo Bonzini <pbonzini@redhat.com>2020-10-24 04:09:54 -0400
commita3ff25fc3c52f22b0766bb96c31b87d3c99fbf53 (patch)
treea9f91e1f0cdfa929a73a78a08948324e718d5236 /arch/x86/kvm/vmx/vmx.c
parentKVM: x86/mmu: Avoid modulo operator on 64-bit value to fix i386 build (diff)
downloadwireguard-linux-a3ff25fc3c52f22b0766bb96c31b87d3c99fbf53.tar.xz
wireguard-linux-a3ff25fc3c52f22b0766bb96c31b87d3c99fbf53.zip
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 8888cdd0996c2d51cd417f9a60a282c034f3fa28 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>
Diffstat (limited to '')
-rw-r--r--arch/x86/kvm/vmx/vmx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 755896797a81..281c405c7ea3 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -8004,7 +8004,7 @@ static int __init vmx_init(void)
for_each_possible_cpu(cpu) {
INIT_LIST_HEAD(&per_cpu(loaded_vmcss_on_cpu, cpu));
- pi_init(cpu);
+ pi_init_cpu(cpu);
}
#ifdef CONFIG_KEXEC_CORE