From: Lai Jiangshan <laijs@linux.alibaba.com>
To: linux-kernel@vger.kernel.org
Cc: Lai Jiangshan <laijs@linux.alibaba.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Alexios Zavras <alexios.zavras@intel.com>,
Allison Randal <allison@lohutok.net>,
Armijn Hemel <armijn@tjaldur.nl>
Subject: [PATCH 2/3] x86: remove address operator on function machine_check()
Date: Sun, 19 Apr 2020 14:40:48 +0000 [thread overview]
Message-ID: <20200419144049.1906-3-laijs@linux.alibaba.com> (raw)
In-Reply-To: <20200419144049.1906-1-laijs@linux.alibaba.com>
machine_check is function address, the address operator
on it is nop for compiler.
Make it consistent with the other function addresses in the
same file.
Signed-off-by: Lai Jiangshan <laijs@linux.alibaba.com>
---
arch/x86/kernel/idt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/idt.c b/arch/x86/kernel/idt.c
index 87ef69a72c52..98bcb502f967 100644
--- a/arch/x86/kernel/idt.c
+++ b/arch/x86/kernel/idt.c
@@ -93,7 +93,7 @@ static const __initconst struct idt_data def_idts[] = {
INTG(X86_TRAP_DB, debug),
#ifdef CONFIG_X86_MCE
- INTG(X86_TRAP_MC, &machine_check),
+ INTG(X86_TRAP_MC, machine_check),
#endif
SYSG(X86_TRAP_OF, overflow),
@@ -186,7 +186,7 @@ static const __initconst struct idt_data ist_idts[] = {
ISTG(X86_TRAP_NMI, nmi, IST_INDEX_NMI),
ISTG(X86_TRAP_DF, double_fault, IST_INDEX_DF),
#ifdef CONFIG_X86_MCE
- ISTG(X86_TRAP_MC, &machine_check, IST_INDEX_MCE),
+ ISTG(X86_TRAP_MC, machine_check, IST_INDEX_MCE),
#endif
};
--
2.20.1
next prev parent reply other threads:[~2020-04-19 14:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-19 14:40 [PATCH 0/3] x86: cleanups Lai Jiangshan
2020-04-19 14:40 ` [PATCH 1/3] x86/entry: remove unneeded kernel cr3 switching Lai Jiangshan
2020-05-07 15:16 ` [tip: x86/entry] x86/entry/64: Remove unneeded kernel CR3 switching tip-bot2 for Lai Jiangshan
2020-04-19 14:40 ` Lai Jiangshan [this message]
2020-05-07 15:16 ` [tip: x86/entry] x86/idt: Remove address operator on function machine_check() tip-bot2 for Lai Jiangshan
2020-04-19 14:40 ` [PATCH 3/3] x86/entry: remove an unused label Lai Jiangshan
2020-05-07 15:16 ` [tip: x86/entry] x86/entry/64: Remove " tip-bot2 for Lai Jiangshan
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=20200419144049.1906-3-laijs@linux.alibaba.com \
--to=laijs@linux.alibaba.com \
--cc=alexios.zavras@intel.com \
--cc=allison@lohutok.net \
--cc=armijn@tjaldur.nl \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.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 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).