From owner-p4-projects@FreeBSD.ORG Thu Nov 8 10:23:10 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCD0E16A468; Thu, 8 Nov 2007 10:23:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3452816A418 for ; Thu, 8 Nov 2007 10:23:09 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 15EFB13C481 for ; Thu, 8 Nov 2007 10:23:09 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA8AN9KR021549 for ; Thu, 8 Nov 2007 10:23:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA8AN9Sn021546 for perforce@freebsd.org; Thu, 8 Nov 2007 10:23:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 8 Nov 2007 10:23:09 GMT Message-Id: <200711081023.lA8AN9Sn021546@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 128814 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Nov 2007 10:23:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=128814 Change 128814 by rwatson@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