svn commit: r278238 - in head/sys: conf kern

[John-Mark Gurney]

Author: jmg
Date: Thu Feb  5 07:51:38 2015
New Revision: 278238
URL: https://svnweb.freebsd.org/changeset/base/278238

Log:
  turn GEOM_UNCOMPRESS_DEBUG into a proper option so it can be specified
  in kernel config files..
  
  put VERBOSE_SYSINIT in it's own option header so the one file,
  init_main.c, can use it instead of requiring an entire kernel recompile
  to change one file..

Modified:
  head/sys/conf/options
  head/sys/kern/init_main.c

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Thu Feb  5 07:46:34 2015	(r278237)
+++ head/sys/conf/options	Thu Feb  5 07:51:38 2015	(r278238)
@@ -129,6 +129,7 @@ GEOM_SHSEC	opt_geom.h
 GEOM_STRIPE	opt_geom.h
 GEOM_SUNLABEL	opt_geom.h
 GEOM_UNCOMPRESS	opt_geom.h
+GEOM_UNCOMPRESS_DEBUG	opt_geom.h
 GEOM_UZIP	opt_geom.h
 GEOM_VINUM	opt_geom.h
 GEOM_VIRSTOR	opt_geom.h
@@ -209,7 +210,7 @@ SW_WATCHDOG	opt_watchdog.h
 TURNSTILE_PROFILING
 UMTX_PROFILING
 VFS_AIO
-VERBOSE_SYSINIT	opt_global.h
+VERBOSE_SYSINIT
 WLCACHE		opt_wavelan.h
 WLDEBUG		opt_wavelan.h
 

Modified: head/sys/kern/init_main.c
==============================================================================
--- head/sys/kern/init_main.c	Thu Feb  5 07:46:34 2015	(r278237)
+++ head/sys/kern/init_main.c	Thu Feb  5 07:51:38 2015	(r278238)
@@ -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>