Commit aacfbe6a authored by Guenter Roeck's avatar Guenter Roeck Committed by Linus Torvalds
Browse files

kernel/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 should be in linux/nmi.h, not 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.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Cc: Stephane Eranian <eranian@google.com>
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Don Zickus <dzickus@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 314b08ff

arch/x86/kernel/cpu/perf_event_intel.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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 = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE