Commit 5587185d authored by Thomas Gleixner's avatar Thomas Gleixner

watchdog/core: Rename some softlockup_* functions

The function names made sense up to the point where the watchdog
(re)configuration was unified to use softlockup_reconfigure_threads() for
all configuration purposes. But that includes scenarios which solely
configure the nmi watchdog.

Rename softlockup_reconfigure_threads() and softlockup_init_threads() so
the function names match the functionality.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Linus Torvalds <torvalds@linuxfoundation.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Don Zickus <dzickus@redhat.com>
parent 34ddaa3e
...@@ -551,7 +551,7 @@ static void softlockup_unpark_threads(void) ...@@ -551,7 +551,7 @@ static void softlockup_unpark_threads(void)
softlockup_update_smpboot_threads(); softlockup_update_smpboot_threads();
} }
static void softlockup_reconfigure_threads(void) static void lockup_detector_reconfigure(void)
{ {
cpus_read_lock(); cpus_read_lock();
watchdog_nmi_stop(); watchdog_nmi_stop();
...@@ -570,13 +570,13 @@ static void softlockup_reconfigure_threads(void) ...@@ -570,13 +570,13 @@ static void softlockup_reconfigure_threads(void)
} }
/* /*
* Create the watchdog thread infrastructure. * Create the watchdog thread infrastructure and configure the detector(s).
* *
* The threads are not unparked as watchdog_allowed_mask is empty. When * The threads are not unparked as watchdog_allowed_mask is empty. When
* the threads are sucessfully initialized, take the proper locks and * the threads are sucessfully initialized, take the proper locks and
* unpark the threads in the watchdog_cpumask if the watchdog is enabled. * unpark the threads in the watchdog_cpumask if the watchdog is enabled.
*/ */
static __init void softlockup_init_threads(void) static __init void lockup_detector_setup(void)
{ {
int ret; int ret;
...@@ -599,7 +599,7 @@ static __init void softlockup_init_threads(void) ...@@ -599,7 +599,7 @@ static __init void softlockup_init_threads(void)
mutex_lock(&watchdog_mutex); mutex_lock(&watchdog_mutex);
softlockup_threads_initialized = true; softlockup_threads_initialized = true;
softlockup_reconfigure_threads(); lockup_detector_reconfigure();
mutex_unlock(&watchdog_mutex); mutex_unlock(&watchdog_mutex);
} }
...@@ -608,7 +608,7 @@ static inline int watchdog_park_threads(void) { return 0; } ...@@ -608,7 +608,7 @@ static inline int watchdog_park_threads(void) { return 0; }
static inline void watchdog_unpark_threads(void) { } static inline void watchdog_unpark_threads(void) { }
static inline int watchdog_enable_all_cpus(void) { return 0; } static inline int watchdog_enable_all_cpus(void) { return 0; }
static inline void watchdog_disable_all_cpus(void) { } static inline void watchdog_disable_all_cpus(void) { }
static void softlockup_reconfigure_threads(void) static void lockup_detector_reconfigure(void)
{ {
cpus_read_lock(); cpus_read_lock();
watchdog_nmi_stop(); watchdog_nmi_stop();
...@@ -616,9 +616,9 @@ static void softlockup_reconfigure_threads(void) ...@@ -616,9 +616,9 @@ static void softlockup_reconfigure_threads(void)
watchdog_nmi_start(); watchdog_nmi_start();
cpus_read_unlock(); cpus_read_unlock();
} }
static inline void softlockup_init_threads(void) static inline void lockup_detector_setup(void)
{ {
softlockup_reconfigure_threads(); lockup_detector_reconfigure();
} }
#endif /* !CONFIG_SOFTLOCKUP_DETECTOR */ #endif /* !CONFIG_SOFTLOCKUP_DETECTOR */
...@@ -658,7 +658,7 @@ static void proc_watchdog_update(void) ...@@ -658,7 +658,7 @@ static void proc_watchdog_update(void)
{ {
/* Remove impossible cpus to keep sysctl output clean. */ /* Remove impossible cpus to keep sysctl output clean. */
cpumask_and(&watchdog_cpumask, &watchdog_cpumask, cpu_possible_mask); cpumask_and(&watchdog_cpumask, &watchdog_cpumask, cpu_possible_mask);
softlockup_reconfigure_threads(); lockup_detector_reconfigure();
} }
/* /*
...@@ -785,5 +785,5 @@ void __init lockup_detector_init(void) ...@@ -785,5 +785,5 @@ void __init lockup_detector_init(void)
if (!watchdog_nmi_probe()) if (!watchdog_nmi_probe())
nmi_watchdog_available = true; nmi_watchdog_available = true;
softlockup_init_threads(); lockup_detector_setup();
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment