Date: Thu, 4 Nov 2010 17:23:07 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r214790 - stable/7/sys/kern Message-ID: <201011041723.oA4HN7ji066961@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb Date: Thu Nov 4 17:23:06 2010 New Revision: 214790 URL: http://svn.freebsd.org/changeset/base/214790 Log: MFC 214449: Set bootverbose directly in mi_startup() rather than via a SYSINIT. This ensures 'bootverbose' is in a valid state for all SYSINITs. Modified: stable/7/sys/kern/init_main.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/kern/init_main.c ============================================================================== --- stable/7/sys/kern/init_main.c Thu Nov 4 17:22:49 2010 (r214789) +++ stable/7/sys/kern/init_main.c Thu Nov 4 17:23:06 2010 (r214790) @@ -178,6 +178,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); @@ -325,15 +328,6 @@ SYSINIT(diagwarn2, SI_SUB_RUN_SCHEDULER, 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); - struct sysentvec null_sysvec = { .sv_size = 0, .sv_table = NULL,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011041723.oA4HN7ji066961>