diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-20 06:17:52 +0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-20 06:17:52 +0400 |
| commit | 4cb40f795af36b3deb743f6ccf6c3fd542c61c8d (patch) | |
| tree | db3d7519932549bf528f5b8e4cb8350356cd544d /arch/x86/kernel/nmi.c | |
| parent | 79ed2a9216dd3cc35c4f2c5dbaddadb195af83ac (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
| download | linux-4cb40f795af36b3deb743f6ccf6c3fd542c61c8d.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/kernel-parameters.txt
arch/sh/include/asm/elf.h
Diffstat (limited to 'arch/x86/kernel/nmi.c')
| -rw-r--r-- | arch/x86/kernel/nmi.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c index abb78a2cc4ad..2c97f07f1c2c 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c @@ -299,6 +299,15 @@ void acpi_nmi_disable(void) on_each_cpu(__acpi_nmi_disable, NULL, 1); } +/* + * This function is called as soon the LAPIC NMI watchdog driver has everything + * in place and it's ready to check if the NMIs belong to the NMI watchdog + */ +void cpu_nmi_set_wd_enabled(void) +{ + __get_cpu_var(wd_enabled) = 1; +} + void setup_apic_nmi_watchdog(void *unused) { if (__get_cpu_var(wd_enabled)) @@ -311,8 +320,6 @@ void setup_apic_nmi_watchdog(void *unused) switch (nmi_watchdog) { case NMI_LOCAL_APIC: - /* enable it before to avoid race with handler */ - __get_cpu_var(wd_enabled) = 1; if (lapic_watchdog_init(nmi_hz) < 0) { __get_cpu_var(wd_enabled) = 0; return; |