diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-11 16:14:05 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-11 16:14:05 -0600 |
| commit | 0b002cdd5004c0205364b3be2cfa6aed05c61f42 (patch) | |
| tree | e0b9cee7018e60c7b50f17b48eb505c2a1a6134d /include | |
| parent | e255aee5b66ce4af025e6f77122114c01303b861 (diff) | |
| parent | f26621e60b35369bca9228bc936dc723b3e421af (diff) | |
| download | linux-0b002cdd5004c0205364b3be2cfa6aed05c61f42.tar.bz2 | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core fixes from Thomas Gleixner:
"A couple of fixlets for the core:
- Kernel doc function documentation fixes
- Missing prototypes for weak watchdog functions"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
resource/docs: Complete kernel-doc style function documentation
watchdog/core: Add missing prototypes for weak functions
resource/docs: Fix new kernel-doc warnings
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nmi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/nmi.h b/include/linux/nmi.h index 08f9247e9827..9003e29cde46 100644 --- a/include/linux/nmi.h +++ b/include/linux/nmi.h @@ -119,6 +119,8 @@ static inline int hardlockup_detector_perf_init(void) { return 0; } void watchdog_nmi_stop(void); void watchdog_nmi_start(void); int watchdog_nmi_probe(void); +int watchdog_nmi_enable(unsigned int cpu); +void watchdog_nmi_disable(unsigned int cpu); /** * touch_nmi_watchdog - restart NMI watchdog timeout. |