Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad63ba16 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Thomas Gleixner
Browse files

x86: nmi_32/64.c - use apic_write_around instead of apic_write 



apic_write_around will be expanded to apic_write in 64bit mode
anyway. Only a few CPUs (well, old CPUs to be precise) requires
such an action. In general it should not hurt and could be cleaned
up for apic_write (just in case)

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Cc: hpa@zytor.com
Cc: mingo@redhat.com
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 4b82b277

arch/x86/kernel/nmi_32.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -248,7 +248,7 @@ void acpi_nmi_enable(void) 




static void __acpi_nmi_disable(void *__unused)

static void __acpi_nmi_disable(void *__unused)

{

{

	apic_write(APIC_LVT0, APIC_DM_NMI | APIC_LVT_MASKED);

	apic_write_around(APIC_LVT0, APIC_DM_NMI | APIC_LVT_MASKED);

}

}





/*

/*

arch/x86/kernel/nmi_64.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -215,7 +215,7 @@ late_initcall(init_lapic_nmi_sysfs); 




static void __acpi_nmi_enable(void *__unused)

static void __acpi_nmi_enable(void *__unused)

{

{

	apic_write(APIC_LVT0, APIC_DM_NMI);

	apic_write_around(APIC_LVT0, APIC_DM_NMI);

}

}





/*

/*
@@ -229,7 +229,7 @@ void acpi_nmi_enable(void) 




static void __acpi_nmi_disable(void *__unused)

static void __acpi_nmi_disable(void *__unused)

{

{

	apic_write(APIC_LVT0, APIC_DM_NMI | APIC_LVT_MASKED);

	apic_write_around(APIC_LVT0, APIC_DM_NMI | APIC_LVT_MASKED);

}

}





/*

/*