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: Cyrill Gorcunov <gorcunov@gmail.com> Cc: hpa@zytor.com Cc: mingo@redhat.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
git-mirror · May 25, 2008 · ad63ba1 · ad63ba1
1 parent 4b82b27
commit ad63ba1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/arch/x86/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c
@@ -248,7 +248,7 @@ void acpi_nmi_enable(void)
 
 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);
 }
 
 /*

diff --git a/arch/x86/kernel/nmi_64.c b/arch/x86/kernel/nmi_64.c
@@ -215,7 +215,7 @@ late_initcall(init_lapic_nmi_sysfs);
 
 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)
 {
-	apic_write(APIC_LVT0, APIC_DM_NMI | APIC_LVT_MASKED);
+	apic_write_around(APIC_LVT0, APIC_DM_NMI | APIC_LVT_MASKED);
 }
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -248,7 +248,7 @@ void acpi_nmi_enable(void) @@
     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);
     }
     /*
@@ Expand Down @@