Messages in this thread Patch in this message | | | Date | Thu, 21 May 2020 16:28:54 +1000 | From | Stephen Rothwell <> | Subject | linux-next: build failure after merge of the kvm tree |
| |
Hi all,
After merging the kvm tree, today's linux-next build (x86_64 allmodconfig) failed like this:
arch/x86/kvm/svm/svm.c: In function 'kvm_machine_check': arch/x86/kvm/svm/svm.c:1834:2: error: too many arguments to function 'do_machine_check' 1834 | do_machine_check(®s, 0); | ^~~~~~~~~~~~~~~~ In file included from arch/x86/kvm/svm/svm.c:36: arch/x86/include/asm/mce.h:254:6: note: declared here 254 | void do_machine_check(struct pt_regs *pt_regs); | ^~~~~~~~~~~~~~~~
Caused by commit
1c164cb3ffd0 ("KVM: SVM: Use do_machine_check to pass MCE to the host")
interacting with commit
aaa4947defff ("x86/entry: Convert Machine Check to IDTENTRY_IST")
from the tip tree.
I added the following merge fix patch.
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Thu, 21 May 2020 16:24:59 +1000 Subject: [PATCH] KVM: SVM: fix up for do_machine_check() API change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/x86/kvm/svm/svm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index ae287980c027..7488c8abe825 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -1831,7 +1831,7 @@ static void kvm_machine_check(void) .flags = X86_EFLAGS_IF, }; - do_machine_check(®s, 0); + do_machine_check(®s); #endif } -- 2.26.2 -- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |