From owner-svn-src-head@FreeBSD.ORG  Thu Feb  5 07:51:40 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 364B2B16;
 Thu,  5 Feb 2015 07:51:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 222DF97;
 Thu,  5 Feb 2015 07:51:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t157peg9064380;
 Thu, 5 Feb 2015 07:51:40 GMT (envelope-from jmg@FreeBSD.org)
Received: (from jmg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t157pd1K064377;
 Thu, 5 Feb 2015 07:51:39 GMT (envelope-from jmg@FreeBSD.org)
Message-Id: <201502050751.t157pd1K064377@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jmg set sender to jmg@FreeBSD.org
 using -f
From: John-Mark Gurney <jmg@FreeBSD.org>
Date: Thu, 5 Feb 2015 07:51:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r278238 - in head/sys: conf kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Feb 2015 07:51:40 -0000

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>