On Mon, Dec 12, 2022, Paolo Bonzini wrote: > Linus, > > The following changes since commit 8332f0ed4f187c7b700831bd7cc83ce180a944b9: > > KVM: Update gfn_to_pfn_cache khva when it moves within the same page (2022-11-23 18:58:46 -0500) > > are available in the Git repository at: > > https://git.kernel.org/pub/scm/virt/kvm/kvm.git tags/for-linus > > for you to fetch changes up to 1396763d469a83c5d791fa84df7dd17eba83dcf2: > > Merge remote-tracking branch 'kvm/queue' into HEAD (2022-12-09 09:15:09 +0100) ... > KVM: x86: remove unnecessary exports ... > KVM: nVMX: hyper-v: Enable L2 TLB flush As reported a few times[1][2], these two collided and cause a build failure when building with CONFIG_KVM_AMD=m. ERROR: modpost: "kvm_hv_assist_page_enabled" [arch/x86/kvm/kvm-amd.ko] undefined! make[2]: *** [scripts/Makefile.modpost:126: Module.symvers] Error 1 make[1]: *** [Makefile:1944: modpost] Error 2 The fix is simple enough, maybe just squash it into the merge? --- arch/x86/kvm/hyperv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c index cc3e8c7d0850..2c7f2a26421e 100644 --- a/arch/x86/kvm/hyperv.c +++ b/arch/x86/kvm/hyperv.c @@ -898,6 +898,7 @@ bool kvm_hv_assist_page_enabled(struct kvm_vcpu *vcpu) return false; return vcpu->arch.pv_eoi.msr_val & KVM_MSR_ENABLED; } +EXPORT_SYMBOL_GPL(kvm_hv_assist_page_enabled); int kvm_hv_get_assist_page(struct kvm_vcpu *vcpu) { base-commit: 9d75a3251adfbcf444681474511b58042a364863 -- [1] https://lore.kernel.org/all/05188606-395e-acd0-b821-2526d5808aca@xxxxxxxxx [2] https://lore.kernel.org/all/CAPm50aKbzsMtgb3Cfux2nXOrOcHRZ5MP0ndKg9T0OQCqOsCa_w@xxxxxxxxxxxxxx
