diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-06 11:39:13 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-06 11:39:13 +0300 |
| commit | 17fa87fe5a5141d3c082c5c91e950aca9e0ec701 (patch) | |
| tree | 5aea2ff6b9b16b49585684c5f2ce404fe444a9ba /include/linux/nmi.h | |
| parent | 3b28f4f2c2c7fcb6770cdfe5e8cd284ee1bc9783 (diff) | |
| parent | d5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c (diff) | |
| download | linux-17fa87fe5a5141d3c082c5c91e950aca9e0ec701.tar.xz | |
Merge 4.10-rc7 into char-misc-next
We want the hv and other fixes in here as well to handle merge and
testing issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/nmi.h')
| -rw-r--r-- | include/linux/nmi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/nmi.h b/include/linux/nmi.h index aacca824a6ae..0a3fadc32693 100644 --- a/include/linux/nmi.h +++ b/include/linux/nmi.h @@ -110,6 +110,7 @@ extern int watchdog_user_enabled; extern int watchdog_thresh; extern unsigned long watchdog_enabled; extern unsigned long *watchdog_cpumask_bits; +extern atomic_t watchdog_park_in_progress; #ifdef CONFIG_SMP extern int sysctl_softlockup_all_cpu_backtrace; extern int sysctl_hardlockup_all_cpu_backtrace; |