diff options
| author | Don Zickus <dzickus@redhat.com> | 2010-11-12 11:22:23 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-11-18 09:08:23 +0100 |
| commit | 5f2b0ba4d94b3ac23cbc4b7f675d98eb677a760a (patch) | |
| tree | 32fc744a15b13becdb559963ea982f07ce9a1d37 /include/linux | |
| parent | a89d4bd055718d3b4ddb380ee22951a1300b4096 (diff) | |
| download | linux-stable-5f2b0ba4d94b3ac23cbc4b7f675d98eb677a760a.tar.gz linux-stable-5f2b0ba4d94b3ac23cbc4b7f675d98eb677a760a.tar.bz2 linux-stable-5f2b0ba4d94b3ac23cbc4b7f675d98eb677a760a.zip | |
x86, nmi_watchdog: Remove the old nmi_watchdog
Now that we have a new nmi_watchdog that is more generic and
sits on top of the perf subsystem, we really do not need the old
nmi_watchdog any more.
In addition, the old nmi_watchdog doesn't really work if you are
using the default clocksource, hpet. The old nmi_watchdog code
relied on local apic interrupts to determine if the cpu is still
alive. With hpet as the clocksource, these interrupts don't
increment any more and the old nmi_watchdog triggers false
postives.
This piece removes the old nmi_watchdog code and stubs out any
variables and functions calls. The stubs are the same ones used
by the new nmi_watchdog code, so it should be well tested.
Signed-off-by: Don Zickus <dzickus@redhat.com>
Cc: fweisbec@gmail.com
Cc: gorcunov@openvz.org
LKML-Reference: <1289578944-28564-2-git-send-email-dzickus@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nmi.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/nmi.h b/include/linux/nmi.h index 06aab5eee134..0cb3e5c246d0 100644 --- a/include/linux/nmi.h +++ b/include/linux/nmi.h @@ -16,10 +16,7 @@ */ #ifdef ARCH_HAS_NMI_WATCHDOG #include <asm/nmi.h> -extern void touch_nmi_watchdog(void); -extern void acpi_nmi_disable(void); -extern void acpi_nmi_enable(void); -#else +#endif #ifndef CONFIG_HARDLOCKUP_DETECTOR static inline void touch_nmi_watchdog(void) { @@ -30,7 +27,6 @@ extern void touch_nmi_watchdog(void); #endif static inline void acpi_nmi_disable(void) { } static inline void acpi_nmi_enable(void) { } -#endif /* * Create trigger_all_cpu_backtrace() out of the arch-provided |