From owner-svn-src-user@FreeBSD.ORG  Thu May 28 00:52:09 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 802351065743;
	Thu, 28 May 2009 00:52:09 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6E6998FC16;
	Thu, 28 May 2009 00:52:09 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4S0q9Sk017520;
	Thu, 28 May 2009 00:52:09 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4S0q9hO017518;
	Thu, 28 May 2009 00:52:09 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200905280052.n4S0q9hO017518@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Thu, 28 May 2009 00:52:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192947 - user/kmacy/releng_7_2_fcs/sys/amd64/conf
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 May 2009 00:52:09 -0000

Author: kmacy
Date: Thu May 28 00:52:09 2009
New Revision: 192947
URL: http://svn.freebsd.org/changeset/base/192947

Log:
  add ZFS to stock compile
  
  add HWPMC_HOOKS to debug

Modified:
  user/kmacy/releng_7_2_fcs/sys/amd64/conf/GENERIC
  user/kmacy/releng_7_2_fcs/sys/amd64/conf/GENERIC_MINUS

Modified: user/kmacy/releng_7_2_fcs/sys/amd64/conf/GENERIC
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/amd64/conf/GENERIC	Thu May 28 00:47:50 2009	(r192946)
+++ user/kmacy/releng_7_2_fcs/sys/amd64/conf/GENERIC	Thu May 28 00:52:09 2009	(r192947)
@@ -27,6 +27,10 @@ ident		GENERIC
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 makeoptions	MODULES_OVERRIDE="mxge zlib geom opensolaris zfs cxgb fxp nfe hwpmc linux linprocfs"
 
+makeoptions	OPENSOLARIS
+options		OPENSOLARIS
+options		ZFS
+
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking

Modified: user/kmacy/releng_7_2_fcs/sys/amd64/conf/GENERIC_MINUS
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/amd64/conf/GENERIC_MINUS	Thu May 28 00:47:50 2009	(r192946)
+++ user/kmacy/releng_7_2_fcs/sys/amd64/conf/GENERIC_MINUS	Thu May 28 00:52:09 2009	(r192947)
@@ -27,6 +27,10 @@ ident		GENERIC
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 makeoptions	MODULES_OVERRIDE="opensolaris zfs zlib mxge geom hwpmc linux linprocfs"
 
+makeoptions	OPENSOLARIS
+options		OPENSOLARIS
+options		ZFS
+
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
@@ -78,6 +82,7 @@ options		DEBUG
 options		KDB
 options		DDB
 options		ALT_BREAK_TO_DEBUGGER
+options		HWPMC_HOOKS
 
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel