From: Luming Yu <luming.yu@gmail.com>
To: LKML <linux-kernel@vger.kernel.org>
Subject: [trivial PATCH] fix typo in nmi.c of apic
Date: Fri, 11 Sep 2009 14:03:26 +0800 [thread overview]
Message-ID: <3877989d0909102303m31066b01he38e8a295995c430@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 2421 bytes --]
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@intel.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)
[-- Attachment #2: 9.patch --]
[-- Type: application/octet-stream, Size: 2012 bytes --]
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)
next reply other threads:[~2009-09-11 6:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-11 6:03 Luming Yu [this message]
2009-09-11 16:27 ` Maciej W. Rozycki
2009-10-09 15:07 ` Jiri Kosina
2009-10-12 20:26 ` Ingo Molnar
2009-10-12 22:37 ` Jiri Kosina
2009-10-13 7:18 ` Ingo Molnar
2009-10-27 3:50 ` Luming Yu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3877989d0909102303m31066b01he38e8a295995c430@mail.gmail.com \
--to=luming.yu@gmail.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®