PERFORCE change 128814 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=128814

Change 128814 by rwatson at rwatson_noisier on 2007/11/08 10:22:10

	Rearrange things a bit and trim BPF_ZERCOPY from GENERIC in branch
	so it's easier to do side-by-side comparisons.

Affected files ...

.. //depot/projects/zcopybpf/src/sys/amd64/conf/GENERIC#8 edit

Differences ...

==== //depot/projects/zcopybpf/src/sys/amd64/conf/GENERIC#8 (text+ko) ====

@@ -28,20 +28,6 @@
 
 options 	SCHED_ULE		# ULE scheduler
 
-options		BPF_ZEROCOPY
-device		hwpmc
-options		HWPMC_HOOKS
-
-options		NULLFS
-# Debugging for use in -current
-options 	KDB			# Enable kernel debugger support.
-options 	DDB			# Support DDB.
-options 	GDB			# Support remote GDB.
-options 	INVARIANTS		# Enable calls of extra sanity checking
-options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
-options 	WITNESS			# Enable checks to detect deadlocks and cycles
-options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
-
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
@@ -78,6 +64,15 @@
 options 	STOP_NMI		# Stop CPUS using NMI instead of IPI
 options 	AUDIT			# Security event auditing
 
+# Debugging for use in -current
+options 	KDB			# Enable kernel debugger support.
+options 	DDB			# Support DDB.
+options 	GDB			# Support remote GDB.
+options 	INVARIANTS		# Enable calls of extra sanity checking
+options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
+options 	WITNESS			# Enable checks to detect deadlocks and cycles
+options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
+
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel
 
@@ -91,7 +86,6 @@
 # Floppy drives
 device		fdc
 
-
 # ATA and ATAPI devices
 device		ata
 device		atadisk		# ATA disk drives