diff options
| author | dim <dim@FreeBSD.org> | 2015-02-05 22:34:29 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-02-05 22:34:29 +0000 |
| commit | d2b9c88b24f95cd9f8e7bd621cfa454ce759c687 (patch) | |
| tree | f694c1cf8b05138d26e736cf19e8c23cb6cfa832 /sys/kern | |
| parent | bd558a3f75de913bd9b0752eb936f1ce14a5e117 (diff) | |
| parent | 49ba8ceb19505a0e0d49b2b436526bf135193ef9 (diff) | |
| download | FreeBSD-src-d2b9c88b24f95cd9f8e7bd621cfa454ce759c687.zip FreeBSD-src-d2b9c88b24f95cd9f8e7bd621cfa454ce759c687.tar.gz | |
Merging ^/head r278224 through r278297.
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/init_main.c | 1 | ||||
| -rw-r--r-- | sys/kern/kern_clock.c | 5 | ||||
| -rw-r--r-- | sys/kern/subr_bus.c | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index beb49bc..0cab45b 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_init_path.h" +#include "opt_verbose_sysinit.h" #include <sys/param.h> #include <sys/kernel.h> diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 6aa3523..fdf2271 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -410,6 +410,11 @@ initclocks(dummy) #ifdef SW_WATCHDOG EVENTHANDLER_REGISTER(watchdog_list, watchdog_config, NULL, 0); #endif + /* + * Arrange for ticks to wrap 10 minutes after boot to help catch + * sign problems sooner. + */ + ticks = INT_MAX - (hz * 10 * 60); } /* diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 7f91645..a875e4b 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -3653,7 +3653,7 @@ bus_generic_suspend_child(device_t dev, device_t child) error = DEVICE_SUSPEND(child); if (error == 0) - dev->flags |= DF_SUSPENDED; + child->flags |= DF_SUSPENDED; return (error); } @@ -3668,7 +3668,7 @@ bus_generic_resume_child(device_t dev, device_t child) { DEVICE_RESUME(child); - dev->flags &= ~DF_SUSPENDED; + child->flags &= ~DF_SUSPENDED; return (0); } |
