A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 03:27:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

watchdog/core, powerpc: Replace watchdog_nmi_reconfigure()

Browse source 
The recent cleanup of the watchdog code split watchdog_nmi_reconfigure()
into two stages. One to stop the NMI and one to restart it after
reconfiguration. That was done by adding a boolean 'run' argument to the
code, which is functionally correct but not necessarily a piece of art.

Replace it by two explicit functions: watchdog_nmi_stop() and
watchdog_nmi_start().

Fixes: 6592ad2fcc ("watchdog/core, powerpc: Make watchdog_nmi_reconfigure() two stage")
Requested-by: Linus 'Nursing his pet-peeve' Torvalds <[email protected]>
Signed-off-by: Thomas 'Mopping up garbage' Gleixner <[email protected]>
Acked-by: Michael Ellerman <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Don Zickus <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Nicholas Piggin <[email protected]>
Cc: [email protected]
Link: http://lkml.kernel.org/r/alpine.DEB.2.20.1710021957480.2114@nanos
This commit is contained in:
Thomas Gleixner 2017-10-02 12:34:50 +02:00
commit 6b9dc4806b
3 changed files with 34 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

33
kernel/watchdog.c
View file

@ -123,24 +123,27 @@ int __weak __init watchdog_nmi_probe(void)
}
/**
* watchdog_nmi_reconfigure - Optional function to reconfigure NMI watchdogs
* @run: If false stop the watchdogs on all enabled CPUs
* If true start the watchdogs on all enabled CPUs
* watchdog_nmi_stop - Stop the watchdog for reconfiguration
*
* The core call order is:
* watchdog_nmi_reconfigure(false);
* The reconfiguration steps are:
* watchdog_nmi_stop();
* update_variables();
* watchdog_nmi_reconfigure(true);
* watchdog_nmi_start();
*/
void __weak watchdog_nmi_stop(void) { }
/**
* watchdog_nmi_start - Start the watchdog after reconfiguration
*
* The second call which starts the watchdogs again guarantees that the
* following variables are stable across the call.
* Counterpart to watchdog_nmi_stop().
*
* The following variables have been updated in update_variables() and
* contain the currently valid configuration:
* - watchdog_enabled
* - watchdog_thresh
* - watchdog_cpumask
*
* After the call the variables can be changed again.
*/
void __weak watchdog_nmi_reconfigure(bool run) { }
void __weak watchdog_nmi_start(void) { }
/**
* lockup_detector_update_enable - Update the sysctl enable bit
@ -551,13 +554,13 @@ static void softlockup_unpark_threads(void)
static void softlockup_reconfigure_threads(void)
{
watchdog_nmi_reconfigure(false);
watchdog_nmi_stop();
softlockup_park_all_threads();
set_sample_period();
lockup_detector_update_enable();
if (watchdog_enabled && watchdog_thresh)
softlockup_unpark_threads();
watchdog_nmi_reconfigure(true);
watchdog_nmi_start();
}
/*
@ -602,9 +605,9 @@ static inline void watchdog_disable_all_cpus(void) { }
static inline void softlockup_init_threads(void) { }
static void softlockup_reconfigure_threads(void)
{
watchdog_nmi_reconfigure(false);
watchdog_nmi_stop();
lockup_detector_update_enable();
watchdog_nmi_reconfigure(true);
watchdog_nmi_start();
}
#endif /* !CONFIG_SOFTLOCKUP_DETECTOR */