diff options
| author | jhb <jhb@FreeBSD.org> | 2010-10-28 14:17:06 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2010-10-28 14:17:06 +0000 |
| commit | 3f3b4d105fe6c50c3a1b03e2ba454374588f6c5f (patch) | |
| tree | 9642cbcf9e4ae07792e481db32524fd3a484e4d2 | |
| parent | c1f742a56c9fe101befff8999d74d447dfc9d72f (diff) | |
| download | FreeBSD-src-3f3b4d105fe6c50c3a1b03e2ba454374588f6c5f.zip FreeBSD-src-3f3b4d105fe6c50c3a1b03e2ba454374588f6c5f.tar.gz | |
Set bootverbose directly in mi_startup() rather than via a SYSINIT. This
ensures 'bootverbose' is in a valid state for all SYSINITs.
Reported by: avg
MFC after: 1 week
| -rw-r--r-- | sys/kern/init_main.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index d697689..b86ea91 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -180,6 +180,9 @@ mi_startup(void) int verbose; #endif + if (boothowto & RB_VERBOSE) + bootverbose++; + if (sysinit == NULL) { sysinit = SET_BEGIN(sysinit_set); sysinit_end = SET_LIMIT(sysinit_set); @@ -327,15 +330,6 @@ SYSINIT(diagwarn2, SI_SUB_RUN_SCHEDULER, SI_ORDER_THIRD + 2, print_caddr_t, diag_warn); #endif -static void -set_boot_verbose(void *data __unused) -{ - - if (boothowto & RB_VERBOSE) - bootverbose++; -} -SYSINIT(boot_verbose, SI_SUB_TUNABLES, SI_ORDER_ANY, set_boot_verbose, NULL); - static int null_fetch_syscall_args(struct thread *td __unused, struct syscall_args *sa __unused) |
