From: Sean Christopherson <seanjc@google.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org,
kvm@vger.kernel.org
Subject: Re: [GIT PULL] First batch of KVM changes for Linux 6.2
Date: Mon, 12 Dec 2022 16:57:19 +0000 [thread overview]
Message-ID: <Y5ddb+tGS7phN1vc@google.com> (raw)
In-Reply-To: <20221212155027.2841892-1-pbonzini@redhat.com>
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@gmail.com
[2] https://lore.kernel.org/all/CAPm50aKbzsMtgb3Cfux2nXOrOcHRZ5MP0ndKg9T0OQCqOsCa_w@mail.gmail.com
next prev parent reply other threads:[~2022-12-12 16:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-12 15:50 [GIT PULL] First batch of KVM changes for Linux 6.2 Paolo Bonzini
2022-12-12 16:57 ` Sean Christopherson [this message]
2022-12-12 20:41 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y5ddb+tGS7phN1vc@google.com \
--to=seanjc@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.