linux-kernel - [trivial PATCH] fix typo in nmi.c of apic

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 11 Sep 2009 14:03:26 +0800
From:	Luming Yu <luming.yu@...il.com>
To:	LKML <linux-kernel@...r.kernel.org>
Subject: [trivial PATCH] fix typo in nmi.c of apic

Hi there,

I came across x86/kernel/apic/nmi.c and found several typo.
It's trivial in terms of doing nothing on changing execution logic.

Please review. If make sense, please apply.

Ps. The patch is enclosed in attachment. The inline one
is c&p of it for reading.


Thanks,
Luming

Signed-off-by: Yu Luming <luming.yu@...el.com>

 nmi.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/x86/kernel/apic/nmi.c b/arch/x86/kernel/apic/nmi.c
index b3025b4..9ff1f6d 100644
--- a/arch/x86/kernel/apic/nmi.c
+++ b/arch/x86/kernel/apic/nmi.c
@@ -121,7 +121,7 @@ static void report_broken_nmi(int cpu, unsigned
int *prev_nmi_count)
 	atomic_dec(&nmi_active);
 }

-static void __acpi_nmi_disable(void *__unused)
+static void __apic_nmi_disable(void *__unused)
 {
 	apic_write(APIC_LVT0, APIC_DM_NMI | APIC_LVT_MASKED);
 }
@@ -178,7 +178,7 @@ error:
 	if (nmi_watchdog == NMI_IO_APIC) {
 		if (!timer_through_8259)
 			disable_8259A_irq(0);
-		on_each_cpu(__acpi_nmi_disable, NULL, 1);
+		on_each_cpu(__apic_nmi_disable, NULL, 1);
 	}

 #ifdef CONFIG_X86_32
@@ -276,7 +276,7 @@ late_initcall(init_lapic_nmi_sysfs);

 #endif	/* CONFIG_PM */

-static void __acpi_nmi_enable(void *__unused)
+static void __apic_nmi_enable(void *__unused)
 {
 	apic_write(APIC_LVT0, APIC_DM_NMI);
 }
@@ -284,19 +284,19 @@ static void __acpi_nmi_enable(void *__unused)
 /*
  * Enable timer based NMIs on all CPUs:
  */
-void acpi_nmi_enable(void)
+void apic_nmi_enable(void)
 {
 	if (atomic_read(&nmi_active) && nmi_watchdog == NMI_IO_APIC)
-		on_each_cpu(__acpi_nmi_enable, NULL, 1);
+		on_each_cpu(__apic_nmi_enable, NULL, 1);
 }

 /*
  * Disable timer based NMIs on all CPUs:
  */
-void acpi_nmi_disable(void)
+void apic_nmi_disable(void)
 {
 	if (atomic_read(&nmi_active) && nmi_watchdog == NMI_IO_APIC)
-		on_each_cpu(__acpi_nmi_disable, NULL, 1);
+		on_each_cpu(__apic_nmi_disable, NULL, 1);
 }

 /*
@@ -341,7 +341,7 @@ void stop_apic_nmi_watchdog(void *unused)
 	if (nmi_watchdog == NMI_LOCAL_APIC)
 		lapic_watchdog_stop();
 	else
-		__acpi_nmi_disable(NULL);
+		__apic_nmi_disable(NULL);
 	__get_cpu_var(wd_enabled) = 0;
 	atomic_dec(&nmi_active);
 }
@@ -472,7 +472,7 @@ static void enable_ioapic_nmi_watchdog_single(void *unused)
 {
 	__get_cpu_var(wd_enabled) = 1;
 	atomic_inc(&nmi_active);
-	__acpi_nmi_enable(NULL);
+	__apic_nmi_enable(NULL);
 }

 static void enable_ioapic_nmi_watchdog(void)

Download attachment "9.patch" of type "application/octet-stream" (2012 bytes)