| Message ID | 20200602173556.17ad06a1@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: build failure after merge of the hyperv tree | expand |
diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c index abde638548e0..af9cdb426dd2 100644 --- a/arch/x86/kvm/hyperv.c +++ b/arch/x86/kvm/hyperv.c @@ -2017,7 +2017,7 @@ int kvm_vcpu_ioctl_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid, ent->edx |= HV_FEATURE_FREQUENCY_MSRS_AVAILABLE; ent->edx |= HV_FEATURE_GUEST_CRASH_MSR_AVAILABLE; - ent->ebx |= HV_X64_DEBUGGING; + ent->ebx |= HV_DEBUGGING; ent->edx |= HV_X64_GUEST_DEBUGGING_AVAILABLE; ent->edx |= HV_FEATURE_DEBUG_MSRS_AVAILABLE;
Hi all, After merging the hyperv tree, today's linux-next build (x86_64 allmodconfig) failed like this: arch/x86/kvm/hyperv.c: In function 'kvm_vcpu_ioctl_get_hv_cpuid': arch/x86/kvm/hyperv.c:2020:16: error: 'HV_X64_DEBUGGING' undeclared (first use in this function); did you mean 'HV_DEBUGGING'? 2020 | ent->ebx |= HV_X64_DEBUGGING; | ^~~~~~~~~~~~~~~~ | HV_DEBUGGING arch/x86/kvm/hyperv.c:2020:16: note: each undeclared identifier is reported only once for each function it appears in Caused by commit c55a844f46f9 ("x86/hyperv: Split hyperv-tlfs.h into arch dependent and independent files") interacting with commit f97f5a56f597 ("x86/kvm/hyper-v: Add support for synthetic debugger interface") from the kvm tree. I have applied this patch for today: From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Tue, 2 Jun 2020 17:31:06 +1000 Subject: [PATCH] x86/hyperv: merge fix for HV_X64_DEBUGGING name change Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/x86/kvm/hyperv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)