]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
x86/idt: Remove address operator on function machine_check()
authorLai Jiangshan <laijs@linux.alibaba.com>
Sun, 19 Apr 2020 14:40:48 +0000 (14:40 +0000)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 11 Jun 2020 13:14:32 +0000 (15:14 +0200)
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>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20200419144049.1906-3-laijs@linux.alibaba.com
arch/x86/kernel/idt.c

index 87ef69a72c52efea6ed898a3d171a7b02d3d5295..98bcb502f967570bc30a0e2ed41248fe0201bf14 100644 (file)
@@ -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
 };