Messages in this thread | | | Subject | Re: [PATCH 1/2] KVM: Fix the build error | From | Paolo Bonzini <> | Date | Sun, 20 Sep 2020 15:09:38 +0200 |
| |
On 14/09/20 11:11, lihaiwei.kernel@gmail.com wrote: > From: Haiwei Li <lihaiwei@tencent.com> > > When CONFIG_SMP is not set, an build error occurs with message "error: > use of undeclared identifier 'kvm_send_ipi_mask_allbutself'" > > Fixes: 0f990222108d ("KVM: Check the allocation of pv cpu mask", 2020-09-01) > Reported-by: kernel test robot <lkp@intel.com> > Signed-off-by: Haiwei Li <lihaiwei@tencent.com> > --- > arch/x86/kernel/kvm.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c > index 1b51b727b140..7e8be0421720 100644 > --- a/arch/x86/kernel/kvm.c > +++ b/arch/x86/kernel/kvm.c > @@ -797,7 +797,9 @@ static __init int kvm_alloc_cpumask(void) > } > } > > +#if defined(CONFIG_SMP) > apic->send_IPI_mask_allbutself = kvm_send_ipi_mask_allbutself; > +#endif > pv_ops.mmu.flush_tlb_others = kvm_flush_tlb_others; > return 0; > >
If CONFIG_SMP is not set you don't need kvm_alloc_cpumask or pv_ops.mmu.flush_tlb_others at all. Can you squash these two into the original patch and re-submit for 5.10?
Paolo
| |