watchdog: Move NMI function header declarations from watchdog.h to nmi.h
Subsystems (3)
Guenter Roeck
maintainerPATCH v2 1/1 watchdog: Move NMI function header declarations from watchdog.h to nmi.h
The kernel's NMI watchdog has nothing to do with the watchdog subsystem. Its header declarations are in linux/nmi.h, not in linux/watchdog.h.
The code provided two sets of dummy functions if HARDLOCKUP_DETECTOR is not configured, one in the include file and one in kernel/watchdog.c. Remove the dummy functions from kernel/watchdog.c and use those from the include file.
Cc Stephane Eranian <[email protected]>
Cc Peter Zijlstra (Intel) <[email protected]>
Cc Ingo Molnar <[email protected]>
Signed-off-by Guenter Roeck <[email protected]>
---
v2: Remove duplicate dummy functions from kernel/watchdog.c.
arch/x86/kernel/cpu/perf_event_intel.c | 2 +- include/linux/nmi.h | 8 +++++--- include/linux/watchdog.h | 8 -------- kernel/watchdog.c | 2 -- 4 files changed, 6 insertions(+), 14 deletions(-)
arch/x86/kernel/cpu/perf_event_intel.c +1 -1
@@ -12,7 +12,7 @@#include <linux/init.h> #include <linux/slab.h> #include <linux/export.h> -#include <linux/watchdog.h> +#include <linux/nmi.h> #include <asm/cpufeature.h> #include <asm/hardirq.h>
include/linux/nmi.h +5 -3
@@ -26,10 +26,12 @@ static inline void touch_nmi_watchdog(void)#if defined(CONFIG_HARDLOCKUP_DETECTOR )extern void hardlockup_detector_disable (void ); +void watchdog_nmi_disable_all (void ); +void watchdog_nmi_enable_all (void );#else -static inline void hardlockup_detector_disable (void ) -{ -} +static inline void hardlockup_detector_disable (void ) {} +static inline void watchdog_nmi_disable_all (void ) {} +static inline void watchdog_nmi_enable_all (void ) {}#endif /*
include/linux/watchdog.h +0 -8
@@ -140,12 +140,4 @@ extern int watchdog_init_timeout(struct watchdog_device *wdd,extern int watchdog_register_device (struct watchdog_device *);extern void watchdog_unregister_device (struct watchdog_device *); -#ifdef CONFIG_HARDLOCKUP_DETECTOR -void watchdog_nmi_disable_all (void ); -void watchdog_nmi_enable_all (void ); -#else -static inline void watchdog_nmi_disable_all (void ) {} -static inline void watchdog_nmi_enable_all (void ) {} -#endif -#endif /* ifndef _LINUX_WATCHDOG_H */
kernel/watchdog.c +0 -2
@@ -651,8 +651,6 @@ unlock:#else static int watchdog_nmi_enable (unsigned int cpu) {return 0 ; }static void watchdog_nmi_disable (unsigned int cpu) {return ; } -void watchdog_nmi_enable_all (void ) {} -void watchdog_nmi_disable_all (void ) {}#endif /* CONFIG_HARDLOCKUP_DETECTOR */ static struct smp_hotplug_thread watchdog_threads = {
Signature · 1 line
2.1.4