diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-11-08 11:19:07 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-08 11:19:07 -0800 |
| commit | a97a6be4ded3ba9fe4aea96fe6ed747612e9732f (patch) | |
| tree | 4ca3e6fd0e65cb7b6853bb3e3ba65d1d9bd6ec59 /include/linux | |
| parent | 5a1e6a8dbf21e76ffb45f480eea21ab04bc2cce6 (diff) | |
| parent | af04b3a2bad55cbe37b013a41469fabecbf5636f (diff) | |
Merge "sched: Ensure watchdog is enabled before disabling"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sched.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index f8aa9992a694..4f6711f31939 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -446,6 +446,7 @@ extern unsigned int hardlockup_panic; void lockup_detector_init(void); extern void watchdog_enable(unsigned int cpu); extern void watchdog_disable(unsigned int cpu); +extern bool watchdog_configured(unsigned int cpu); #else static inline void touch_softlockup_watchdog_sched(void) { @@ -468,6 +469,14 @@ static inline void watchdog_enable(unsigned int cpu) static inline void watchdog_disable(unsigned int cpu) { } +static inline bool watchdog_configured(unsigned int cpu) +{ + /* + * Predend the watchdog is always configured. + * We will be waiting for the watchdog to be enabled in core isolation + */ + return true; +} #endif #ifdef CONFIG_DETECT_HUNG_TASK |