The following commit has been merged into the x86/entry branch of tip:
Commit-ID: 3dcdb8e0c83b9502f669106e17bfa795f19f8d9b
Gitweb: https://git.kernel.org/tip/3dcdb8e0c83b9502f669106e17bfa795f19f8d9b
Author: Lai Jiangshan <laijs@xxxxxxxxxxxxxxxxx>
AuthorDate: Sun, 19 Apr 2020 14:40:48
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Thu, 07 May 2020 17:12:40 +02:00
x86/idt: Remove address operator on function machine_check()
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@xxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Link: https://lkml.kernel.org/r/20200419144049.1906-3-laijs@xxxxxxxxxxxxxxxxx
---
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 87ef69a..98bcb50 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
};
|