summaryrefslogtreecommitdiff
path: root/include/linux/nmi.h
diff options
context:
space:
mode:
authorUlrich Obergfell <uobergfe@redhat.com>2015-04-15 01:44:19 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-15 02:48:59 +0300
commit692297d8f96887f836d9049a653ed05a71cf48fb (patch)
tree1c19271d875a54dfbdb74bc35d4f386dbc20dc63 /include/linux/nmi.h
parentb2f57c3a0df9d168220be8848a303a32ef4d2e7d (diff)
downloadlinux-692297d8f96887f836d9049a653ed05a71cf48fb.tar.xz
watchdog: introduce the hardlockup_detector_disable() function
Have kvm_guest_init() use hardlockup_detector_disable() instead of watchdog_enable_hardlockup_detector(false). Remove the watchdog_hardlockup_detector_is_enabled() and the watchdog_enable_hardlockup_detector() function which are no longer needed. Signed-off-by: Ulrich Obergfell <uobergfe@redhat.com> Signed-off-by: Don Zickus <dzickus@redhat.com> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/nmi.h')
-rw-r--r--include/linux/nmi.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index 0426357297d5..3d46fb4708e0 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -25,16 +25,11 @@ static inline void touch_nmi_watchdog(void)
#endif
#if defined(CONFIG_HARDLOCKUP_DETECTOR)
-extern void watchdog_enable_hardlockup_detector(bool val);
-extern bool watchdog_hardlockup_detector_is_enabled(void);
+extern void hardlockup_detector_disable(void);
#else
-static inline void watchdog_enable_hardlockup_detector(bool val)
+static inline void hardlockup_detector_disable(void)
{
}
-static inline bool watchdog_hardlockup_detector_is_enabled(void)
-{
- return true;
-}
#endif
/*