From f689e2ed2624ee23550e13acdeb525b04cf3a847 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Sat, 24 May 2008 19:36:36 +0400
Subject: [PATCH] --- yaml --- r: 99807 b: refs/heads/master c:
 ad63ba169d45ccb6594eb35a6c31c421fe70ff45 h: refs/heads/master i:   99805:
 d4e43c2199382472bf3de0c6ff70404815ff5019   99803:
 0e2ef83a87448057369eedec2cc34ea2f7d11648   99799:
 ded8cbd8fd0065cb14fc7913fddc5d2c62eaafb5   99791:
 823b0dae6a67bf12f28572f5d546502cc19f0020   99775:
 8526bb5be9aa32da2672f24843a12776957ed898 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/kernel/nmi_32.c | 2 +-
 trunk/arch/x86/kernel/nmi_64.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 89c3393c305b..b9e750e96551 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b82b277707a39b97271439c475f186f63ec4692
+refs/heads/master: ad63ba169d45ccb6594eb35a6c31c421fe70ff45
diff --git a/trunk/arch/x86/kernel/nmi_32.c b/trunk/arch/x86/kernel/nmi_32.c
index 7714e8478213..ec5842b4dd68 100644
--- a/trunk/arch/x86/kernel/nmi_32.c
+++ b/trunk/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/trunk/arch/x86/kernel/nmi_64.c b/trunk/arch/x86/kernel/nmi_64.c
index c1ea671525e5..f546e3164a74 100644
--- a/trunk/arch/x86/kernel/nmi_64.c
+++ b/trunk/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);
 }
 
 /*