---

yaml --- r: 99807 b: refs/heads/master c: ad63ba1 h: refs/heads/master i: 99805: d4e43c2 99803: 0e2ef83 99799: ded8cbd 99791: 823b0da 99775: 8526bb5 v: v3
git-mirror · May 25, 2008 · f689e2e · f689e2e
1 parent a6bc3f6
commit f689e2e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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 @@