From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Uros Bizjak <ubizjak@gmail.com>
Subject: linux-next: build failure after merge of the kvm tree
Date: Thu, 21 May 2020 16:28:54 +1000 [thread overview]
Message-ID: <20200521162854.70995699@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1455 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-05-21 6:28 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-21 6:28 Stephen Rothwell [this message]
2020-06-04 2:54 ` linux-next: build failure after merge of the kvm tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2024-04-12 3:34 Stephen Rothwell
2024-04-12 3:35 ` Stephen Rothwell
2024-04-12 12:14 ` Paolo Bonzini
2023-11-22 2:14 Stephen Rothwell
2023-11-20 4:22 Stephen Rothwell
2023-12-11 2:50 ` Stephen Rothwell
2022-04-19 5:34 Stephen Rothwell
2022-04-19 16:01 ` Sean Christopherson
2022-04-19 16:09 ` Paolo Bonzini
2022-04-21 18:06 ` Paolo Bonzini
2022-04-27 3:23 ` Stephen Rothwell
2022-04-27 6:06 ` Paolo Bonzini
2021-02-08 5:33 Stephen Rothwell
2021-02-08 11:18 ` Yu Zhang
2021-02-05 5:02 Stephen Rothwell
2021-02-05 10:08 ` Paolo Bonzini
2021-02-07 19:48 ` Stephen Rothwell
2021-02-09 4:56 ` Stephen Rothwell
2020-07-17 5:57 Stephen Rothwell
2020-07-29 7:06 ` Stephen Rothwell
2019-02-18 3:42 Stephen Rothwell
2019-02-19 15:36 ` Sean Christopherson
2019-02-19 18:17 ` Paolo Bonzini
2018-12-19 4:33 Stephen Rothwell
2017-02-08 3:23 Stephen Rothwell
2016-12-19 1:11 Stephen Rothwell
2015-09-08 1:35 Stephen Rothwell
2015-09-08 2:10 ` Wanpeng Li
2015-09-08 9:24 ` Paolo Bonzini
2015-05-29 7:36 Stephen Rothwell
2015-05-29 7:54 ` Ingo Molnar
2015-05-29 12:08 ` Paolo Bonzini
2014-11-24 6:19 Stephen Rothwell
2014-11-24 9:38 ` Paolo Bonzini
2014-08-06 4:39 Stephen Rothwell
2014-03-11 23:55 Mark Brown
2014-01-10 3:00 Stephen Rothwell
2014-01-17 4:03 ` Stephen Rothwell
2012-08-23 3:21 Stephen Rothwell
2012-03-06 4:53 Stephen Rothwell
2012-03-06 10:34 ` Avi Kivity
2010-08-30 1:35 Stephen Rothwell
2010-08-30 10:03 ` Alexander Graf
2010-08-30 10:56 ` Avi Kivity
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=20200521162854.70995699@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hpa@zytor.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=ubizjak@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).