svn commit: r192947 - user/kmacy/releng_7_2_fcs/sys/amd64/conf

[Kip Macy]

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