diff options
| author | emaste <emaste@FreeBSD.org> | 2005-10-27 17:22:47 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2005-10-27 17:22:47 +0000 |
| commit | 988b3c4ab8dff790f8050f2bb87b997609121ccf (patch) | |
| tree | 82d383d20ee660c736fe7f6a9904c4a6b458972b /sys/kern/kern_clock.c | |
| parent | 36d533d5436d4b351fc1f691415956afc77d5b12 (diff) | |
| download | FreeBSD-src-988b3c4ab8dff790f8050f2bb87b997609121ccf.zip FreeBSD-src-988b3c4ab8dff790f8050f2bb87b997609121ccf.tar.gz | |
In watchdog_config enable the software watchdog iff the WD_ACTIVE flag is
set. When watchdogd(1) is terminated intentionally it clears the bit,
which should then disable it in the kernel.
PR: kern/74386
Submitted by: Alex Hoff <ahoff at sandvine dot com>
Approved by: phk, rwatson (mentor)
Diffstat (limited to 'sys/kern/kern_clock.c')
| -rw-r--r-- | sys/kern/kern_clock.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 659c903..74862ca 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -541,8 +541,7 @@ watchdog_config(void *unused __unused, u_int cmd, int *err) u_int u; u = cmd & WD_INTERVAL; - if (cmd && u >= WD_TO_1SEC) { - u = cmd & WD_INTERVAL; + if ((cmd & WD_ACTIVE) && u >= WD_TO_1SEC) { watchdog_ticks = (1 << (u - WD_TO_1SEC)) * hz; watchdog_enabled = 1; *err = 0; |
