From owner-p4-projects@FreeBSD.ORG Sun Feb 27 05:11:36 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B71AF16A4D0; Sun, 27 Feb 2005 05:11:35 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8814716A4CE for ; Sun, 27 Feb 2005 05:11:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F37243D60 for ; Sun, 27 Feb 2005 05:11:35 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1R5BZhb063381 for ; Sun, 27 Feb 2005 05:11:35 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1R5BZSr063378 for perforce@freebsd.org; Sun, 27 Feb 2005 05:11:35 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Feb 2005 05:11:35 GMT Message-Id: <200502270511.j1R5BZSr063378@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 71960 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Feb 2005 05:11:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=71960 Change 71960 by davidxu@davidxu_tiger on 2005/02/27 05:11:29 Now, libthread is the first library to support __thread on IA64! Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/arch/ia64/ia64/pthread_md.c#5 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/ia64/ia64/pthread_md.c#5 (text+ko) ==== @@ -30,6 +30,7 @@ #include #include #include + #include "rtld_tls.h" #include "pthread_md.h" @@ -46,27 +47,14 @@ oldtls = _tp; else oldtls = NULL; - -#if 1 - if ((tcb = malloc(sizeof(struct tcb))) != NULL) { - memset(tcb, 0, sizeof(struct tcb)); - tcb->tcb_thread = thread; - } -#else tcb = _rtld_allocate_tls(oldtls, sizeof(struct tcb), 16); - if (tcb) { + if (tcb) tcb->tcb_thread = thread; - } -#endif return (tcb); } void _tcb_dtor(struct tcb *tcb) { -#if 1 - free(tcb); -#else _rtld_free_tls(tcb, sizeof(tcb), 16); -#endif } From owner-p4-projects@FreeBSD.ORG Sun Feb 27 05:15:41 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C44316A4D0; Sun, 27 Feb 2005 05:15:41 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0162116A4CE for ; Sun, 27 Feb 2005 05:15:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C833E43D1D for ; Sun, 27 Feb 2005 05:15:40 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1R5FeQr063603 for ; Sun, 27 Feb 2005 05:15:40 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1R5FeCq063600 for perforce@freebsd.org; Sun, 27 Feb 2005 05:15:40 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Feb 2005 05:15:40 GMT Message-Id: <200502270515.j1R5FeCq063600@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 71961 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Feb 2005 05:15:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=71961 Change 71961 by davidxu@davidxu_tiger on 2005/02/27 05:15:01 Use _rtld_allocate_tls and _rtld_free_tls to allocate and free tcb, this is needed to support __thread style tls. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/arch/powerpc/powerpc/pthread_md.c#3 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/powerpc/powerpc/pthread_md.c#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Feb 27 05:27:56 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7521716A4D0; Sun, 27 Feb 2005 05:27:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5129516A4CE for ; Sun, 27 Feb 2005 05:27:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1110043D1D for ; Sun, 27 Feb 2005 05:27:56 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1R5Rttt063954 for ; Sun, 27 Feb 2005 05:27:55 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1R5RtO8063951 for perforce@freebsd.org; Sun, 27 Feb 2005 05:27:55 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Feb 2005 05:27:55 GMT Message-Id: <200502270527.j1R5RtO8063951@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 71962 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Feb 2005 05:27:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=71962 Change 71962 by davidxu@davidxu_tiger on 2005/02/27 05:27:28 Cleanup code. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/include/pthread_md.h#7 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/i386/include/pthread_md.h#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/powerpc/powerpc/pthread_md.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/include/pthread_md.h#7 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/sparc64/pthread_md.c#5 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/include/pthread_md.h#7 (text+ko) ==== @@ -40,9 +40,6 @@ #define DTV_OFFSET offsetof(struct tcb, tcb_dtv) -struct pthread; -struct tdv; - /* * Variant II tcb, first two members are required by rtld, * %fs points to the structure. ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/i386/include/pthread_md.h#6 (text+ko) ==== @@ -38,8 +38,6 @@ #define DTV_OFFSET offsetof(struct tcb, tcb_dtv) -struct pthread; - /* * Variant II tcb, first two members are required by rtld, * %gs points to the structure. ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/powerpc/powerpc/pthread_md.c#4 (text+ko) ==== @@ -28,6 +28,7 @@ #include #include + #include "rtld_tls.h" #include "pthread_md.h" @@ -44,18 +45,9 @@ oldtls = _tp; else oldtls = NULL; - -#if 1 - if ((tcb = malloc(sizeof(struct tcb))) != NULL) { - memset(tcb, 0, sizeof(struct tcb)); - tcb->tcb_thread = thread; - } -#else tcb = _rtld_allocate_tls(oldtls, sizeof(struct tcb), 16); - if (tcb) { + if (tcb) tcb->tcb_thread = thread; - } -#endif return (tcb); } @@ -63,9 +55,5 @@ void _tcb_dtor(struct tcb *tcb) { -#if 1 - free(tcb); -#else _rtld_free_tls(tcb, sizeof(tcb), 16); -#endif } ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/include/pthread_md.h#7 (text+ko) ==== @@ -37,8 +37,6 @@ #define DTV_OFFSET offsetof(struct tcb, tcb_dtv) -struct pthread; - /* * Variant II tcb, first two members are required by rtld. * %g7 points to the structure. ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/sparc64/pthread_md.c#5 (text+ko) ==== @@ -40,17 +40,13 @@ struct tcb *tcb; void *oldtls; - if (initial) { + if (initial) oldtls = _tp; - } else { + else oldtls = NULL; - } - tcb = _rtld_allocate_tls(oldtls, sizeof(struct tcb), 16); - if (tcb) { + if (tcb) tcb->tcb_thread = thread; - } - return (tcb); } From owner-p4-projects@FreeBSD.ORG Sun Feb 27 06:19:25 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22AB716A4D0; Sun, 27 Feb 2005 06:19:25 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C8D2916A4CE; Sun, 27 Feb 2005 06:19:24 +0000 (GMT) Received: from harmony.village.org (rover.village.org [168.103.84.182]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2443243D49; Sun, 27 Feb 2005 06:19:24 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.13.1/8.13.1) with ESMTP id j1R6HluP090159; Sat, 26 Feb 2005 23:17:47 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sat, 26 Feb 2005 23:17:59 -0700 (MST) Message-Id: <20050226.231759.49165032.imp@bsdimp.com> To: jmg@freebsd.org From: "M. Warner Losh" In-Reply-To: <200502230728.j1N7S2AL023160@repoman.freebsd.org> References: <200502230728.j1N7S2AL023160@repoman.freebsd.org> X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: perforce@freebsd.org Subject: Re: PERFORCE change 71640 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Feb 2005 06:19:25 -0000 In message: <200502230728.j1N7S2AL023160@repoman.freebsd.org> John-Mark Gurney writes: : int : ahb_attach(device_t dev) device ahb is an EISA scsi controller... You may want to use a different name... Warner From owner-p4-projects@FreeBSD.ORG Sun Feb 27 06:59:48 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36DD016A4D0; Sun, 27 Feb 2005 06:59:48 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0E2B916A4CE for ; Sun, 27 Feb 2005 06:59:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5CCDC43D41 for ; Sun, 27 Feb 2005 06:59:47 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1R6xlxo067339 for ; Sun, 27 Feb 2005 06:59:47 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1R6xlEe067336 for perforce@freebsd.org; Sun, 27 Feb 2005 06:59:47 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Feb 2005 06:59:47 GMT Message-Id: <200502270659.j1R6xlEe067336@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 71965 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Feb 2005 06:59:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=71965 Change 71965 by davidxu@davidxu_tiger on 2005/02/27 06:59:10 Init RCSID. Style fixes. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/Makefile#11 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/Makefile.inc#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/alpha/pthread_md.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/include/pthread_md.h#7 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/Makefile.inc#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/amd64/pthread_md.c#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/include/pthread_md.h#8 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/i386/Makefile.inc#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/i386/i386/pthread_md.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/i386/include/pthread_md.h#7 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/ia64/Makefile.inc#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/ia64/ia64/pthread_md.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/ia64/include/pthread_md.h#8 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/powerpc/Makefile.inc#2 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/powerpc/include/pthread_md.h#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/Makefile.inc#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/include/pthread_md.h#8 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/sparc64/pthread_md.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/pthread.map#8 edit .. //depot/projects/davidxu_thread/src/lib/libthread/support/Makefile.inc#2 edit .. //depot/projects/davidxu_thread/src/lib/libthread/support/thr_support.c#2 edit .. //depot/projects/davidxu_thread/src/lib/libthread/sys/Makefile.inc#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/sys/thr_error.c#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/Makefile.inc#8 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_barrier.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_barrierattr.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cancel.c#9 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_clean.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_concurrency.c#8 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_condattr.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_create.c#8 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_detach.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_equal.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_exit.c#8 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_fork.c#11 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_getprio.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_getschedparam.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_info.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_init.c#13 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_join.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#15 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kill.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_main_np.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_multi_np.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#18 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex_prioceiling.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex_protocol.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutexattr.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_once.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#22 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_pspinlock.c#10 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_resume_np.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_rtld.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_rwlock.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_rwlockattr.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_self.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sem.c#12 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_seterrno.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_setprio.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_setschedparam.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_single_np.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_spec.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_spinlock.c#10 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_stack.c#7 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_suspend_np.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_switch_np.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_symbols.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_umtx.c#2 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_umtx.h#2 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_yield.c#5 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/Makefile#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/Makefile,v 1.53 2004/10/24 15:32:32 ru Exp $ +# $FreeBSD$ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/arch/alpha/Makefile.inc,v 1.2 2003/08/09 05:44:27 deischen Exp $ +# $FreeBSD$ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/alpha/pthread_md.c#5 (text+ko) ==== @@ -22,10 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/arch/alpha/alpha/pthread_md.c,v 1.2 2004/08/15 16:28:04 dfr Exp $"); #include #include ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/include/pthread_md.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/alpha/include/pthread_md.h,v 1.7 2004/08/16 14:07:38 davidxu Exp $ + * $FreeBSD$ */ #ifndef _PTHREAD_MD_H_ ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/arch/amd64/Makefile.inc,v 1.2 2003/08/05 22:45:59 deischen Exp $ +# $FreeBSD$ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/amd64/pthread_md.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/amd64/amd64/pthread_md.c,v 1.4 2004/11/06 03:33:19 peter Exp $ + * $FreeBSD$ */ #include ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/include/pthread_md.h#8 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/amd64/include/pthread_md.h,v 1.10 2004/08/25 23:42:40 davidxu Exp $ + * $FreeBSD$ */ /* * Machine-dependent thread prototypes/definitions for the thread kernel. @@ -34,7 +34,6 @@ #include #include -#include #include #include @@ -52,17 +51,17 @@ }; /* - * Evaluates to the byte offset of the per-kse variable name. + * Evaluates to the byte offset of the per-tcb variable name. */ #define __tcb_offset(name) __offsetof(struct tcb, name) /* - * Evaluates to the type of the per-kse variable name. + * Evaluates to the type of the per-tcb variable name. */ #define __tcb_type(name) __typeof(((struct tcb *)0)->name) /* - * Evaluates to the value of the per-kse variable name. + * Evaluates to the value of the per-tcb variable name. */ #define TCB_GET64(name) ({ \ __tcb_type(name) __result; \ ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/i386/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/arch/i386/Makefile.inc,v 1.3 2003/08/05 22:45:59 deischen Exp $ +# $FreeBSD$ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/i386/i386/pthread_md.c#5 (text+ko) ==== @@ -23,11 +23,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD$ */ -#include -__FBSDID("$FreeBSD: src/lib/libpthread/arch/i386/i386/pthread_md.c,v 1.4 2004/11/06 03:35:51 peter Exp $"); - #include #include #include ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/i386/include/pthread_md.h#7 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/i386/include/pthread_md.h,v 1.13 2004/11/06 03:35:51 peter Exp $ + * $FreeBSD$ */ /* * Machine-dependent thread prototypes/definitions for the thread kernel. @@ -50,17 +50,17 @@ }; /* - * Evaluates to the byte offset of the per-thread variable name. + * Evaluates to the byte offset of the per-tcb variable name. */ #define __tcb_offset(name) __offsetof(struct tcb, name) /* - * Evaluates to the type of the per-thread variable name. + * Evaluates to the type of the per-tcb variable name. */ #define __tcb_type(name) __typeof(((struct tcb *)0)->name) /* - * Evaluates to the value of the per-kse variable name. + * Evaluates to the value of the per-tcb variable name. */ #define TCB_GET32(name) ({ \ __tcb_type(name) __result; \ ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/ia64/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/arch/ia64/Makefile.inc,v 1.4 2003/08/05 22:46:00 deischen Exp $ +# $FreeBSD$ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/ia64/ia64/pthread_md.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/ia64/ia64/pthread_md.c,v 1.3 2004/08/15 16:28:05 dfr Exp $ + * $FreeBSD$ */ #include ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/ia64/include/pthread_md.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/ia64/include/pthread_md.h,v 1.16 2004/08/16 14:07:38 davidxu Exp $ + * $FreeBSD$ */ #ifndef _PTHREAD_MD_H_ @@ -52,7 +52,7 @@ struct tcb *_tcb_ctor(struct pthread *, int); void _tcb_dtor(struct tcb *); -/* Called from the KSE to set its private data. */ +/* Called from the thread to set its private data. */ static __inline void _tcb_set(struct tcb *tcb) { ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/powerpc/Makefile.inc#2 (text+ko) ==== @@ -1,8 +1,5 @@ -# $FreeBSD: src/lib/libpthread/arch/powerpc/Makefile.inc,v 1.1 2004/07/19 12:19:04 grehan Exp $ +# $FreeBSD$ -# XXX temporary -CFLAGS+=-DSYSTEM_SCOPE_ONLY - .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} -SRCS+= enter_uts.S context.S pthread_md.c +SRCS+= pthread_md.c ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/powerpc/include/pthread_md.h#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/powerpc/include/pthread_md.h,v 1.3 2004/08/16 05:41:38 grehan Exp $ + * $FreeBSD$ */ /* ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/arch/sparc64/Makefile.inc,v 1.1 2003/10/09 02:32:28 deischen Exp $ +# $FreeBSD$ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/include/pthread_md.h#8 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/sparc64/include/pthread_md.h,v 1.5 2004/08/16 14:07:38 davidxu Exp $ + * $FreeBSD$ */ /* ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/sparc64/pthread_md.c#6 (text+ko) ==== @@ -31,6 +31,7 @@ #include #include #include + #include "rtld_tls.h" #include "pthread_md.h" ==== //depot/projects/davidxu_thread/src/lib/libthread/pthread.map#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/pthread.map,v 1.13 2004/09/26 06:50:14 deischen Exp $ +# $FreeBSD$ LIBTHREAD_1_0 { global: ___creat; ==== //depot/projects/davidxu_thread/src/lib/libthread/support/Makefile.inc#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/support/Makefile.inc,v 1.7 2003/09/05 18:08:19 kan Exp $ +# $FreeBSD$ .PATH: ${.CURDIR}/support ${.CURDIR}/../libc/gen ${.CURDIR}/../libc/string .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys @@ -6,11 +6,10 @@ CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_ARCH} SYSCALLS= clock_gettime \ - kse_create \ - kse_exit \ - kse_release \ - kse_thr_interrupt \ - kse_wakeup \ + thr_create \ + thr_exit \ + thr_kill \ + _umtx_op \ sigaction \ sigprocmask \ sigtimedwait \ @@ -36,4 +35,3 @@ thr_libc.So: ${SYSCALL_OBJ} ${LIBC_OBJS} ${CC} -fPIC -nostdlib -o ${.TARGET} -r ${.ALLSRC} - ==== //depot/projects/davidxu_thread/src/lib/libthread/support/thr_support.c#2 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/support/thr_support.c,v 1.3 2003/06/28 09:55:01 davidxu Exp $ + * $FreeBSD$ */ #include @@ -34,28 +34,26 @@ #include "thr_private.h" -__strong_reference(clock_gettime, _thr_clock_gettime); -__strong_reference(kse_exit, _thr_kse_exit); -__strong_reference(kse_wakeup, _thr_kse_wakeup); -__strong_reference(kse_create, _thr_kse_create); -__strong_reference(kse_thr_interrupt, _thr_kse_thr_interrupt); -__strong_reference(kse_release, _thr_kse_release); +__strong_reference(clock_gettime, __thr_clock_gettime); +__strong_reference(thr_exit, __thr_thr_exit); +__strong_reference(thr_create, __thr_thr_create); +__strong_reference(thr_kill, __thr_thr_kill); +__strong_reference(_umtx_op, __thr_umtx_op); +__strong_reference(sigaction, __thr_sigaction); +__strong_reference(sigprocmask, __thr_sigprocmask); +__strong_reference(sigemptyset, __thr_sigemptyset); +__strong_reference(sigaddset, __thr_sigaddset); +__strong_reference(sigfillset, __thr_sigfillset); +__strong_reference(sigismember, __thr_sigismember); +__strong_reference(sigdelset, __thr_sigdelset); -__strong_reference(sigaction, _thr_sigaction); -__strong_reference(sigprocmask, _thr_sigprocmask); -__strong_reference(sigemptyset, _thr_sigemptyset); -__strong_reference(sigaddset, _thr_sigaddset); -__strong_reference(sigfillset, _thr_sigfillset); -__strong_reference(sigismember, _thr_sigismember); -__strong_reference(sigdelset, _thr_sigdelset); +__strong_reference(memset, __thr_memset); +__strong_reference(memcpy, __thr_memcpy); +__strong_reference(strcpy, __thr_strcpy); +__strong_reference(strlen, __thr_strlen); +__strong_reference(bzero, __thr_bzero); +__strong_reference(bcopy, __thr_bcopy); -__strong_reference(memset, _thr_memset); -__strong_reference(memcpy, _thr_memcpy); -__strong_reference(strcpy, _thr_strcpy); -__strong_reference(strlen, _thr_strlen); -__strong_reference(bzero, _thr_bzero); -__strong_reference(bcopy, _thr_bcopy); - -__strong_reference(__sys_write, _thr__sys_write); -__strong_reference(__sys_sigtimedwait, _thr__sys_sigtimedwait); +__strong_reference(__sys_write, __thr__sys_write); +__strong_reference(__sys_sigtimedwait, __thr__sys_sigtimedwait); ==== //depot/projects/davidxu_thread/src/lib/libthread/sys/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/sys/Makefile.inc,v 1.15 2003/06/23 04:28:31 marcel Exp $ +# $FreeBSD$ .PATH: ${.CURDIR}/sys ==== //depot/projects/davidxu_thread/src/lib/libthread/sys/thr_error.c#3 (text+ko) ==== @@ -31,9 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/sys/thr_error.c,v 1.7 2003/04/23 21:46:50 deischen Exp $ + * $FreeBSD$ */ + #include + #include "libc_private.h" #include "thr_private.h" ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/Makefile.inc#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/thread/Makefile.inc,v 1.49 2004/09/26 06:50:15 deischen Exp $ +# $FreeBSD$ # thr sources .PATH: ${.CURDIR}/thread ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_barrier.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_barrier.c,v 1.1 2003/09/04 14:06:43 davidxu Exp $ + * $FreeBSD$ */ #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_barrierattr.c#4 (text+ko) ==== @@ -25,12 +25,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_barrierattr.c,v 1.1 2003/09/04 14:06:43 davidxu Exp $ + * $FreeBSD$ */ #include #include #include + #include "thr_private.h" __weak_reference(_pthread_barrierattr_destroy, pthread_barrierattr_destroy); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cancel.c#9 (text+ko) ==== @@ -28,6 +28,7 @@ */ #include + #include "thr_private.h" __weak_reference(_pthread_cancel, pthread_cancel); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_clean.c#4 (text+ko) ==== @@ -29,12 +29,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_clean.c,v 1.9 2004/12/18 18:07:37 deischen Exp $ + * $FreeBSD$ */ + #include #include #include #include + #include "thr_private.h" __weak_reference(_pthread_cleanup_push, pthread_cleanup_push); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_concurrency.c#8 (text+ko) ==== @@ -24,8 +24,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_concurrency.c,v 1.8 2004/03/14 05:24:27 bde Exp $ + * $FreeBSD$ */ + #include #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_condattr.c#5 (text+ko) ==== @@ -31,10 +31,12 @@ * * $FreeBSD$ */ + #include #include #include #include + #include "thr_private.h" __weak_reference(_pthread_condattr_init, pthread_condattr_init); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_create.c#8 (text+ko) ==== @@ -30,8 +30,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_create.c,v 1.58 2004/10/23 23:28:36 davidxu Exp $ + * $FreeBSD$ */ + #include #include #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_detach.c#5 (text+ko) ==== @@ -29,12 +29,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_detach.c,v 1.23 2003/07/23 02:11:07 deischen Exp $ + * $FreeBSD$ */ + #include -#include #include #include + #include "thr_private.h" __weak_reference(_pthread_detach, pthread_detach); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_equal.c#4 (text+ko) ==== @@ -29,9 +29,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_equal.c,v 1.6 2002/09/16 08:45:34 mini Exp $ + * $FreeBSD$ */ + #include + #include "thr_private.h" __weak_reference(_pthread_equal, pthread_equal); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_exit.c#8 (text+ko) ==== @@ -29,15 +29,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_exit.c,v 1.39 2004/10/23 23:37:54 davidxu Exp $ + * $FreeBSD$ */ + #include -#include -#include #include #include -#include #include + #include "thr_private.h" void _pthread_exit(void *status); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_fork.c#11 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_atfork.c,v 1.1 2003/11/05 03:42:10 davidxu Exp $ + * $FreeBSD$ */ /* @@ -58,13 +58,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_fork.c,v 1.34 2003/11/05 18:18:45 deischen Exp $ */ + #include #include #include #include -#include #include #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_getprio.c#4 (text+ko) ==== @@ -29,10 +29,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_getprio.c,v 1.9 2002/09/16 08:45:34 mini Exp $ + * $FreeBSD$ */ + #include #include + #include "thr_private.h" __weak_reference(_pthread_getprio, pthread_getprio); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_getschedparam.c#5 (text+ko) ==== @@ -29,10 +29,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_getschedparam.c,v 1.10 2003/07/07 04:28:23 davidxu Exp $ + * $FreeBSD$ */ + #include #include + #include "thr_private.h" __weak_reference(_pthread_getschedparam, pthread_getschedparam); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_info.c#4 (text+ko) ==== @@ -29,8 +29,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_info.c,v 1.27 2003/09/22 00:40:23 davidxu Exp $ + * $FreeBSD$ */ + #include #include #include @@ -38,6 +39,7 @@ #include #include #include + #include "thr_private.h" #ifndef NELEMENTS ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_init.c#13 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_init.c,v 1.66 2004/08/21 11:49:19 davidxu Exp $ + * $FreeBSD$ */ /* Allocate space for global thread variables here: */ ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_join.c#6 (text+ko) ==== @@ -29,10 +29,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_join.c,v 1.28 2003/12/09 02:20:56 davidxu Exp $ + * $FreeBSD$ */ + #include #include + #include "thr_private.h" __weak_reference(_pthread_join, pthread_join); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#15 (text+ko) ==== @@ -31,6 +31,7 @@ #include #include #include + #include "thr_private.h" /*#define DEBUG_THREAD_KERN */ ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kill.c#5 (text+ko) ==== @@ -29,11 +29,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_kill.c,v 1.16 2003/06/28 09:55:02 davidxu Exp $ + * $FreeBSD$ */ + #include #include #include + #include "thr_private.h" __weak_reference(_pthread_kill, pthread_kill); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_main_np.c#4 (text+ko) ==== @@ -24,11 +24,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_main_np.c,v 1.5 2003/04/18 05:04:16 deischen Exp $ + * $FreeBSD$ */ #include #include + #include "thr_private.h" __weak_reference(_pthread_main_np, pthread_main_np); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_multi_np.c#4 (text+ko) ==== @@ -29,8 +29,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_multi_np.c,v 1.7 2002/05/24 04:32:28 deischen Exp $ + * $FreeBSD$ */ + #include #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#18 (text+ko) ==== @@ -29,8 +29,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_mutex.c,v 1.46 2004/10/31 05:03:50 green Exp $ + * $FreeBSD$ */ + #include #include #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex_prioceiling.c#4 (text+ko) ==== @@ -29,8 +29,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_mutex_prioceiling.c,v 1.8 2003/07/07 04:28:23 davidxu Exp $ + * $FreeBSD$ */ + #include #include #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex_protocol.c#4 (text+ko) ==== @@ -29,8 +29,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_mutex_protocol.c,v 1.7 2003/04/18 05:04:16 deischen Exp $ + * $FreeBSD$ */ + #include #include #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutexattr.c#4 (text+ko) ==== @@ -63,7 +63,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ */ #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_once.c#5 (text+ko) ==== @@ -29,11 +29,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_once.c,v 1.9 2003/09/09 22:38:12 davidxu Exp $ + * $FreeBSD$ */ + #include "namespace.h" #include #include "un-namespace.h" + #include "thr_private.h" __weak_reference(_pthread_once, pthread_once); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#22 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.120 2004/11/01 10:49:34 davidxu Exp $ + * $FreeBSD$ */ #ifndef _THR_PRIVATE_H ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_pspinlock.c#10 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_pspinlock.c,v 1.2 2003/11/04 19:56:12 deischen Exp $ + * $FreeBSD$ */ #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_resume_np.c#6 (text+ko) ==== @@ -29,10 +29,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_resume_np.c,v 1.18 2003/07/23 02:11:07 deischen Exp $ + * $FreeBSD$ */ + #include #include + #include "thr_private.h" __weak_reference(_pthread_resume_np, pthread_resume_np); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_rtld.c#6 (text+ko) ==== @@ -25,9 +25,9 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_rtld.c,v 1.5 2003/11/05 18:19:24 deischen Exp $ + * $FreeBSD$ */ -#include + #include #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_rwlock.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_rwlock.c,v 1.14 2004/01/08 15:37:09 deischen Exp $ + * $FreeBSD$ */ #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_rwlockattr.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_rwlockattr.c,v 1.8 2002/09/16 08:45:35 mini Exp $ + * $FreeBSD$ */ #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_self.c#5 (text+ko) ==== @@ -29,9 +29,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_self.c,v 1.7 2003/04/18 05:04:16 deischen Exp $ + * $FreeBSD$ */ + #include + #include "thr_private.h" __weak_reference(_pthread_self, pthread_self); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sem.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_sem.c,v 1.16 2004/12/18 18:07:37 deischen Exp $ + * $FreeBSD$ */ #include "namespace.h" @@ -40,6 +40,7 @@ #include #include <_semaphore.h> #include "un-namespace.h" + #include "thr_private.h" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Feb 27 07:35:20 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97CEF16A4D0; Sun, 27 Feb 2005 07:35:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C92B16A4CE for ; Sun, 27 Feb 2005 07:35:19 +0000 (GMT) Received: from mail28.sea5.speakeasy.net (mail28.sea5.speakeasy.net [69.17.117.30]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1FE7643D46 for ; Sun, 27 Feb 2005 07:35:19 +0000 (GMT) (envelope-from jmg@hydrogen.funkthat.com) Received: (qmail 5368 invoked from network); 27 Feb 2005 07:35:16 -0000 Received: from gate.funkthat.com (HELO hydrogen.funkthat.com) ([69.17.45.168]) (envelope-sender ) by mail28.sea5.speakeasy.net (qmail-ldap-1.03) with SMTP for ; 27 Feb 2005 07:35:16 -0000 Received: from hydrogen.funkthat.com (wnspsl@localhost.funkthat.com [127.0.0.1])j1R7ZGGH075302; Sat, 26 Feb 2005 23:35:16 -0800 (PST) (envelope-from jmg@hydrogen.funkthat.com) Received: (from jmg@localhost) by hydrogen.funkthat.com (8.12.10/8.12.10/Submit) id j1R7ZFLl075301; Sat, 26 Feb 2005 23:35:15 -0800 (PST) Date: Sat, 26 Feb 2005 23:35:15 -0800 From: John-Mark Gurney To: "M. Warner Losh" Message-ID: <20050227073515.GQ89312@funkthat.com> References: <200502230728.j1N7S2AL023160@repoman.freebsd.org> <20050226.231759.49165032.imp@bsdimp.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20050226.231759.49165032.imp@bsdimp.com> User-Agent: Mutt/1.4.1i X-Operating-System: FreeBSD 4.2-RELEASE i386 X-PGP-Fingerprint: B7 EC EF F8 AE ED A7 31 96 7A 22 B3 D8 56 36 F4 X-Files: The truth is out there X-URL: http://resnet.uoregon.edu/~gurney_j/ X-Resume: http://resnet.uoregon.edu/~gurney_j/resume.html cc: perforce@freebsd.org Subject: Re: PERFORCE change 71640 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: John-Mark Gurney List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Feb 2005 07:35:20 -0000 M. Warner Losh wrote this message on Sat, Feb 26, 2005 at 23:17 -0700: > In message: <200502230728.j1N7S2AL023160@repoman.freebsd.org> > John-Mark Gurney writes: > : int > : ahb_attach(device_t dev) > > device ahb is an EISA scsi controller... You may want to use a > different name... hmmm.. that's anoying... well, the only good thing is that the ep93xx will probably never have an EISA bus on it, though I guess it would be good to reduce confusion... I'll have to think about a better/good name for it, since AHB is the name that Cirrus Logic uses to describe the bus, hence the name.. :) making people who are familar with the chip obvious what it is... -- John-Mark Gurney Voice: +1 415 225 5579 "All that I will do, has been done, All that I have, has not." From owner-p4-projects@FreeBSD.ORG Sun Feb 27 11:34:37 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D529216A4D0; Sun, 27 Feb 2005 11:34:36 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6D4D716A4CE for ; Sun, 27 Feb 2005 11:34:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 20A8443D3F for ; Sun, 27 Feb 2005 11:34:36 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1RBYaDf085240 for ; Sun, 27 Feb 2005 11:34:36 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1RBYZeY085237 for perforce@freebsd.org; Sun, 27 Feb 2005 11:34:35 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Feb 2005 11:34:35 GMT Message-Id: <200502271134.j1RBYZeY085237@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 71971 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Feb 2005 11:34:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=71971 Change 71971 by davidxu@davidxu_alona on 2005/02/27 11:33:56 Style fixes. Don't include unneeded header files. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/alpha/pthread_md.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/amd64/pthread_md.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/include/pthread_md.h#9 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/i386/i386/pthread_md.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/ia64/ia64/pthread_md.c#7 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/powerpc/powerpc/pthread_md.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/sparc64/pthread_md.c#7 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/alpha/pthread_md.c#6 (text+ko) ==== @@ -26,10 +26,9 @@ * $FreeBSD$ */ -#include - #include #include + #include "pthread_md.h" /* ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/amd64/pthread_md.c#4 (text+ko) ==== @@ -26,9 +26,9 @@ * $FreeBSD$ */ -#include -#include -#include "rtld_tls.h" +#include +#include + #include "pthread_md.h" /* @@ -40,17 +40,13 @@ struct tcb *tcb; void *oldtls; - if (initial) { + if (initial) __asm __volatile("movq %%fs:0, %0" : "=r" (oldtls)); - } else { + else oldtls = NULL; - } - tcb = _rtld_allocate_tls(oldtls, sizeof(struct tcb), 16); - if (tcb) { + if (tcb) tcb->tcb_thread = thread; - } - return (tcb); } ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/include/pthread_md.h#9 (text+ko) ==== @@ -26,6 +26,7 @@ * * $FreeBSD$ */ + /* * Machine-dependent thread prototypes/definitions for the thread kernel. */ ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/i386/i386/pthread_md.c#6 (text+ko) ==== @@ -31,8 +31,8 @@ #include #include #include +#include -#include "rtld_tls.h" #include "pthread_md.h" struct tcb * ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/ia64/ia64/pthread_md.c#7 (text+ko) ==== @@ -27,11 +27,9 @@ * $FreeBSD$ */ -#include -#include #include +#include -#include "rtld_tls.h" #include "pthread_md.h" /* ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/powerpc/powerpc/pthread_md.c#5 (text+ko) ==== @@ -26,10 +26,9 @@ * $FreeBSD$ */ -#include -#include +#include +#include -#include "rtld_tls.h" #include "pthread_md.h" /* ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/sparc64/pthread_md.c#7 (text+ko) ==== @@ -29,10 +29,8 @@ */ #include -#include -#include +#include -#include "rtld_tls.h" #include "pthread_md.h" struct tcb * From owner-p4-projects@FreeBSD.ORG Sun Feb 27 11:48:55 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B66A16A4D2; Sun, 27 Feb 2005 11:48:55 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 34EDE16A4D2 for ; Sun, 27 Feb 2005 11:48:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 02B4A43D1F for ; Sun, 27 Feb 2005 11:48:55 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1RBmsFh085904 for ; Sun, 27 Feb 2005 11:48:54 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1RBmsqP085901 for perforce@freebsd.org; Sun, 27 Feb 2005 11:48:54 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Feb 2005 11:48:54 GMT Message-Id: <200502271148.j1RBmsqP085901@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 71974 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Feb 2005 11:48:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=71974 Change 71974 by davidxu@davidxu_alona on 2005/02/27 11:48:08 Don't include kse.h, include thr.h instead. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/support/thr_support.c#3 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/support/thr_support.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include From owner-p4-projects@FreeBSD.ORG Sun Feb 27 11:49:57 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0464016A4D0; Sun, 27 Feb 2005 11:49:57 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CF7EE16A4CE for ; Sun, 27 Feb 2005 11:49:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B546E43D2D for ; Sun, 27 Feb 2005 11:49:56 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1RBnuOF085932 for ; Sun, 27 Feb 2005 11:49:56 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1RBnuhl085929 for perforce@freebsd.org; Sun, 27 Feb 2005 11:49:56 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Feb 2005 11:49:56 GMT Message-Id: <200502271149.j1RBnuhl085929@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 71975 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Feb 2005 11:49:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=71975 Change 71975 by davidxu@davidxu_alona on 2005/02/27 11:49:13 Include stddef.h, so we can use NULL other than zero. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#23 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#23 (text+ko) ==== @@ -29,8 +29,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * Private thread definitions for the uthread kernel. - * * $FreeBSD$ */ @@ -48,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -492,7 +491,7 @@ struct tcb *tcb; /* Cleanup handlers Link List */ - struct pthread_cleanup *cleanup; + struct pthread_cleanup *cleanup; }; #define THR_UMTX_TRYLOCK(thrd, lck) \ @@ -828,14 +827,14 @@ static inline int _thr_is_inited(void) { - return (_thr_initial != 0); + return (_thr_initial != NULL); } static inline void _thr_check_init(void) { - if (_thr_initial == 0) - _libpthread_init(0); + if (_thr_initial == NULL) + _libpthread_init(NULL); } __END_DECLS From owner-p4-projects@FreeBSD.ORG Sun Feb 27 12:47:13 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A4AD16A4D0; Sun, 27 Feb 2005 12:47:12 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4872A16A4CE for ; Sun, 27 Feb 2005 12:47:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7AB3443D2F for ; Sun, 27 Feb 2005 12:47:11 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1RClBac094770 for ; Sun, 27 Feb 2005 12:47:11 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1RCl7Kp093623 for perforce@freebsd.org; Sun, 27 Feb 2005 12:47:07 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Feb 2005 12:47:07 GMT Message-Id: <200502271247.j1RCl7Kp093623@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 71980 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Feb 2005 12:47:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=71980 Change 71980 by davidxu@davidxu_alona on 2005/02/27 12:46:15 IFC. Affected files ... .. //depot/projects/davidxu_thread/src/Makefile#5 integrate .. //depot/projects/davidxu_thread/src/Makefile.inc1#7 integrate .. //depot/projects/davidxu_thread/src/UPDATING#6 integrate .. //depot/projects/davidxu_thread/src/bin/chflags/chflags.1#3 integrate .. //depot/projects/davidxu_thread/src/bin/cp/cp.1#3 integrate .. //depot/projects/davidxu_thread/src/bin/sh/options.c#2 integrate .. //depot/projects/davidxu_thread/src/contrib/lukemftp/src/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/contrib/lukemftp/src/cmds.c#2 integrate .. //depot/projects/davidxu_thread/src/contrib/lukemftp/src/cmdtab.c#2 integrate .. //depot/projects/davidxu_thread/src/contrib/lukemftp/src/extern.h#2 integrate .. //depot/projects/davidxu_thread/src/contrib/lukemftp/src/fetch.c#2 integrate .. //depot/projects/davidxu_thread/src/contrib/lukemftp/src/ftp.1#2 integrate .. //depot/projects/davidxu_thread/src/contrib/lukemftp/src/ftp.c#2 integrate .. //depot/projects/davidxu_thread/src/contrib/lukemftp/src/ftp_var.h#2 integrate .. //depot/projects/davidxu_thread/src/contrib/lukemftp/src/main.c#2 integrate .. //depot/projects/davidxu_thread/src/contrib/lukemftp/src/progressbar.c#2 integrate .. //depot/projects/davidxu_thread/src/contrib/lukemftp/src/progressbar.h#2 integrate .. //depot/projects/davidxu_thread/src/contrib/lukemftp/src/util.c#2 integrate .. //depot/projects/davidxu_thread/src/contrib/lukemftp/src/version.h#2 integrate .. //depot/projects/davidxu_thread/src/contrib/pf/man/pfsync.4#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/ChangeLog#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/FREEBSD-Xlist#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/NEWS#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/aclocal.m4#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/admin/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/admin/get.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/afsutil/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/ftp/ChangeLog#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/ftp/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/ftp/common/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/ftp/ftp/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/ftp/ftp/ftp.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/ftp/ftpd/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/ftp/ftpd/extern.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/ftp/ftpd/ftpcmd.y#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/ftp/ftpd/ftpd.8#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/ftp/ftpd/ftpd.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/ftp/ftpd/ftpd_locl.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/kf/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/login/ChangeLog#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/login/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/login/login.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/push/ChangeLog#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/push/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/push/push.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/rcp/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/rsh/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/su/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/telnet/ChangeLog#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/telnet/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/telnet/libtelnet/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/telnet/telnet/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/telnet/telnet/network.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/telnet/telnetd/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/telnet/telnetd/state.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/appl/test/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/compile#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/config.guess#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/config.sub#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/configure#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/configure.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/doc/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/include/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/include/kadm5/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/install-sh#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/kadmin/ChangeLog#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/kadmin/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/kadmin/kadmind.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/kadmin/version4.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/kdc/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/kdc/connect.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/kdc/kerberos5.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/kpasswd/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/kuser/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/kuser/kinit.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/45/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/asn1/Makefile.am#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/asn1/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/asn1/k5.asn1#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/auth/ChangeLog#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/auth/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/auth/afskauthlib/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/auth/afskauthlib/verify.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/auth/pam/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/auth/sia/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/com_err/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/gssapi/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/hdb/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/kadm5/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/kafs/ChangeLog#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/kafs/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/kafs/afssys.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/krb5/Makefile.am#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/krb5/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/krb5/changepw.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/krb5/context.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/krb5/init_creds_pw.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/krb5/krb5-protos.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/krb5/krb5.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/krb5/krb5_set_password.3#1 branch .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/roken/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/sl/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/lib/vers/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/missing#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/mkinstalldirs#2 integrate .. //depot/projects/davidxu_thread/src/crypto/heimdal/tools/Makefile.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/CHANGES#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/Configure#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/FAQ#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/FREEBSD-Xlist#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/INSTALL#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/Makefile.org#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/NEWS#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/PROBLEMS#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/README#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/apps/CA.pl#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/apps/CA.pl.in#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/apps/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/apps/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/apps/apps.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/apps/apps.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/apps/asn1pars.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/apps/ca.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/apps/der_chop#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/apps/dgst.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/apps/enc.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/apps/openssl.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/apps/openssl.cnf#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/apps/pkcs8.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/apps/prime.c#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/apps/progs.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/apps/req.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/apps/speed.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/apps/x509.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/certs/eng1.pem#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/certs/eng2.pem#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/certs/eng3.pem#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/certs/eng4.pem#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/certs/eng5.pem#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/comm.txt#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/comms.txt#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/config#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/aes/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/aes/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/aes/aes.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/aes/aes_cfb.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/aes/aes_core.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/aes/aes_ctr.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/aes/aes_locl.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/asn1/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/asn1/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/asn1/a_int.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/asn1/a_strex.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/asn1/f.c#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/asn1/p5_pbev2.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/asn1/x_cinf.c#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/asn1/x_crl.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/bf/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/bf/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/bio/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/bio/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/bio/b_print.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/bio/bio.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/bio/bss_file.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/bn/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/bn/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/bn/asm/ia64.S#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/bn/bntest.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/buffer/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/buffer/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/cast/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/cast/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/comp/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/comp/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/comp/c_zlib.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/conf/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/conf/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/conf/conf_def.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/cryptlib.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/crypto.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/des/FILES0#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/des/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/des/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/des/cfb64ede.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/des/des.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/des/des_enc.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/des/des_old.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/des/destest.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/des/ecb3_enc.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/des/set_key.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/dh/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/dh/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/dh/dh_check.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/dh/dh_err.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/dh/dh_gen.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/dh/dh_key.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/dsa/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/dsa/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/dsa/dsa.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/dsa/dsa_gen.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/dsa/dsa_key.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/dsa/dsa_ossl.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/dsa/dsa_sign.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/dsa/dsa_vrf.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/dso/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/dso/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/ec/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/ec/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/engine/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/engine/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/engine/hw_cryptodev.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/err/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/err/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/err/err.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/err/err.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/err/err_all.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/err/openssl.ec#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/evp/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/evp/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/evp/bio_md.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/evp/c_allc.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/evp/e_aes.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/evp/e_des.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/evp/e_des3.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/evp/e_old.c#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/evp/evp.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/evp/evp_err.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/evp/evp_lib.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/evp/evp_locl.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/evp/evp_test.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/evp/evptests.txt#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/hmac/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/hmac/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/idea/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/idea/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/krb5/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/krb5/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/lhash/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/lhash/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/md2/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/md2/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/md32_common.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/md4/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/md4/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/md5/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/md5/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/mdc2/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/mdc2/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/o_str.c#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/o_str.h#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/o_time.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/objects/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/objects/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/objects/obj_dat.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/objects/obj_mac.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/objects/obj_mac.num#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/objects/objects.txt#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/ocsp/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/ocsp/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/opensslv.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/pem/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/pem/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/pem/pem_all.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/pem/pem_pkey.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/pkcs12/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/pkcs12/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/pkcs7/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/pkcs7/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/pkcs7/pk7_attr.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/rand/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/rand/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/rand/md_rand.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/rand/rand.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/rand/rand_egd.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/rand/rand_err.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/rand/rand_lib.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/rand/rand_win.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/rand/randfile.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/rc2/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/rc2/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/rc4/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/rc4/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/rc5/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/rc5/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/ripemd/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/ripemd/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/rsa/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/rsa/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/rsa/rsa.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/rsa/rsa_eay.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/rsa/rsa_gen.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/sha/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/sha/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/sha/sha.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/sha/sha1dgst.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/stack/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/stack/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/stack/safestack.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/stack/stack.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/stack/stack.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/txt_db/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/txt_db/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/ui/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/ui/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/x509/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/x509/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/x509/x509.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/x509/x509_req.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/x509/x509_vfy.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/x509v3/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/x509v3/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/x509v3/ext_dat.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/crypto/x509v3/v3_int.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/demos/engines/rsaref/Makefile#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/demos/engines/rsaref/README#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/demos/engines/rsaref/build.com#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/demos/engines/rsaref/rsaref.c#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/demos/engines/rsaref/rsaref.ec#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/demos/engines/rsaref/rsaref_err.c#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/demos/engines/rsaref/rsaref_err.h#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/doc/apps/enc.pod#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/doc/crypto/BN_num_bytes.pod#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/doc/crypto/RSA_public_encrypt.pod#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/doc/crypto/pem.pod#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/doc/ssl/SSL_CTX_set_session_id_context.pod#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/e_os.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/e_os2.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/openssl.spec#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/os2/OS2-EMX.cmd#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/ssl/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/ssl/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/ssl/s23_clnt.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/ssl/s2_clnt.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/ssl/s2_srvr.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/ssl/s3_clnt.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/ssl/s3_lib.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/ssl/s3_pkt.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/ssl/s3_srvr.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/ssl/ssl.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/ssl/ssl_cert.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/ssl/ssl_ciph.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/ssl/ssl_lib.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/ssl/ssl_locl.h#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/ssl/ssl_sess.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/ssl/ssltest.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/ssl/t1_enc.c#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/test/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/test/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/test/bctest#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/test/evptests.txt#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/test/testenc#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/test/testfipsssl#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/tools/Makefile#1 branch .. //depot/projects/davidxu_thread/src/crypto/openssl/tools/Makefile.ssl#2 delete .. //depot/projects/davidxu_thread/src/crypto/openssl/tools/c_issuer#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/tools/c_rehash#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/util/domd#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/util/extract-names.pl#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/util/fixNT.sh#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/util/libeay.num#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/util/mk1mf.pl#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/util/mkdef.pl#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/util/mkerr.pl#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/util/mkfiles.pl#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/util/mkstack.pl#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/util/pl/BC-16.pl#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/util/pl/BC-32.pl#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/util/pl/Mingw32.pl#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/util/pl/OS2-EMX.pl#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/util/pl/VC-16.pl#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/util/pl/VC-32.pl#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/util/pl/VC-CE.pl#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/util/pl/linux.pl#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/util/pl/ultrix.pl#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/util/pl/unix.pl#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/util/pod2mantest#2 integrate .. //depot/projects/davidxu_thread/src/crypto/openssl/util/selftest.pl#2 integrate .. //depot/projects/davidxu_thread/src/etc/defaults/rc.conf#6 integrate .. //depot/projects/davidxu_thread/src/etc/periodic/security/500.ipfwdenied#2 integrate .. //depot/projects/davidxu_thread/src/etc/periodic/security/550.ipfwlimit#2 integrate .. //depot/projects/davidxu_thread/src/etc/protocols#2 integrate .. //depot/projects/davidxu_thread/src/etc/rc.d/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/etc/rc.d/power_profile#3 integrate .. //depot/projects/davidxu_thread/src/etc/rc.d/powerd#1 branch .. //depot/projects/davidxu_thread/src/etc/syslog.conf#2 integrate .. //depot/projects/davidxu_thread/src/games/fortune/datfiles/fortunes#5 integrate .. //depot/projects/davidxu_thread/src/games/fortune/fortune/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/games/fortune/fortune/fortune.c#3 integrate .. //depot/projects/davidxu_thread/src/games/fortune/strfile/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/games/fortune/strfile/strfile.8#3 integrate .. //depot/projects/davidxu_thread/src/games/fortune/strfile/strfile.c#3 integrate .. //depot/projects/davidxu_thread/src/games/fortune/strfile/strfile.h#2 integrate .. //depot/projects/davidxu_thread/src/games/fortune/unstr/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/games/fortune/unstr/unstr.c#2 integrate .. //depot/projects/davidxu_thread/src/gnu/lib/libdialog/dialog.3#3 integrate .. //depot/projects/davidxu_thread/src/gnu/lib/libobjc/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/gdb/gdb.1#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/kgdb/Makefile#4 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/kgdb/kgdb.h#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/kgdb/kthr.c#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/kgdb/main.c#3 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/kgdb/trgt.c#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/kgdb/trgt_alpha.c#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c#2 integrate .. //depot/projects/davidxu_thread/src/include/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/include/runefile.h#1 branch .. //depot/projects/davidxu_thread/src/include/stdbool.h#2 integrate .. //depot/projects/davidxu_thread/src/kerberos5/include/config.h#2 integrate .. //depot/projects/davidxu_thread/src/kerberos5/include/version.h#2 integrate .. //depot/projects/davidxu_thread/src/kerberos5/lib/libasn1/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/kerberos5/usr.bin/krb5-config/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/lib/libarchive/archive_util.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libarchive/libarchive-formats.5#4 integrate .. //depot/projects/davidxu_thread/src/lib/libc/gen/devname.3#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/gen/tls.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/locale/rune.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/stdio/vswprintf.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/sys/extattr_get_file.2#3 integrate .. //depot/projects/davidxu_thread/src/lib/libc/sys/mount.2#4 integrate .. //depot/projects/davidxu_thread/src/lib/libc/sys/semget.2#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/sys/unlink.2#2 integrate .. //depot/projects/davidxu_thread/src/lib/libfetch/common.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libfetch/http.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libmd/mdX.3#3 integrate .. //depot/projects/davidxu_thread/src/lib/libpthread/arch/arm/Makefile.inc#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpthread/thread/thr_init.c#4 integrate .. //depot/projects/davidxu_thread/src/lib/libutil/login.conf.5#2 integrate .. //depot/projects/davidxu_thread/src/lib/msun/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/lib/msun/i387/Makefile.inc#2 integrate .. //depot/projects/davidxu_thread/src/lib/msun/i387/e_acos.S#3 delete .. //depot/projects/davidxu_thread/src/lib/msun/i387/e_asin.S#3 delete .. //depot/projects/davidxu_thread/src/lib/msun/i387/e_atan2.S#3 delete .. //depot/projects/davidxu_thread/src/lib/msun/i387/e_atan2f.S#2 delete .. //depot/projects/davidxu_thread/src/lib/msun/i387/s_atan.S#2 delete .. //depot/projects/davidxu_thread/src/lib/msun/i387/s_cosf.S#2 delete .. //depot/projects/davidxu_thread/src/lib/msun/i387/s_sinf.S#2 delete .. //depot/projects/davidxu_thread/src/lib/msun/i387/s_tanf.S#2 delete .. //depot/projects/davidxu_thread/src/lib/msun/man/exp.3#3 integrate .. //depot/projects/davidxu_thread/src/lib/msun/sparc64/Makefile.inc#1 branch .. //depot/projects/davidxu_thread/src/lib/msun/sparc64/e_sqrt.S#1 branch .. //depot/projects/davidxu_thread/src/lib/msun/sparc64/e_sqrtf.S#1 branch .. //depot/projects/davidxu_thread/src/lib/msun/src/e_expf.c#2 integrate .. //depot/projects/davidxu_thread/src/libexec/ftpd/ftpd.c#5 integrate .. //depot/projects/davidxu_thread/src/libexec/rexecd/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/libexec/rexecd/rexecd.c#3 integrate .. //depot/projects/davidxu_thread/src/libexec/rtld-elf/arm/rtld_machdep.h#3 integrate .. //depot/projects/davidxu_thread/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#6 integrate .. //depot/projects/davidxu_thread/src/release/doc/en_US.ISO8859-1/installation/common/install.sgml#2 integrate .. //depot/projects/davidxu_thread/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 integrate .. //depot/projects/davidxu_thread/src/release/doc/share/misc/dev.archlist.txt#6 integrate .. //depot/projects/davidxu_thread/src/sbin/dump/optr.c#3 integrate .. //depot/projects/davidxu_thread/src/sbin/fsck_ffs/fsck.h#2 integrate .. //depot/projects/davidxu_thread/src/sbin/fsck_ffs/pass5.c#2 integrate .. //depot/projects/davidxu_thread/src/sbin/geom/class/mirror/gmirror.8#3 integrate .. //depot/projects/davidxu_thread/src/sbin/geom/class/shsec/geom_shsec.c#2 integrate .. //depot/projects/davidxu_thread/src/sbin/geom/class/shsec/gshsec.8#2 integrate .. //depot/projects/davidxu_thread/src/sbin/geom/core/geom.8#3 integrate .. //depot/projects/davidxu_thread/src/sbin/ifconfig/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/sbin/ifconfig/ifcarp.c#1 branch .. //depot/projects/davidxu_thread/src/sbin/ifconfig/ifpfsync.c#1 branch .. //depot/projects/davidxu_thread/src/sbin/ipfw/ipfw.8#4 integrate .. //depot/projects/davidxu_thread/src/sbin/mdconfig/mdconfig.c#3 integrate .. //depot/projects/davidxu_thread/src/sbin/newfs/mkfs.c#3 integrate .. //depot/projects/davidxu_thread/src/sbin/savecore/savecore.8#3 integrate .. //depot/projects/davidxu_thread/src/sbin/savecore/savecore.c#3 integrate .. //depot/projects/davidxu_thread/src/sbin/sunlabel/sunlabel.c#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/Makefile.asm#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/Makefile.inc#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/Makefile.man#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/ASN1_STRING_length.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/ASN1_STRING_new.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BIO_ctrl.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BIO_f_base64.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BIO_f_buffer.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BIO_f_cipher.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BIO_f_md.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BIO_f_null.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BIO_f_ssl.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BIO_find_type.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BIO_new.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BIO_push.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BIO_read.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BIO_s_accept.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BIO_s_bio.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BIO_s_connect.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BIO_s_fd.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BIO_s_file.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BIO_s_mem.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BIO_s_null.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BIO_s_socket.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BIO_set_callback.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BIO_should_retry.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BN_CTX_new.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BN_CTX_start.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BN_add.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BN_add_word.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BN_bn2bin.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BN_cmp.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BN_copy.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BN_generate_prime.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BN_mod_inverse.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BN_new.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BN_num_bytes.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BN_rand.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BN_set_bit.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BN_swap.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/BN_zero.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/CONF_modules_free.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/CONF_modules_load_file.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/DH_generate_key.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/DH_generate_parameters.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/DH_get_ex_new_index.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/DH_new.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/DH_set_method.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/DH_size.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/DSA_SIG_new.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/DSA_do_sign.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/DSA_dup_DH.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/DSA_generate_key.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/DSA_generate_parameters.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/DSA_new.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/DSA_set_method.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/DSA_sign.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/DSA_size.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/ERR_GET_LIB.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/ERR_clear_error.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/ERR_error_string.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/ERR_get_error.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/ERR_load_strings.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/ERR_print_errors.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/ERR_put_error.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/ERR_remove_state.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/EVP_BytesToKey.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/EVP_DigestInit.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/EVP_EncryptInit.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/EVP_OpenInit.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/EVP_PKEY_new.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/EVP_SealInit.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/EVP_SignInit.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/EVP_VerifyInit.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/OBJ_nid2obj.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/OPENSSL_config.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/PKCS12_create.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/PKCS12_parse.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/PKCS7_decrypt.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/PKCS7_encrypt.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/PKCS7_sign.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/PKCS7_verify.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/RAND_add.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/RAND_bytes.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/RAND_cleanup.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/RAND_egd.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/RAND_load_file.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/RAND_set_rand_method.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/RSA_blinding_on.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/RSA_check_key.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/RSA_generate_key.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/RSA_new.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/RSA_print.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/RSA_private_encrypt.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/RSA_public_encrypt.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/RSA_set_method.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/RSA_sign.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/RSA_size.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/SMIME_read_PKCS7.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/SMIME_write_PKCS7.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/X509_NAME_print_ex.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/X509_new.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/bio.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/blowfish.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/bn.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/bn_internal.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/buffer.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/crypto.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/d2i_DHparams.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/d2i_DSAPublicKey.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/d2i_X509.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/d2i_X509_ALGOR.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/d2i_X509_CRL.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/d2i_X509_NAME.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/d2i_X509_REQ.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/d2i_X509_SIG.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/des.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/dh.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/dsa.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/engine.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/err.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/evp.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/hmac.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/lh_stats.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/lhash.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/md5.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/mdc2.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/pem.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/rand.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/rc4.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/ripemd.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/rsa.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/sha.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/threads.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/ui.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/man/ui_compat.3#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/Makefile.man#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/CA.pl.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/asn1parse.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/ca.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/ciphers.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/crl.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/crl2pkcs7.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/dgst.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/dhparam.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/dsa.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/dsaparam.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/enc.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/gendsa.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/genrsa.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/nseq.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/ocsp.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/openssl.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/passwd.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/pkcs12.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/pkcs7.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/pkcs8.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/rand.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/req.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/rsa.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/rsautl.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/s_client.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/s_server.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/s_time.1#1 branch .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/sess_id.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/smime.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/speed.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/spkac.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/verify.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/version.1#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.bin/openssl/man/x509.1#2 integrate .. //depot/projects/davidxu_thread/src/share/examples/etc/make.conf#5 integrate .. //depot/projects/davidxu_thread/src/share/man/man1/builtin.1#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/Makefile#7 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/acpi.4#5 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/carp.4#1 branch .. //depot/projects/davidxu_thread/src/share/man/man4/cpufreq.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/ed.4#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/em.4#4 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/fwohci.4#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/hfa.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/keyboard.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/lpt.4#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/pass.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/scsi.4#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/snd_neomagic.4#1 branch .. //depot/projects/davidxu_thread/src/share/man/man4/snd_sbc.4#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/umct.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man7/build.7#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man7/clocks.7#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man9/Makefile#6 integrate .. //depot/projects/davidxu_thread/src/share/man/man9/bpf.9#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man9/buf.9#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man9/contigmalloc.9#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man9/g_data.9#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man9/ifnet.9#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man9/malloc.9#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man9/memguard.9#1 branch .. //depot/projects/davidxu_thread/src/share/man/man9/mutex.9#3 integrate .. //depot/projects/davidxu_thread/src/share/mk/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/share/mk/bsd.endian.mk#1 branch .. //depot/projects/davidxu_thread/src/share/termcap/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/include/exec.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/linux/linux_machdep.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/osf1/osf1_misc.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/osf1/osf1_mount.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/osf1/osf1_util.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/amd64/legacy.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/include/exec.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/cpufunc.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/cpufunc_asm.S#3 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/fusu.S#3 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/genassym.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/locore.S#3 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/swtch.S#6 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/sys_machdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/arm/include/exec.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/arm/include/machdep.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/arm/include/pmap.h#4 integrate .. //depot/projects/davidxu_thread/src/sys/arm/include/proc.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/arm/include/sysarch.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/arm/xscale/i80321/iq31244_machdep.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/arm/xscale/i80321/std.i80321#2 integrate .. //depot/projects/davidxu_thread/src/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/davidxu_thread/src/sys/boot/common/loader.8#3 integrate .. //depot/projects/davidxu_thread/src/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/davidxu_thread/src/sys/cam/cam_periph.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/coda/coda_vfsops.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/coda/coda_vfsops.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/davidxu_thread/src/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/compat/ndis/hal_var.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/compat/ndis/ntoskrnl_var.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/compat/ndis/pe_var.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/compat/ndis/resource_var.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/compat/ndis/subr_hal.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/compat/ndis/subr_pe.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/compat/ndis/subr_usbd.c#1 branch .. //depot/projects/davidxu_thread/src/sys/compat/ndis/usbd_var.h#1 branch .. //depot/projects/davidxu_thread/src/sys/compat/ndis/winx64_wrap.S#1 branch .. //depot/projects/davidxu_thread/src/sys/compat/pecoff/imgact_pecoff.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/compat/svr4/svr4_signal.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/compat/svr4/svr4_signal.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/compat/svr4/svr4_sysvec.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/conf/NOTES#5 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files#5 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files.amd64#5 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files.i386#6 integrate .. //depot/projects/davidxu_thread/src/sys/conf/kern.post.mk#3 integrate .. //depot/projects/davidxu_thread/src/sys/conf/options#4 integrate .. //depot/projects/davidxu_thread/src/sys/conf/options.amd64#2 integrate .. //depot/projects/davidxu_thread/src/sys/conf/options.arm#2 integrate .. //depot/projects/davidxu_thread/src/sys/conf/options.i386#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/altq/altq/altq_var.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi_quirks#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi_throttle.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/advansys/adwlib.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/aic7xxx/aic79xx.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/aic7xxx/aic79xx_pci.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/aic7xxx/aic7xxx.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ar/if_ar.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/cardbus/cardbus_cis.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/digi/digi.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/dpt/dpt_eisa.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/dpt/dpt_pci.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_bufs.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ed/if_ed.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ed/if_ed_isa.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ed/if_ed_pci.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ed/if_ed_sic.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ed/if_ed_wd80x3.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ed/if_edvar.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/fe/if_fe.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/fe/if_fe_cbus.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/fe/if_fe_isa.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/fe/if_fe_pccard.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/fe/if_fereg.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/fe/if_fevar.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/fe/mb86960.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/hme/if_hme_pci.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/hptmv/entry.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/if_ndis/if_ndis_pccard.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/if_ndis/if_ndis_pci.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/if_ndis/if_ndis_usb.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/if_ndis/if_ndisvar.h#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/kbd/atkbd.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/mii/mii.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/mii/mii_physubr.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/pccard/card_if.m#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/pccard/pccard.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/pccard/pccard_cis.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/pccard/pccarddevs#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/pci/pci.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/puc/puc.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/puc/puc_pci.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/puc/puc_sbus.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/snc/dp83932.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/sr/if_sr.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/twe/twe.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/twe/tweio.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/utopia/idtphy.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/utopia/suni.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/utopia/utopia.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/utopia/utopia.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/utopia/utopia_priv.h#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/vkbd/vkbd.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/fs/deadfs/dead_vnops.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/fs/devfs/devfs.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/fs/nwfs/nwfs_vnops.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/fs/smbfs/smbfs_vnops.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/fs/udf/udf.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/fs/unionfs/union_vfsops.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/geom/gate/g_gate.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/geom/gate/g_gate.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/geom/geom_vfs.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/geom/mirror/g_mirror.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/geom/mirror/g_mirror.h#4 integrate .. //depot/projects/davidxu_thread/src/sys/geom/mirror/g_mirror_ctl.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/geom/raid3/g_raid3.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/geom/raid3/g_raid3.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/geom/raid3/g_raid3_ctl.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/geom/shsec/g_shsec.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/shsec/g_shsec.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/stripe/g_stripe.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/geom/stripe/g_stripe.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/vinum/geom_vinum_drive.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/geom/vinum/geom_vinum_var.h#4 integrate .. //depot/projects/davidxu_thread/src/sys/geom/vinum/geom_vinum_volume.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/gnu/ext2fs/ext2_linux_balloc.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/conf/NOTES#4 integrate .. //depot/projects/davidxu_thread/src/sys/i386/cpufreq/est.c#1 branch .. //depot/projects/davidxu_thread/src/sys/i386/cpufreq/p4tcc.c#1 branch .. //depot/projects/davidxu_thread/src/sys/i386/i386/io_apic.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/legacy.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/p4tcc.c#3 delete .. //depot/projects/davidxu_thread/src/sys/i386/ibcs2/ibcs2_msg.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/i386/include/_types.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/include/exec.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/isa/ic/mb86960.h#3 delete .. //depot/projects/davidxu_thread/src/sys/i386/isa/pcf.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/ia64/conf/NOTES#3 integrate .. //depot/projects/davidxu_thread/src/sys/ia64/include/exec.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/isofs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/cpufreq_if.m#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/imgact_shell.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/init_main.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_conf.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_event.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_exec.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_kse.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_module.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_poll.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_sig.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/kern/sched_ule.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/subr_bus.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/subr_eventhandler.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/uipc_accf.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/uipc_mbuf.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/kern/uipc_sem.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/kern/uipc_socket2.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_default.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_init.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/modules/Makefile#6 integrate .. //depot/projects/davidxu_thread/src/sys/modules/acpi/Makefile#4 integrate .. //depot/projects/davidxu_thread/src/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/modules/acpi/acpi_perf/Makefile#2 delete .. //depot/projects/davidxu_thread/src/sys/modules/auxio/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/modules/cpufreq/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/modules/ndis/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/sys/modules/utopia/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/net/if.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/net/if.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/net/if_clone.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/net/if_disc.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/net/if_faith.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/net/if_loop.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/net/if_media.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/net/if_stf.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/net/if_types.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/net/if_var.h#4 integrate .. //depot/projects/davidxu_thread/src/sys/net/if_vlan.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/net/if_vlan_var.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/net/rtsock.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_input.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/netatalk/aarp.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netatalk/at_control.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netatalk/at_extern.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/netatalk/at_var.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/netatalk/ddp_output.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netatalk/ddp_usrreq.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netatm/atm_cm.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netatm/atm_proto.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netatm/atm_socket.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netatm/atm_var.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/netatm/ipatm/ipatm_load.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/ng_ksocket.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/if_ether.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/if_ether.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/in.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/in_proto.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/ip_carp.c#1 branch .. //depot/projects/davidxu_thread/src/sys/netinet/ip_carp.h#1 branch .. //depot/projects/davidxu_thread/src/sys/netinet/ip_input.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/ip_output.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/tcp_var.h#4 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netinet6/in6.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netinet6/in6_var.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/netinet6/ipsec.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netinet6/nd6.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netipx/spx_usrreq.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netnatm/natm_proto.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netncp/ncp_nls.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/nfs4client/nfs4_vnops.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfs_socket.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfs_vnops.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/davidxu_thread/src/sys/pc98/i386/machdep.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/pccard/pccard_nbk.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/pci/agp_ali.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/pci/agp_amd.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/pci/agp_amd64.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/pci/agp_i810.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/pci/agp_intel.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/pci/agp_nvidia.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/pci/agp_sis.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/pci/agp_via.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/pci/alpm.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/pci/amdpm.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/pci/if_dc.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/pci/if_de.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/pci/if_mn.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/pci/if_pcn.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/pci/if_rl.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Feb 27 12:51:17 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1649716A4D0; Sun, 27 Feb 2005 12:51:17 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E66C416A4CE for ; Sun, 27 Feb 2005 12:51:16 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C37D143D58 for ; Sun, 27 Feb 2005 12:51:16 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1RCpGUi094933 for ; Sun, 27 Feb 2005 12:51:16 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1RCpGVk094930 for perforce@freebsd.org; Sun, 27 Feb 2005 12:51:16 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Feb 2005 12:51:16 GMT Message-Id: <200502271251.j1RCpGVk094930@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 71981 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Feb 2005 12:51:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=71981 Change 71981 by davidxu@davidxu_alona on 2005/02/27 12:50:15 Cleanup include. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#16 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_list.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_printf.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_syscalls.c#6 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#16 (text+ko) ==== @@ -27,7 +27,6 @@ * $FreeBSD$ */ -#include #include #include #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_list.c#5 (text+ko) ==== @@ -27,7 +27,6 @@ * $FreeBSD$ */ -#include #include #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_printf.c#4 (text+ko) ==== @@ -22,11 +22,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD$ */ -#include -__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_printf.c,v 1.4 2004/02/10 20:42:33 cperciva Exp $"); - #include #include #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_syscalls.c#6 (text+ko) ==== @@ -64,7 +64,6 @@ * */ -#include #include #include #include From owner-p4-projects@FreeBSD.ORG Sun Feb 27 13:18:52 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E064016A4D0; Sun, 27 Feb 2005 13:18:51 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B3E5816A4CE for ; Sun, 27 Feb 2005 13:18:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 87F5043D4C for ; Sun, 27 Feb 2005 13:18:51 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1RDIpkG096266 for ; Sun, 27 Feb 2005 13:18:51 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1RDIpFn096263 for perforce@freebsd.org; Sun, 27 Feb 2005 13:18:51 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Feb 2005 13:18:51 GMT Message-Id: <200502271318.j1RDIpFn096263@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 71984 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Feb 2005 13:18:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=71984 Change 71984 by davidxu@davidxu_alona on 2005/02/27 13:18:50 remove unneeded include. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_join.c#7 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_join.c#7 (text+ko) ==== @@ -32,7 +32,6 @@ * $FreeBSD$ */ -#include #include #include "thr_private.h" From owner-p4-projects@FreeBSD.ORG Sun Feb 27 13:21:57 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4FED16A4D0; Sun, 27 Feb 2005 13:21:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 66FA116A4CE for ; Sun, 27 Feb 2005 13:21:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C0E743D2D for ; Sun, 27 Feb 2005 13:21:56 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1RDLut9096593 for ; Sun, 27 Feb 2005 13:21:56 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1RDLt9v096590 for perforce@freebsd.org; Sun, 27 Feb 2005 13:21:55 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Feb 2005 13:21:55 GMT Message-Id: <200502271321.j1RDLt9v096590@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 71986 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Feb 2005 13:21:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=71986 Change 71986 by davidxu@davidxu_alona on 2005/02/27 13:21:26 revert last change. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_join.c#8 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_join.c#8 (text+ko) ==== @@ -32,6 +32,7 @@ * $FreeBSD$ */ +#include #include #include "thr_private.h" From owner-p4-projects@FreeBSD.ORG Sun Feb 27 13:32:09 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4DE3816A4D0; Sun, 27 Feb 2005 13:32:09 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0FB7316A4CE for ; Sun, 27 Feb 2005 13:32:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB74A43D62 for ; Sun, 27 Feb 2005 13:32:08 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1RDW8vF097029 for ; Sun, 27 Feb 2005 13:32:08 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1RDW8Bg097026 for perforce@freebsd.org; Sun, 27 Feb 2005 13:32:08 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Feb 2005 13:32:08 GMT Message-Id: <200502271332.j1RDW8Bg097026@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 71987 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Feb 2005 13:32:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=71987 Change 71987 by davidxu@davidxu_alona on 2005/02/27 13:31:16 Remove unneeded includes. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_create.c#9 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_create.c#9 (text+ko) ==== @@ -36,16 +36,11 @@ #include #include #include -#include -#include #include -#include -#include #include #include #include "thr_private.h" -#include "libc_private.h" static void free_thread(struct pthread *curthread, struct pthread *thread); static int create_stack(struct pthread_attr *pattr); From owner-p4-projects@FreeBSD.ORG Sun Feb 27 14:01:36 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCD2E16A4D0; Sun, 27 Feb 2005 14:01:35 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A3AF716A4CE for ; Sun, 27 Feb 2005 14:01:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE9C243D60 for ; Sun, 27 Feb 2005 14:01:34 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1RE1YE1098335 for ; Sun, 27 Feb 2005 14:01:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1RE0xsZ098310 for perforce@freebsd.org; Sun, 27 Feb 2005 14:00:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 27 Feb 2005 14:00:59 GMT Message-Id: <200502271400.j1RE0xsZ098310@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 Subject: PERFORCE change 71989 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Feb 2005 14:01:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=71989 Change 71989 by rwatson@rwatson_paprika on 2005/02/27 14:00:22 Integrate netperf_socket branch: - More /*- changes than you can shake a stick at. - Various and sundry busdma changes, including addition of bus_dmamap_load_mbuf_sg(). - Many more Linux and other emulated system calls invoke kern_* variants on native calls to avoid stack gap use. - Countless arm changes. - VFS cleanup activities: removal of vfs_start. - VFS MPSAFEty work, UFS MPSAFEty work.MPSAFEty work. - Buffer object work. File system in _open() responsible for vnode_create_vobject(). - Lots of NDIS, including USB support. - GEOM_SHSEC. - memguard(9). - netgraph_ipfw(4). - carp(4). - IPFIREWALL_FORWARD_EXTENDED. - POSIX semaphore fork(1) support. - if_ed road work. - cpufreq(4). - amr(4) MPSAFE. - ips(4) MPSAFE. - md(4) uses cpu-private mappings. - nmdm(4) rate limiting. - sio(4) tweak to avoid synchronization in the debugger. - LAPIC periodic timer. - A page for exec args. - securty.jail.cflags_allowed. - System V IPC MAC Framework calls. - Various 802.11 changes. - Various SACK bug fixes. - The normal plethora of style, spelling, etc, changes. - tcp_drop(8). - Many NFS client changes, including so_upcall, timestamp changes, etc. - BUS_PROBE_DEFAULT. - The usual spate of VM locking, optimizations, cleanup, etc. - cdev "in-use" counting - KTR_BUF - davidxu umtx work Netperf-related: - mbuf cluster optimization. - callout with mutex - solisten() now supported by solisten_proto_check(), solisten_proto(). - M_VLANTAG. - netatalk mbuf allocation fixes, use callouts (safely). Now runs NETISR_MPSAFE. - NET_NEEDS_GIANT() marking for netatm, netnatm. - Additional ng_callout instead of callout in netgraph modules. - Module locking loading/unloading bug fixes for netgraph modules. - IPv6 raw socket and ICMP locking fixes. - Loop-back of IPX/SPX locking+cleanup, netipx NETISR_MPSAFE. - raw_cb locking fixes, especially relating to PF_KEY. - nfsm_dissect_nonblock() and friends. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/busdma_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/clock.c#4 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/clock_if.m#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/cpuconf.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/db_disasm.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/db_instruction.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/db_interface.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_1000a.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_2100_a50.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_2100_a500.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_3000_300.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_3000_500.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_axppci_33.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_eb164.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_eb64plus.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_kn20aa.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_kn300.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_kn8ae.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_st550.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/divrem.m4#3 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/exception.s#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/gdb_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/in_cksum.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/interrupt.c#9 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/locore.s#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/machdep.c#13 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/pal.s#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#22 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/prom.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/prom_disp.s#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/promcons.c#10 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/support.s#4 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/trap.c#5 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/uio_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/vm_machdep.c#8 integrate .. //depot/projects/netperf_socket/sys/alpha/conf/GENERIC#15 integrate .. //depot/projects/netperf_socket/sys/alpha/conf/gethints.awk#2 delete .. //depot/projects/netperf_socket/sys/alpha/include/_limits.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/include/alpha_cpu.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/asm.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/bootinfo.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/bus.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/bus_memio.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/bus_pio.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/clock.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/clockvar.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/cpu.h#7 integrate .. //depot/projects/netperf_socket/sys/alpha/include/cpuconf.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/db_machdep.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/include/exec.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/float.h#4 integrate .. //depot/projects/netperf_socket/sys/alpha/include/floatingpoint.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/frame.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/gdb_machdep.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/include/ieee.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/include/ieeefp.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/intrcnt.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/kdb.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/limits.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/include/pal.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/param.h#7 integrate .. //depot/projects/netperf_socket/sys/alpha/include/pc/msdos.h#2 delete .. //depot/projects/netperf_socket/sys/alpha/include/pcb.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/include/pmap.h#9 integrate .. //depot/projects/netperf_socket/sys/alpha/include/proc.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/profile.h#4 integrate .. //depot/projects/netperf_socket/sys/alpha/include/prom.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/pte.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/ptrace.h#4 integrate .. //depot/projects/netperf_socket/sys/alpha/include/reg.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/reloc.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/resource.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/rpb.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/include/runq.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/signal.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/smp.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/include/vmparam.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/isa/isa_dma.c#4 integrate .. //depot/projects/netperf_socket/sys/alpha/isa/mcclock_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/linux_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/linux_sysvec.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/mcbus/mcbus.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/mcbus/mcbusreg.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/mcbus/mcbusvar.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/mcbus/mcmem.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/mcbus/mcpcia.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/mcbus/mcpciareg.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/mcbus/mcpciavar.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/exec_ecoff.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/imgact_osf1.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_ioctl.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_misc.c#9 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_mount.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_signal.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_sysvec.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_util.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/pci/alphapci_if.m#2 integrate .. //depot/projects/netperf_socket/sys/alpha/pci/apecs.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/pci/apecsreg.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/pci/cia.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/pci/cia_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/pci/ciareg.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/pci/lca.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/pci/lcareg.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/pci/pci_eb164_intr.s#2 integrate .. //depot/projects/netperf_socket/sys/alpha/pci/pci_eb64plus_intr.s#2 integrate .. //depot/projects/netperf_socket/sys/alpha/pci/pcibus.c#4 integrate .. //depot/projects/netperf_socket/sys/alpha/pci/t2.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/pci/t2reg.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/tlsb/dwlpx.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/tlsb/dwlpxreg.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/tlsb/dwlpxvar.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/tlsb/gbus.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/tlsb/kftxx.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/tlsb/kftxxreg.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/tlsb/mcclock_tlsb.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/tlsb/tlsb.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/tlsb/tlsbcpu.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/tlsb/tlsbmem.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/tlsb/tlsbreg.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/tlsb/tlsbvar.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/acpica/madt.c#6 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/apic_vector.S#5 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/busdma_machdep.c#10 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/db_disasm.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/db_interface.c#6 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/db_trace.c#7 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/exception.S#6 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/gdb_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/identcpu.c#7 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/in_cksum.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/intr_machdep.c#10 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/io_apic.c#6 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/legacy.c#5 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/local_apic.c#6 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#23 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mp_machdep.c#15 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mptable.c#6 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/nexus.c#8 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#33 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/prof_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/uio_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#15 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#21 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/NOTES#11 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/gethints.awk#2 delete .. //depot/projects/netperf_socket/sys/amd64/include/_limits.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/apicreg.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/netperf_socket/sys/amd64/include/bus_amd64.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/bus_dma.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/bus_memio.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/bus_pio.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/clock.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/cputypes.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/db_machdep.h#4 integrate .. //depot/projects/netperf_socket/sys/amd64/include/exec.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/float.h#6 integrate .. //depot/projects/netperf_socket/sys/amd64/include/gdb_machdep.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/intr_machdep.h#4 integrate .. //depot/projects/netperf_socket/sys/amd64/include/kdb.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/limits.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/metadata.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/mptable.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/param.h#7 integrate .. //depot/projects/netperf_socket/sys/amd64/include/pc/display.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/pci_cfgreg.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/pmap.h#14 integrate .. //depot/projects/netperf_socket/sys/amd64/include/proc.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/profile.h#7 integrate .. //depot/projects/netperf_socket/sys/amd64/include/ptrace.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/resource.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/runq.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/signal.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/smp.h#4 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/atpic.c#7 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/clock.c#7 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/elcr.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/isa.c#4 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/isa_dma.c#6 integrate .. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/pci/pci_bus.c#7 integrate .. //depot/projects/netperf_socket/sys/amd64/pci/pci_cfgreg.c#4 integrate .. //depot/projects/netperf_socket/sys/arm/arm/bcopy_page.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/bcopyinout.S#5 integrate .. //depot/projects/netperf_socket/sys/arm/arm/bcopyinout_xscale.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/blockio.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/bootconfig.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/bus_space_asm_generic.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/busdma_machdep.c#8 integrate .. //depot/projects/netperf_socket/sys/arm/arm/copystr.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc.c#6 integrate .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_arm10.S#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_arm3.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_arm67.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_arm7tdmi.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_arm8.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_arm9.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_armv4.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_ixp12x0.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_sa1.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_sa11x0.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_xscale.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/db_disasm.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/db_interface.c#4 integrate .. //depot/projects/netperf_socket/sys/arm/arm/db_trace.c#9 integrate .. //depot/projects/netperf_socket/sys/arm/arm/disassem.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/exception.S#5 integrate .. //depot/projects/netperf_socket/sys/arm/arm/fiq.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/fiq_subr.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/fusu.S#5 integrate .. //depot/projects/netperf_socket/sys/arm/arm/genassym.c#5 integrate .. //depot/projects/netperf_socket/sys/arm/arm/identcpu.c#4 integrate .. //depot/projects/netperf_socket/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/in_cksum_arm.S#4 integrate .. //depot/projects/netperf_socket/sys/arm/arm/intr.c#7 integrate .. //depot/projects/netperf_socket/sys/arm/arm/irq_dispatch.S#4 integrate .. //depot/projects/netperf_socket/sys/arm/arm/locore.S#6 integrate .. //depot/projects/netperf_socket/sys/arm/arm/machdep.c#7 integrate .. //depot/projects/netperf_socket/sys/arm/arm/nexus.c#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/nexus_io.c#4 integrate .. //depot/projects/netperf_socket/sys/arm/arm/nexus_io_asm.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/pmap.c#14 integrate .. //depot/projects/netperf_socket/sys/arm/arm/setcpsr.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/setstack.s#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/swtch.S#7 integrate .. //depot/projects/netperf_socket/sys/arm/arm/sys_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/arm/arm/trap.c#8 integrate .. //depot/projects/netperf_socket/sys/arm/arm/uio_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/arm/arm/undefined.c#5 integrate .. //depot/projects/netperf_socket/sys/arm/arm/vectors.S#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/vm_machdep.c#9 integrate .. //depot/projects/netperf_socket/sys/arm/conf/IQ31244#4 integrate .. //depot/projects/netperf_socket/sys/arm/include/_limits.h#3 integrate .. //depot/projects/netperf_socket/sys/arm/include/armreg.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/asm.h#4 integrate .. //depot/projects/netperf_socket/sys/arm/include/asmacros.h#3 integrate .. //depot/projects/netperf_socket/sys/arm/include/atomic.h#4 integrate .. //depot/projects/netperf_socket/sys/arm/include/bootconfig.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/bus.h#4 integrate .. //depot/projects/netperf_socket/sys/arm/include/bus_memio.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/bus_pio.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/cpu.h#4 integrate .. //depot/projects/netperf_socket/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/netperf_socket/sys/arm/include/cpufunc.h#6 integrate .. //depot/projects/netperf_socket/sys/arm/include/db_machdep.h#4 integrate .. //depot/projects/netperf_socket/sys/arm/include/disassem.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/endian.h#6 integrate .. //depot/projects/netperf_socket/sys/arm/include/exec.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/fiq.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/float.h#3 integrate .. //depot/projects/netperf_socket/sys/arm/include/fp.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/frame.h#3 integrate .. //depot/projects/netperf_socket/sys/arm/include/ieee.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/ieeefp.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/intr.h#3 integrate .. //depot/projects/netperf_socket/sys/arm/include/katelib.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/kdb.h#3 integrate .. //depot/projects/netperf_socket/sys/arm/include/limits.h#3 integrate .. //depot/projects/netperf_socket/sys/arm/include/machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/metadata.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/pcb.h#5 integrate .. //depot/projects/netperf_socket/sys/arm/include/pmap.h#7 integrate .. //depot/projects/netperf_socket/sys/arm/include/proc.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/profile.h#5 integrate .. //depot/projects/netperf_socket/sys/arm/include/psl.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/pte.h#3 integrate .. //depot/projects/netperf_socket/sys/arm/include/resource.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/runq.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/signal.h#5 integrate .. //depot/projects/netperf_socket/sys/arm/include/stdarg.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/swi.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/sysarch.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/trap.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/undefined.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/vmparam.h#4 integrate .. //depot/projects/netperf_socket/sys/arm/sa11x0/assabet_machdep.c#8 integrate .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_io.c#4 integrate .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_io_asm.S#2 integrate .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_irq.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_ost.c#3 integrate .. //depot/projects/netperf_socket/sys/arm/sa11x0/uart_bus_sa1110.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/sa11x0/uart_dev_sa1110.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/files.i80321#2 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/files.iq31244#2 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/i80321.c#3 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/i80321_intr.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/i80321_mcu.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/i80321_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/i80321_space.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/i80321reg.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/i80321var.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/iq31244_machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/iq80321reg.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/iq80321var.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/obio.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/obio_space.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/obiovar.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/std.i80321#3 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/uart_bus_i80321.c#3 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/uart_cpu_i80321.c#3 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/xscalereg.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/xscalevar.h#2 integrate .. //depot/projects/netperf_socket/sys/boot/README#2 integrate .. //depot/projects/netperf_socket/sys/boot/common/loader.8#11 integrate .. //depot/projects/netperf_socket/sys/boot/common/ufsread.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/efi/include/README#2 integrate .. //depot/projects/netperf_socket/sys/boot/efi/libefi/efiboot.h#2 integrate .. //depot/projects/netperf_socket/sys/boot/efi/libefi/time.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/forth/loader.4th.8#3 integrate .. //depot/projects/netperf_socket/sys/boot/forth/loader.conf#15 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0.S#7 integrate .. //depot/projects/netperf_socket/sys/boot/ia64/efi/conf.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/ia64/efi/efimd.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/ia64/ski/acpi_stub.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/ia64/ski/conf.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/ia64/ski/efi_stub.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/ia64/ski/elf_freebsd.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/ia64/ski/pal_stub.S#2 integrate .. //depot/projects/netperf_socket/sys/boot/ia64/ski/sal_stub.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/ia64/ski/start.S#2 integrate .. //depot/projects/netperf_socket/sys/boot/ia64/ski/time.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/libofw.h#3 integrate .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/ofw_console.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/ofw_disk.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/ofw_memory.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/ofw_net.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/ofw_reboot.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/ofw_time.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/openfirm.c#4 integrate .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/openfirm.h#3 integrate .. //depot/projects/netperf_socket/sys/boot/powerpc/loader/start.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/sparc64/boot1/boot1.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/sparc64/loader/locore.S#2 integrate .. //depot/projects/netperf_socket/sys/boot/sparc64/loader/main.c#5 integrate .. //depot/projects/netperf_socket/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/netperf_socket/sys/cam/cam.c#2 integrate .. //depot/projects/netperf_socket/sys/cam/cam.h#2 integrate .. //depot/projects/netperf_socket/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/netperf_socket/sys/cam/cam_debug.h#2 integrate .. //depot/projects/netperf_socket/sys/cam/cam_periph.c#3 integrate .. //depot/projects/netperf_socket/sys/cam/cam_periph.h#4 integrate .. //depot/projects/netperf_socket/sys/cam/cam_queue.c#2 integrate .. //depot/projects/netperf_socket/sys/cam/cam_queue.h#2 integrate .. //depot/projects/netperf_socket/sys/cam/cam_sim.c#2 integrate .. //depot/projects/netperf_socket/sys/cam/cam_sim.h#2 integrate .. //depot/projects/netperf_socket/sys/cam/cam_xpt.c#8 integrate .. //depot/projects/netperf_socket/sys/cam/cam_xpt.h#2 integrate .. //depot/projects/netperf_socket/sys/cam/cam_xpt_periph.h#2 integrate .. //depot/projects/netperf_socket/sys/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_cd.c#4 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_ch.c#4 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_ch.h#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_da.c#9 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_da.h#3 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_dvcfg.h#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_iu.h#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_low.h#3 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_low_pisa.c#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_low_pisa.h#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_message.h#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_pass.c#4 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_pass.h#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_pt.c#4 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_pt.h#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_sa.c#4 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_sa.h#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_ses.c#4 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_ses.h#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_target.c#5 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_targetio.h#2 integrate .. //depot/projects/netperf_socket/sys/coda/cnode.h#4 integrate .. //depot/projects/netperf_socket/sys/coda/coda.h#3 integrate .. //depot/projects/netperf_socket/sys/coda/coda_fbsd.c#7 integrate .. //depot/projects/netperf_socket/sys/coda/coda_io.h#2 integrate .. //depot/projects/netperf_socket/sys/coda/coda_kernel.h#2 integrate .. //depot/projects/netperf_socket/sys/coda/coda_namecache.c#2 integrate .. //depot/projects/netperf_socket/sys/coda/coda_namecache.h#2 integrate .. //depot/projects/netperf_socket/sys/coda/coda_opstats.h#2 integrate .. //depot/projects/netperf_socket/sys/coda/coda_pioctl.h#2 integrate .. //depot/projects/netperf_socket/sys/coda/coda_psdev.c#4 integrate .. //depot/projects/netperf_socket/sys/coda/coda_psdev.h#3 integrate .. //depot/projects/netperf_socket/sys/coda/coda_subr.c#3 integrate .. //depot/projects/netperf_socket/sys/coda/coda_subr.h#2 integrate .. //depot/projects/netperf_socket/sys/coda/coda_venus.c#4 integrate .. //depot/projects/netperf_socket/sys/coda/coda_venus.h#3 integrate .. //depot/projects/netperf_socket/sys/coda/coda_vfsops.c#8 integrate .. //depot/projects/netperf_socket/sys/coda/coda_vfsops.h#2 integrate .. //depot/projects/netperf_socket/sys/coda/coda_vnops.c#6 integrate .. //depot/projects/netperf_socket/sys/coda/coda_vnops.h#4 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_misc.c#10 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_proto.h#11 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscall.h#11 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscalls.c#11 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_sysent.c#11 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/syscalls.master#10 integrate .. //depot/projects/netperf_socket/sys/compat/ia32/ia32_sysvec.c#6 integrate .. //depot/projects/netperf_socket/sys/compat/linprocfs/linprocfs.c#7 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_file.c#7 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_getcwd.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_ioctl.c#7 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_ioctl.h#6 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_ipc.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_mib.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_misc.c#9 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_signal.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_socket.c#7 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_stats.c#8 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_sysctl.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_uid16.c#5 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_util.c#4 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_util.h#4 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/cfg_var.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/hal_var.h#4 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#20 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/kern_windrv.c#1 branch .. //depot/projects/netperf_socket/sys/compat/ndis/ndis_var.h#11 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/ntoskrnl_var.h#11 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/pe_var.h#4 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/resource_var.h#3 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_hal.c#7 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ndis.c#17 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#20 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_usbd.c#1 branch .. //depot/projects/netperf_socket/sys/compat/ndis/usbd_var.h#1 branch .. //depot/projects/netperf_socket/sys/compat/ndis/winx64_wrap.S#1 branch .. //depot/projects/netperf_socket/sys/compat/netbsd/dvcfg.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/netbsd/physio_proc.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/pecoff/imgact_pecoff.c#5 integrate .. //depot/projects/netperf_socket/sys/compat/pecoff/imgact_pecoff.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/imgact_svr4.c#4 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_acl.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_dirent.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_errno.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_exec.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_fcntl.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_filio.c#5 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_filio.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_fuser.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_hrt.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_ioctl.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_ioctl.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_ipc.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_ipc.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_misc.c#7 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_mman.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_resource.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_resource.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_siginfo.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_signal.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_signal.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_socket.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_socket.h#3 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_sockio.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_sockmod.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_stat.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_statvfs.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_stream.c#6 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_stropts.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_sysconfig.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_systeminfo.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_sysvec.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_termios.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_termios.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_time.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_timod.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_ttold.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_ttold.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_types.h#4 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_ucontext.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_ulimit.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_ustat.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_util.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_utsname.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_wait.h#2 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.alpha#5 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.amd64#4 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.arm#5 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.i386#4 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.ia64#4 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.pc98#4 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.powerpc#6 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.sparc64#4 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#48 integrate .. //depot/projects/netperf_socket/sys/conf/files#59 integrate .. //depot/projects/netperf_socket/sys/conf/files.alpha#9 integrate .. //depot/projects/netperf_socket/sys/conf/files.amd64#20 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#33 integrate .. //depot/projects/netperf_socket/sys/conf/files.pc98#19 integrate .. //depot/projects/netperf_socket/sys/conf/files.sparc64#14 integrate .. //depot/projects/netperf_socket/sys/conf/kern.post.mk#13 integrate .. //depot/projects/netperf_socket/sys/conf/kern.pre.mk#17 integrate .. //depot/projects/netperf_socket/sys/conf/kmod.mk#21 integrate .. //depot/projects/netperf_socket/sys/conf/newvers.sh#6 integrate .. //depot/projects/netperf_socket/sys/conf/options#35 integrate .. //depot/projects/netperf_socket/sys/conf/options.amd64#8 integrate .. //depot/projects/netperf_socket/sys/conf/options.i386#8 integrate .. //depot/projects/netperf_socket/sys/conf/options.pc98#10 integrate .. //depot/projects/netperf_socket/sys/contrib/altq/altq/altq_subr.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/altq/altq/altq_var.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dsutils.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsinit.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/oltr/if_oltr.c#6 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/oltr/if_oltr_isa.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/oltr/if_oltr_pci.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/oltr/if_oltrvar.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/fil.c#6 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.c#10 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.c#13 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf.c#19 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_if.c#7 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_ioctl.c#12 integrate .. //depot/projects/netperf_socket/sys/ddb/db_access.c#3 integrate .. //depot/projects/netperf_socket/sys/ddb/db_access.h#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_break.c#3 integrate .. //depot/projects/netperf_socket/sys/ddb/db_break.h#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_command.c#7 integrate .. //depot/projects/netperf_socket/sys/ddb/db_command.h#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_examine.c#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_expr.c#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_input.c#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_lex.c#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_lex.h#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_main.c#3 integrate .. //depot/projects/netperf_socket/sys/ddb/db_output.c#5 integrate .. //depot/projects/netperf_socket/sys/ddb/db_output.h#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_print.c#3 integrate .. //depot/projects/netperf_socket/sys/ddb/db_run.c#4 integrate .. //depot/projects/netperf_socket/sys/ddb/db_sym.c#3 integrate .. //depot/projects/netperf_socket/sys/ddb/db_sym.h#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_thread.c#4 integrate .. //depot/projects/netperf_socket/sys/ddb/db_variables.c#4 integrate .. //depot/projects/netperf_socket/sys/ddb/db_variables.h#3 integrate .. //depot/projects/netperf_socket/sys/ddb/db_watch.c#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_watch.h#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_write_cmd.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_cam.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_pci.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aacreg.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#44 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cpu.c#15 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_ec.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_if.m#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_package.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci.c#18 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci_link.c#19 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib.c#15 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_perf.c#1 branch .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_quirks#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_resource.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_thermal.c#15 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_throttle.c#1 branch .. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#25 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adv_eisa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adv_isa.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adv_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/advansys.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/advansys.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/advlib.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/advlib.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/advmcode.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/advmcode.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adw_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adwcam.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adwlib.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adwlib.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adwmcode.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adwmcode.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adwvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/aha/aha.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aha/aha_isa.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/aha/aha_mca.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/aha/ahareg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ahb/ahb.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ahb/ahbreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic/aic6360reg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/ahc_eisa.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/ahc_isa.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/ahc_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/ahd_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7770.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.h#8 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.reg#5 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.seq#5 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx_inline.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx_osm.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx_osm.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx.reg#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx.seq#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx_93cx6.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx_93cx6.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx_osm.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx_osm.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic_osm_lib.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic_osm_lib.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aicasm/aicasm.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aicasm/aicasm.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/amd/amd.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/amd/amd.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amr.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amr_cam.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amr_disk.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amr_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amrreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amrvar.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/an/if_aironet_ieee.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/an/if_an.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/an/if_an_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/an/if_an_pccard.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ar/if_ar.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ar/if_ar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ar/if_ar_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ar/if_arregs.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/asr/dptalign.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/asr/dptsig.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/asr/i2oadptr.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/asr/i2obscsi.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/asr/i2odep.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/asr/i2odpt.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/asr/i2oexec.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/asr/i2omsg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/asr/i2otypes.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/asr/i2outil.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/asr/osd_defs.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/asr/osd_unix.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/asr/osd_util.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/asr/sys_info.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#23 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-card.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-cd.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ath/if_ath.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/ath/if_ath_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/auxio/auxio.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/auxio/auxioreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/awi/if_awi_pccard.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/bfe/if_bfe.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/bfe/if_bfereg.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#16 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_audio.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_audio.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_card.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_card.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_core.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_core.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_mem.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_mem.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_os.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_os.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_reg.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_tuner.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_tuner.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/ioctl_meteor.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/buslogic/bt.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/buslogic/bt_eisa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/buslogic/bt_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/buslogic/btreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/cardbus/cardbus.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/cardbus/cardbus_cis.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/cardbus/cardbus_cis.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/cardbus/cardbusreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/cardbus/cardbusvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/ciss.c#15 integrate .. //depot/projects/netperf_socket/sys/dev/cnw/if_cnwioctl.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/cp/cpddk.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/cp/cpddk.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/cp/if_cp.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/cp/ng_cp.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/cpufreq/ichss.c#1 branch .. //depot/projects/netperf_socket/sys/dev/cs/if_cs.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/cs/if_cs_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/cs/if_cs_pccard.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/cs/if_csreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/cs/if_csvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ct/bshw_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ct/bshwvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ct/ct.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ct/ct_isa.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ct/ct_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ct/ctvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/am8530.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/ctau.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/ctaureg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/ctddk.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/ctddk.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/ds2153.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/hdc64570.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/if_ct.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/lxt318.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/ng_ct.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/cx/cronyxfw.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/cx/csigma.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/cx/cxddk.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/cx/cxddk.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/cx/cxreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#21 integrate .. //depot/projects/netperf_socket/sys/dev/cx/machdep.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/cx/ng_cx.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/cy/cy_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons_crom.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons_os.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/dec/mc146818reg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/dec/mcclock.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/dec/mcclock_if.m#2 integrate .. //depot/projects/netperf_socket/sys/dev/dec/mcclockvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/dpt/dpt.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/dpt/dpt_eisa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/dpt/dpt_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/dpt/dpt_scsi.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/ati_pcigart.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drmP.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_agpsupport.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_auth.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_bufs.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_context.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_dma.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_drawable.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_drv.h#7 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_fops.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_ioctl.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_irq.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_linux_list.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_lock.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_memory.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_memory_debug.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_os_freebsd.h#7 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_pci.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_sarea.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_scatter.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_sysctl.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_vm.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/drm/mga.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/mga_dma.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/mga_drm.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/mga_drv.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/mga_irq.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/mga_state.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/mga_ucode.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/mga_warp.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/r128.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/r128_cce.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/r128_drm.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/r128_drv.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/r128_irq.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/r128_state.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/drm/radeon.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/radeon_drm.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/radeon_drv.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/radeon_drv.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/radeon_mem.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/radeon_state.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/drm/sis.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/sis_drv.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/sis_drv.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/sis_ds.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/sis_ds.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/sis_mm.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/drm/tdfx.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ed/if_ed.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/ed/if_ed98.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ed/if_ed_3c503.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ed/if_ed_cbus.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ed/if_ed_hpp.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ed/if_ed_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ed/if_ed_novell.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ed/if_ed_pccard.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ed/if_ed_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ed/if_ed_sic.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ed/if_ed_wd80x3.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ed/if_edreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ed/if_edvar.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/eisa/eisa_if.m#2 integrate .. //depot/projects/netperf_socket/sys/dev/eisa/eisaconf.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/eisa/eisaconf.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/em/LICENSE#2 integrate .. //depot/projects/netperf_socket/sys/dev/em/if_em.c#16 integrate .. //depot/projects/netperf_socket/sys/dev/em/if_em.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/en/if_en_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/en/midway.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/en/midwayvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ep/if_ep.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ep/if_ep_eisa.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ep/if_ep_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ep/if_ep_mca.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ep/if_ep_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ep/if_epreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ep/if_epvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/esp/ncr53c9x.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/esp/ncr53c9xreg.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/esp/ncr53c9xvar.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/ex/if_ex.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/ex/if_ex_pccard.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ex/if_exreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/exca/exca.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/exca/excareg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/exca/excavar.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/fatm/firmware.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/fatm/if_fatm.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/fatm/if_fatm_rate.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/fatm/if_fatmreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/fatm/if_fatmvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/fb/gallant12x22.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/fb/gfb.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/fb/tga.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc_isa.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc_pccard.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdcvar.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/fe/if_fe.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/fe/if_fe_cbus.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/fe/if_fe_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/fe/if_fe_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/fe/if_fereg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/fe/if_fevar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/fe/mb86960.h#1 branch .. //depot/projects/netperf_socket/sys/dev/firewire/firewire.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/firewire.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/firewire_phy.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/firewirereg.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwdev.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwdma.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwdma.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwmem.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwmem.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwohci.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwohci_pci.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwohcireg.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwohcivar.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwphyreg.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/iec13213.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/iec68113.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/if_fwe.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/if_fwevar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/if_fwip.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/if_fwipvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/sbp.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/sbp.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/sbp_targ.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#16 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxpreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxpvar.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/rcvbundl.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/gem/if_gem_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/gem/if_gemreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/gfb/gfb_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/gfb/gfb_pci.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/harp/if_harp.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/hatm/if_hatm.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/hatm/if_hatm_intr.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hatm/if_hatm_ioctl.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hatm/if_hatm_rx.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hatm/if_hatm_tx.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hatm/if_hatmconf.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/hatm/if_hatmreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/hatm/if_hatmvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/fore.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/fore_aali.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/fore_command.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/fore_if.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/fore_include.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/fore_init.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/fore_intr.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/fore_output.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/fore_slave.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/fore_stats.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/fore_stats.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/fore_var.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/fore_vcm.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hifn/hifn7751.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/hifn/hifn7751reg.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/hifn/hifn7751var.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme_pci.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/hptmv/entry.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/hptmv/global.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/hptmv/hptintf.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/hptmv/mv.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hptmv/mvOs.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/hptmv/osbsd.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ic/cd180.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ic/hd64570.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ic/i8237.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ic/sab82532.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ic/wd33c93reg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ic/z8530.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ichsmb/ichsmb.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ichsmb/ichsmb_reg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ichsmb/ichsmb_var.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ichwd/ichwd.c#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Feb 27 17:11:29 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAF0E16A4D0; Sun, 27 Feb 2005 17:11:28 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A8D1216A4CE for ; Sun, 27 Feb 2005 17:11:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3172343D53 for ; Sun, 27 Feb 2005 17:11:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1RHBSqr018481 for ; Sun, 27 Feb 2005 17:11:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1RHBRHA018478 for perforce@freebsd.org; Sun, 27 Feb 2005 17:11:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 27 Feb 2005 17:11:27 GMT Message-Id: <200502271711.j1RHBRHA018478@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 Subject: PERFORCE change 72015 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Feb 2005 17:11:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=72015 Change 72015 by rwatson@rwatson_paprika on 2005/02/27 17:10:41 Further integration of netperf_socket: - cpufreq locking. Affected files ... .. //depot/projects/netperf_socket/sys/conf/files#60 integrate .. //depot/projects/netperf_socket/sys/conf/options.arm#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/zs/zs_sbus.c#5 delete .. //depot/projects/netperf_socket/sys/i386/cpufreq/est.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/cpufreq/p4tcc.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/agp_ali.c#8 integrate .. //depot/projects/netperf_socket/sys/sparc64/conf/GENERIC#18 integrate .. //depot/projects/netperf_socket/sys/sparc64/conf/NOTES#11 integrate .. //depot/projects/netperf_socket/sys/sys/param.h#34 integrate Differences ... ==== //depot/projects/netperf_socket/sys/conf/files#60 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1000 2005/02/26 00:25:43 marius Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1001 2005/02/27 15:23:57 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -881,8 +881,6 @@ dev/xe/if_xe.c optional xe dev/xe/if_xe_pccard.c optional xe pccard dev/zs/zs.c optional zs -dev/zs/zs_sbus.c optional zs fhc -dev/zs/zs_sbus.c optional zs sbus fs/deadfs/dead_vnops.c standard fs/devfs/devfs_devs.c standard fs/devfs/devfs_rule.c standard ==== //depot/projects/netperf_socket/sys/conf/options.arm#4 (text+ko) ==== @@ -1,6 +1,7 @@ -#$FreeBSD: src/sys/conf/options.arm,v 1.3 2004/11/10 22:08:27 cognet Exp $ +#$FreeBSD: src/sys/conf/options.arm,v 1.4 2005/02/26 22:41:07 cognet Exp $ ARM32_NEW_VM_LAYOUT opt_vm.h ARM9_CACHE_WRITE_THROUGH opt_global.h +ARM_CACHE_LOCK_ENABLE opt_global.h ARMFPE opt_global.h CPU_SA1100 opt_global.h CPU_SA1110 opt_global.h ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi_perf.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_perf.c,v 1.12 2005/02/22 06:34:53 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_perf.c,v 1.14 2005/02/27 02:43:02 njl Exp $"); #include "opt_acpi.h" #include @@ -152,6 +152,11 @@ return; if (ACPI_FAILURE(AcpiEvaluateObject(handle, "_PSS", NULL, NULL))) return; + + /* + * Add a child to every CPU that has the right methods. In future + * versions of the ACPI spec, CPUs can have different settings. + */ if (BUS_ADD_CHILD(parent, 0, "acpi_perf", -1) == NULL) device_printf(parent, "add acpi_perf child failed\n"); } @@ -211,8 +216,9 @@ sc->px_curr_state = CPUFREQ_VAL_UNKNOWN; if (acpi_perf_evaluate(dev) != 0) return (ENXIO); - cpufreq_register(dev); AcpiOsQueueForExecution(OSD_PRIORITY_LO, acpi_px_startup, NULL); + if (!sc->info_only) + cpufreq_register(dev); return (0); } ==== //depot/projects/netperf_socket/sys/dev/cpufreq/ichss.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cpufreq/ichss.c,v 1.7 2005/02/22 06:31:45 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cpufreq/ichss.c,v 1.8 2005/02/27 02:43:02 njl Exp $"); #include #include @@ -166,7 +166,11 @@ if (devclass_get_device(ichss_devclass, 0)) return (ENXIO); - /* Add a child under the CPU parent. */ + /* + * Add a child under the CPU parent. It appears that ICH SpeedStep + * only requires a single CPU to set the value (since the chipset + * is shared by all CPUs.) Thus, we only add a child to cpu 0. + */ parent = devclass_get_device(devclass_find("cpu"), 0); KASSERT(parent != NULL, ("cpu parent is NULL")); child = BUS_ADD_CHILD(parent, 0, "ichss", 0); ==== //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#17 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.223 2005/02/15 17:47:57 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.224 2005/02/27 15:12:50 mux Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver @@ -449,10 +449,19 @@ fxp_autosize_eeprom(sc); /* + * Find out the chip revision; lump all 82557 revs together. + */ + fxp_read_eeprom(sc, &data, 5, 1); + if ((data >> 8) == 1) + sc->revision = FXP_REV_82557; + else + sc->revision = pci_get_revid(dev); + + /* * Determine whether we must use the 503 serial interface. */ fxp_read_eeprom(sc, &data, 6, 1); - if (sc->revision <= FXP_REV_82557 && (data & FXP_PHY_DEVICE_MASK) != 0 + if (sc->revision == FXP_REV_82557 && (data & FXP_PHY_DEVICE_MASK) != 0 && (data & FXP_PHY_SERIAL_ONLY)) sc->flags |= FXP_FLAG_SERIAL_MEDIA; @@ -490,15 +499,6 @@ sc->rnr = 0; /* - * Find out the chip revision; lump all 82557 revs together. - */ - fxp_read_eeprom(sc, &data, 5, 1); - if ((data >> 8) == 1) - sc->revision = FXP_REV_82557; - else - sc->revision = pci_get_revid(dev); - - /* * Enable workarounds for certain chip revision deficiencies. * * Systems based on the ICH2/ICH2-M chip from Intel, and possibly ==== //depot/projects/netperf_socket/sys/i386/cpufreq/est.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/cpufreq/est.c,v 1.3 2005/02/24 20:20:11 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/cpufreq/est.c,v 1.4 2005/02/27 02:43:02 njl Exp $"); #include #include @@ -582,6 +582,10 @@ if ((p[2] & 0x80) == 0) return; + /* + * We add a child for each CPU since settings must be performed + * on each CPU in the SMP case. + */ if (BUS_ADD_CHILD(parent, 0, "est", -1) == NULL) device_printf(parent, "add est child failed\n"); } ==== //depot/projects/netperf_socket/sys/i386/cpufreq/p4tcc.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/cpufreq/p4tcc.c,v 1.9 2005/02/23 16:42:56 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/cpufreq/p4tcc.c,v 1.10 2005/02/27 02:43:02 njl Exp $"); #include #include @@ -102,6 +102,17 @@ if ((cpu_feature & (CPUID_ACPI | CPUID_TM)) != (CPUID_ACPI | CPUID_TM)) return; + + /* Make sure we're not being doubly invoked. */ + if (device_find_child(parent, "p4tcc", -1) != NULL) + return; + + /* + * We attach a p4tcc child for every CPU since settings need to + * be performed on every CPU in the SMP case. See section 13.15.3 + * of the IA32 Intel Architecture Software Developer's Manual, + * Volume 3, for more info. + */ if (BUS_ADD_CHILD(parent, 0, "p4tcc", -1) == NULL) device_printf(parent, "add p4tcc child failed\n"); } ==== //depot/projects/netperf_socket/sys/kern/kern_cpu.c#2 (text+ko) ==== @@ -25,13 +25,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_cpu.c,v 1.10 2005/02/24 20:21:41 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_cpu.c,v 1.12 2005/02/27 01:34:08 njl Exp $"); #include #include #include #include #include +#include #include #include #include @@ -40,6 +41,7 @@ #include #include #include +#include #include #include "cpufreq_if.h" @@ -56,6 +58,7 @@ #define CF_MAX_LEVELS 64 struct cpufreq_softc { + struct sx lock; struct cf_level curr_level; int curr_priority; struct cf_level saved_level; @@ -75,6 +78,11 @@ TAILQ_HEAD(cf_setting_lst, cf_setting_array); +#define CF_MTX_INIT(x) sx_init((x), "cpufreq lock") +#define CF_MTX_LOCK(x) sx_xlock((x)) +#define CF_MTX_UNLOCK(x) sx_xunlock((x)) +#define CF_MTX_ASSERT(x) sx_assert((x), SX_XLOCKED) + static int cpufreq_attach(device_t dev); static int cpufreq_detach(device_t dev); static void cpufreq_evaluate(void *arg); @@ -109,7 +117,13 @@ static devclass_t cpufreq_dc; DRIVER_MODULE(cpufreq, cpu, cpufreq_driver, cpufreq_dc, 0, 0); -static eventhandler_tag cf_ev_tag; +static eventhandler_tag cf_ev_tag; + +static int cf_lowest_freq; +TUNABLE_INT("debug.cpufreq.lowest", &cf_lowest_freq); +SYSCTL_NODE(_debug, OID_AUTO, cpufreq, CTLFLAG_RD, NULL, "cpufreq debugging"); +SYSCTL_INT(_debug_cpufreq, OID_AUTO, lowest, CTLFLAG_RW, &cf_lowest_freq, 1, + "Don't provide levels below this frequency."); static int cpufreq_attach(device_t dev) @@ -123,6 +137,7 @@ sc->dev = dev; sysctl_ctx_init(&sc->sysctl_ctx); TAILQ_INIT(&sc->all_levels); + CF_MTX_INIT(&sc->lock); sc->curr_level.total_set.freq = CPUFREQ_VAL_UNKNOWN; sc->saved_level.total_set.freq = CPUFREQ_VAL_UNKNOWN; sc->max_mhz = CPUFREQ_VAL_UNKNOWN; @@ -182,6 +197,8 @@ int cpu_id, error, i; sc = device_get_softc(dev); + error = 0; + set = NULL; /* * Check that the TSC isn't being used as a timecounter. @@ -197,18 +214,29 @@ * If they did specify one, but the requested level has a lower * priority, don't allow the new level right now. */ + CF_MTX_LOCK(&sc->lock); if (level == NULL) { if (sc->saved_level.total_set.freq != CPUFREQ_VAL_UNKNOWN) { level = &sc->saved_level; priority = sc->saved_priority; - } else - return (ENXIO); - } else if (priority < sc->curr_priority) - return (EPERM); + } else { + error = ENXIO; + goto out; + } + } else if (priority < sc->curr_priority) { + error = EPERM; + goto out; + } + + /* Reject levels that are below our specified threshold. */ + if (level->total_set.freq <= cf_lowest_freq) { + error = EINVAL; + goto out; + } /* If already at this level, just return. */ if (CPUFREQ_CMP(sc->curr_level.total_set.freq, level->total_set.freq)) - return (0); + goto out; /* First, set the absolute frequency via its driver. */ set = &level->abs_set; @@ -287,7 +315,8 @@ error = 0; out: - if (error) + CF_MTX_UNLOCK(&sc->lock); + if (error && set) device_printf(set->dev, "set freq failed, err %d\n", error); return (error); } @@ -304,12 +333,15 @@ uint64_t rate; sc = device_get_softc(dev); - curr_set = &sc->curr_level.total_set; + error = 0; levels = NULL; /* If we already know the current frequency, we're done. */ + CF_MTX_LOCK(&sc->lock); + curr_set = &sc->curr_level.total_set; if (curr_set->freq != CPUFREQ_VAL_UNKNOWN) goto out; + CF_MTX_UNLOCK(&sc->lock); /* * We need to figure out the current level. Loop through every @@ -324,11 +356,24 @@ if (error) { if (error == E2BIG) printf("cpufreq: need to increase CF_MAX_LEVELS\n"); - goto out; + free(levels, M_TEMP); + return (error); } error = device_get_children(device_get_parent(dev), &devs, &numdevs); - if (error) - goto out; + if (error) { + free(levels, M_TEMP); + return (error); + } + + /* + * Reacquire the lock and search for the given level. + * + * XXX Note: this is not quite right since we really need to go + * through each level and compare both absolute and relative + * settings for each driver in the system before making a match. + * The estimation code below catches this case though. + */ + CF_MTX_LOCK(&sc->lock); for (i = 0; i < numdevs && curr_set->freq == CPUFREQ_VAL_UNKNOWN; i++) { if (!device_is_attached(devs[i])) continue; @@ -365,10 +410,13 @@ } out: + if (error == 0) + *level = sc->curr_level; + + CF_MTX_UNLOCK(&sc->lock); if (levels) free(levels, M_TEMP); - *level = sc->curr_level; - return (0); + return (error); } static int @@ -399,6 +447,7 @@ } /* Get settings from all cpufreq drivers. */ + CF_MTX_LOCK(&sc->lock); for (i = 0; i < numdevs; i++) { /* Skip devices that aren't ready. */ if (!device_is_attached(devs[i])) @@ -474,6 +523,12 @@ /* Finally, output the list of levels. */ i = 0; TAILQ_FOREACH(lev, &sc->all_levels, link) { + /* Skip levels that have a frequency that is too low. */ + if (lev->total_set.freq <= cf_lowest_freq) { + sc->all_count--; + continue; + } + levels[i] = *lev; i++; } @@ -486,11 +541,13 @@ TAILQ_REMOVE(&sc->all_levels, lev, link); free(lev, M_TEMP); } + sc->all_count = 0; + + CF_MTX_UNLOCK(&sc->lock); while ((set_arr = TAILQ_FIRST(&rel_sets)) != NULL) { TAILQ_REMOVE(&rel_sets, set_arr, link); free(set_arr, M_TEMP); } - sc->all_count = 0; free(devs, M_TEMP); free(sets, M_TEMP); return (error); @@ -508,6 +565,8 @@ struct cf_level *level, *search; int i; + CF_MTX_ASSERT(&sc->lock); + list = &sc->all_levels; for (i = 0; i < count; i++) { level = malloc(sizeof(*level), M_TEMP, M_NOWAIT | M_ZERO); @@ -543,6 +602,8 @@ struct cf_setting *set; int i; + CF_MTX_ASSERT(&sc->lock); + TAILQ_FOREACH(search, &sc->all_levels, link) { /* Skip this level if we've already modified it. */ for (i = 0; i < search->rel_count; i++) { @@ -592,6 +653,8 @@ struct cf_setting *fill_set, *itr_set; int i; + CF_MTX_ASSERT(&sc->lock); + /* * Create a new level, copy it from the old one, and update the * total frequency and power by the percentage specified in the ==== //depot/projects/netperf_socket/sys/netinet/ip_carp.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet/ip_carp.c,v 1.10 2005/02/26 13:55:07 glebius Exp $ */ +/* $FreeBSD: src/sys/netinet/ip_carp.c,v 1.11 2005/02/27 11:32:26 mlaier Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -1118,7 +1118,7 @@ } #ifdef INET6 -static struct ifaddr * +struct ifaddr * carp_iamatch6(void *v, struct in6_addr *taddr) { struct carp_if *cif = v; @@ -1142,7 +1142,7 @@ return (NULL); } -static void * +void * carp_macmatch6(void *v, struct mbuf *m, const struct in6_addr *taddr) { struct m_tag *mtag; ==== //depot/projects/netperf_socket/sys/pci/agp_ali.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/agp_ali.c,v 1.16 2005/02/24 21:32:55 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/agp_ali.c,v 1.17 2005/02/27 13:05:34 cognet Exp $"); #include "opt_bus.h" @@ -65,6 +65,8 @@ return NULL; switch (pci_get_devid(dev)) { + case 0x167110b9: + return ("Ali M1671 host to AGP bridge"); case 0x154110b9: return ("Ali M1541 host to AGP bridge"); case 0x162110b9: ==== //depot/projects/netperf_socket/sys/sparc64/conf/GENERIC#18 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.88 2005/01/30 09:27:49 marcel Exp $ +# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.89 2005/02/27 15:23:58 marius Exp $ machine sparc64 cpu SUN4U @@ -136,7 +136,6 @@ # Serial (COM) ports #device sab # Siemens SAB82532 based serial ports -#device zs # Zilog 8530 based serial ports device uart # Multi-uart driver device puc # Multi-channel uarts ==== //depot/projects/netperf_socket/sys/sparc64/conf/NOTES#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/sparc64/conf/NOTES,v 1.15 2005/01/14 13:16:13 ru Exp $ +# $FreeBSD: src/sys/sparc64/conf/NOTES,v 1.16 2005/02/27 15:23:58 marius Exp $ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. @@ -56,7 +56,6 @@ option OFWCONS_POLL_HZ=4 # 20 or more works best on Ultra2 device sab # Siemens SAB82532 based serial ports -device zs # Zilog 8530 based serial ports ##################################################################### ==== //depot/projects/netperf_socket/sys/sys/param.h#34 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.3 (Berkeley) 4/4/95 - * $FreeBSD: src/sys/sys/param.h,v 1.227 2005/02/25 19:46:41 brooks Exp $ + * $FreeBSD: src/sys/sys/param.h,v 1.228 2005/02/26 21:47:54 ru Exp $ */ #ifndef _SYS_PARAM_H_ @@ -57,7 +57,7 @@ * is created, otherwise 1. */ #undef __FreeBSD_version -#define __FreeBSD_version 600015 /* Master, propagated to newvers */ +#define __FreeBSD_version 600016 /* Master, propagated to newvers */ #ifndef LOCORE #include From owner-p4-projects@FreeBSD.ORG Sun Feb 27 22:24:41 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0E3116A4D6; Sun, 27 Feb 2005 22:24:40 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 93CC016A4D4 for ; Sun, 27 Feb 2005 22:24:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4617A43D31 for ; Sun, 27 Feb 2005 22:24:40 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1RMOeBw047796 for ; Sun, 27 Feb 2005 22:24:40 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1RMOdfo047793 for perforce@freebsd.org; Sun, 27 Feb 2005 22:24:39 GMT (envelope-from cognet@freebsd.org) Date: Sun, 27 Feb 2005 22:24:39 GMT Message-Id: <200502272224.j1RMOdfo047793@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Subject: PERFORCE change 72073 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Feb 2005 22:24:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=72073 Change 72073 by cognet@cognet on 2005/02/27 22:24:28 Get more love from gdb, and teach him how to deal with shared libraries. Affected files ... .. //depot/projects/arm/contrib-arm.diff#2 edit .. //depot/projects/arm/gnu-arm.diff#2 edit Differences ... ==== //depot/projects/arm/contrib-arm.diff#2 (text+ko) ==== @@ -614,8 +614,8 @@ RCS file: contrib/gdb/gdb/armfbsd-tdep.c diff -N contrib/gdb/gdb/armfbsd-tdep.c --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ contrib/gdb/gdb/armfbsd-tdep.c 15 Aug 2004 00:51:46 -0000 -@@ -0,0 +1,59 @@ ++++ contrib/gdb/gdb/armfbsd-tdep.c 27 Feb 2005 20:44:28 -0000 +@@ -0,0 +1,67 @@ +/* Target-specific functions for ARM running under NetBSD. + Copyright 2002, 2003 Free Software Foundation, Inc. + @@ -639,7 +639,9 @@ +#include "defs.h" +#include "osabi.h" + ++#include "arch-utils.h" +#include "arm-tdep.h" ++#include "solib-svr4.h" + +/* Description of the longjmp buffer. */ +#define ARM_FBSD_JB_PC 24 @@ -665,6 +667,12 @@ + + arm_freebsd_init_abi_common (info, gdbarch); + ++ /* FreeBSD ELF uses SVR4-style shared libraries. */ ++ set_gdbarch_in_solib_call_trampoline ++ (gdbarch, generic_in_solib_call_trampoline); ++ set_solib_svr4_fetch_link_map_offsets ++ (gdbarch, svr4_ilp32_fetch_link_map_offsets); ++ + tdep->fp_model = ARM_FLOAT_SOFT_VFP; +} + ==== //depot/projects/arm/gnu-arm.diff#2 (text+ko) ==== @@ -1,10 +1,10 @@ Index: gnu/lib/libgcc/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/lib/libgcc/Makefile,v -retrieving revision 1.53 -diff -u -p -r1.53 Makefile ---- gnu/lib/libgcc/Makefile 24 Oct 2004 15:32:24 -0000 1.53 -+++ gnu/lib/libgcc/Makefile 7 Nov 2004 17:22:29 -0000 +retrieving revision 1.54 +diff -u -p -r1.54 Makefile +--- gnu/lib/libgcc/Makefile 21 Dec 2004 09:33:45 -0000 1.54 ++++ gnu/lib/libgcc/Makefile 27 Feb 2005 21:18:24 -0000 @@ -97,8 +97,11 @@ LIB2FUNCS_EXTRA = qrnnd.asm # from config/arm/t-strongarm-elf CFLAGS+= -Dinhibit_libc -fno-inline @@ -31,11 +31,11 @@ Index: gnu/lib/libstdc++/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/lib/libstdc++/Makefile,v -retrieving revision 1.52 -diff -u -p -r1.52 Makefile ---- gnu/lib/libstdc++/Makefile 1 Sep 2004 08:17:20 -0000 1.52 -+++ gnu/lib/libstdc++/Makefile 21 Oct 2004 21:30:12 -0000 -@@ -172,6 +172,10 @@ TARGETHDRSNAME_c_locale.h= c++locale.h +retrieving revision 1.54 +diff -u -p -r1.54 Makefile +--- gnu/lib/libstdc++/Makefile 26 Jan 2005 13:56:27 -0000 1.54 ++++ gnu/lib/libstdc++/Makefile 27 Feb 2005 21:18:25 -0000 +@@ -174,6 +174,10 @@ TARGETHDRSNAME_c_locale.h= c++locale.h TARGETHDRSNAME_new_allocator_base.h= c++allocator.h TARGETHDRSDIR= ${CXXINCLUDEDIR}/bits @@ -46,6 +46,22 @@ MARCHHDRS= atomic_word.h .for h in ${MARCHHDRS} .if exists(${SRCDIR}/config/cpu/${MARCHDIR}/${h}) +Index: gnu/usr.bin/Makefile +=================================================================== +RCS file: /home/ncvs/src/gnu/usr.bin/Makefile,v +retrieving revision 1.83 +diff -u -p -r1.83 Makefile +--- gnu/usr.bin/Makefile 24 Oct 2004 15:32:25 -0000 1.83 ++++ gnu/usr.bin/Makefile 27 Feb 2005 20:53:55 -0000 +@@ -23,7 +23,7 @@ SUBDIR= bc \ + tar \ + texinfo + +-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc" ++.if ${MACHINE_ARCH} == "powerpc" + NO_GDB= # not yet + .endif + Index: gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h =================================================================== RCS file: gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h @@ -80,8 +96,8 @@ RCS file: gnu/usr.bin/binutils/libbfd/Makefile.arm diff -N gnu/usr.bin/binutils/libbfd/Makefile.arm --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gnu/usr.bin/binutils/libbfd/Makefile.arm 21 Oct 2004 21:30:12 -0000 -@@ -0,0 +1,19 @@ ++++ gnu/usr.bin/binutils/libbfd/Makefile.arm 18 Jan 2005 12:04:26 -0000 +@@ -0,0 +1,20 @@ +# $FreeBSD$ + +DEFAULT_VECTOR= bfd_elf32_littlearm_vec @@ -94,7 +110,8 @@ + elfarm-nabi.c \ + elfarm-oabi.c \ + elf32-target.h -+VECS+= ${DEFAULT_VECTOR} ++VECS+= ${DEFAULT_VECTOR} \ ++ bfd_elf32_bigarm_vec + +.if ${TARGET_ARCH} == "arm" +CFLAGS+= -DDEFAULT_VECTOR=${DEFAULT_VECTOR} @@ -182,8 +199,8 @@ RCS file: gnu/usr.bin/gdb/arch/arm/config.h diff -N gnu/usr.bin/gdb/arch/arm/config.h --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gnu/usr.bin/gdb/arch/arm/config.h 28 Nov 2004 14:27:46 -0000 -@@ -0,0 +1,551 @@ ++++ gnu/usr.bin/gdb/arch/arm/config.h 15 Jan 2005 15:50:12 -0000 +@@ -0,0 +1,553 @@ +/* $FreeBSD$ */ + +/* config.h. Generated automatically by configure. */ @@ -266,13 +283,13 @@ +#endif + +/* Define if your struct reg has r_fs. */ -+#define HAVE_STRUCT_REG_R_FS 1 ++/* #define HAVE_STRUCT_REG_R_FS 1 */ + +/* Define if your struct stat has st_blocks. */ +#define HAVE_STRUCT_STAT_ST_BLOCKS 1 + +/* Define if your struct reg has r_gs. */ -+#define HAVE_STRUCT_REG_R_GS 1 ++/* #define HAVE_STRUCT_REG_R_GS 1 */ + +/* Define if exists and defines struct link_map which has + members with an ``l_'' prefix. (For Solaris, SVR4, and @@ -360,7 +377,9 @@ +#define GDB_TM_FILE config/arm/tm-fbsd.h + +/* nativefile */ ++#ifndef CROSS_DEBUGGER +#define GDB_NM_FILE config/arm/nm-fbsd.h ++#endif + +/* Define to 1 so gets a definition of anon_hdl. Works + around a problem on IRIX 5. */ From owner-p4-projects@FreeBSD.ORG Sun Feb 27 23:25:38 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 399C216A4DC; Sun, 27 Feb 2005 23:25:38 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 01D8416A4D0 for ; Sun, 27 Feb 2005 23:25:38 +0000 (GMT) Received: from harmony.village.org (rover.village.org [168.103.84.182]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8622F43D2D for ; Sun, 27 Feb 2005 23:25:37 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.13.1/8.13.1) with ESMTP id j1RNMXoC003166; Sun, 27 Feb 2005 16:22:34 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sun, 27 Feb 2005 16:22:45 -0700 (MST) Message-Id: <20050227.162245.118973910.imp@bsdimp.com> To: gurney_j@resnet.uoregon.edu From: "M. Warner Losh" In-Reply-To: <20050227073515.GQ89312@funkthat.com> References: <200502230728.j1N7S2AL023160@repoman.freebsd.org> <20050226.231759.49165032.imp@bsdimp.com> <20050227073515.GQ89312@funkthat.com> X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: perforce@freebsd.org Subject: Re: PERFORCE change 71640 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Feb 2005 23:25:39 -0000 In message: <20050227073515.GQ89312@funkthat.com> John-Mark Gurney writes: : M. Warner Losh wrote this message on Sat, Feb 26, 2005 at 23:17 -0700: : > In message: <200502230728.j1N7S2AL023160@repoman.freebsd.org> : > John-Mark Gurney writes: : > : int : > : ahb_attach(device_t dev) : > : > device ahb is an EISA scsi controller... You may want to use a : > different name... : : hmmm.. that's anoying... well, the only good thing is that the ep93xx : will probably never have an EISA bus on it, though I guess it would : be good to reduce confusion... : : I'll have to think about a better/good name for it, since AHB is the : name that Cirrus Logic uses to describe the bus, hence the name.. :) : making people who are familar with the chip obvious what it is... Yea, but there have been lots of problems in the past with names that shouldn't conflict, but do in subtle ways. We've tried hard to avoid that in the main tree. Warner From owner-p4-projects@FreeBSD.ORG Mon Feb 28 18:39:17 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11FFF16A4D0; Mon, 28 Feb 2005 18:39:17 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C31BC16A4CE for ; Mon, 28 Feb 2005 18:39:16 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A39E543D2F for ; Mon, 28 Feb 2005 18:39:16 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1SIdGJp051237 for ; Mon, 28 Feb 2005 18:39:16 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1SIdE3T051233 for perforce@freebsd.org; Mon, 28 Feb 2005 18:39:14 GMT (envelope-from areisse@nailabs.com) Date: Mon, 28 Feb 2005 18:39:14 GMT Message-Id: <200502281839.j1SIdE3T051233@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 72145 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Feb 2005 18:39:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=72145 Change 72145 by areisse@areisse_tislabs on 2005/02/28 18:38:20 Remove modified checkpolicy sources, in preparation for reverting to a version very close to the NSA version. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/checkpolicy.c#9 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/checkpolicy.h#5 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/genpolusers.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/policy_parse.y#6 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/policy_scan.l#5 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/queue.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/queue.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/users.l#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/users.y#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Mon Feb 28 18:52:34 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFF8016A4D0; Mon, 28 Feb 2005 18:52:33 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4F79A16A4CE for ; Mon, 28 Feb 2005 18:52:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3060643D64 for ; Mon, 28 Feb 2005 18:52:33 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1SIqXhg051957 for ; Mon, 28 Feb 2005 18:52:33 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1SIqWcx051954 for perforce@freebsd.org; Mon, 28 Feb 2005 18:52:32 GMT (envelope-from areisse@nailabs.com) Date: Mon, 28 Feb 2005 18:52:32 GMT Message-Id: <200502281852.j1SIqWcx051954@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 72146 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Feb 2005 18:52:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=72146 Change 72146 by areisse@areisse_tislabs on 2005/02/28 18:52:14 Add new checkpolicy sources. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/checkpolicy.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/checkpolicy.c#10 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/checkpolicy.h#6 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/policy_parse.y#7 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/policy_scan.l#6 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/queue.c#3 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/queue.h#3 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Feb 28 21:04:22 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D01316A4D0; Mon, 28 Feb 2005 21:04:22 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E4D216A4CE for ; Mon, 28 Feb 2005 21:04:22 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6287343D41 for ; Mon, 28 Feb 2005 21:04:20 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1SL4K4n065940 for ; Mon, 28 Feb 2005 21:04:20 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1SL4Huc065937 for perforce@freebsd.org; Mon, 28 Feb 2005 21:04:17 GMT (envelope-from peter@freebsd.org) Date: Mon, 28 Feb 2005 21:04:17 GMT Message-Id: <200502282104.j1SL4Huc065937@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 72156 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Feb 2005 21:04:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=72156 Change 72156 by peter@peter_daintree on 2005/02/28 21:03:50 IFC @72155 Affected files ... .. //depot/projects/hammer/Makefile#30 integrate .. //depot/projects/hammer/Makefile.inc1#85 integrate .. //depot/projects/hammer/UPDATING#73 integrate .. //depot/projects/hammer/bin/chflags/chflags.1#8 integrate .. //depot/projects/hammer/bin/cp/cp.1#9 integrate .. //depot/projects/hammer/bin/csh/config.h#4 integrate .. //depot/projects/hammer/contrib/bsnmp/FREEBSD-Xlist#3 integrate .. //depot/projects/hammer/contrib/bsnmp/NEWS#5 integrate .. //depot/projects/hammer/contrib/bsnmp/VERSION#5 integrate .. //depot/projects/hammer/contrib/bsnmp/gensnmpdef/gensnmpdef.1#3 integrate .. //depot/projects/hammer/contrib/bsnmp/gensnmptree/gensnmptree.1#4 integrate .. //depot/projects/hammer/contrib/bsnmp/gensnmptree/gensnmptree.c#5 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/asn1.3#5 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/bsnmpagent.3#5 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/bsnmpclient.3#5 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/bsnmplib.3#5 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/snmpagent.c#5 integrate .. //depot/projects/hammer/contrib/bsnmp/oid-list#1 branch .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII.c#5 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#5 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/snmp_mibII.3#5 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/snmp_mibII.h#4 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/bsnmpd.1#5 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/main.c#5 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/snmpd.config#5 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/snmpmod.3#5 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/trans_lsock.c#4 integrate .. //depot/projects/hammer/contrib/lukemftp/src/Makefile#2 integrate .. //depot/projects/hammer/contrib/lukemftp/src/cmds.c#4 integrate .. //depot/projects/hammer/contrib/lukemftp/src/cmdtab.c#4 integrate .. //depot/projects/hammer/contrib/lukemftp/src/extern.h#4 integrate .. //depot/projects/hammer/contrib/lukemftp/src/fetch.c#5 integrate .. //depot/projects/hammer/contrib/lukemftp/src/ftp.1#6 integrate .. //depot/projects/hammer/contrib/lukemftp/src/ftp.c#5 integrate .. //depot/projects/hammer/contrib/lukemftp/src/ftp_var.h#4 integrate .. //depot/projects/hammer/contrib/lukemftp/src/main.c#4 integrate .. //depot/projects/hammer/contrib/lukemftp/src/progressbar.c#5 integrate .. //depot/projects/hammer/contrib/lukemftp/src/progressbar.h#3 integrate .. //depot/projects/hammer/contrib/lukemftp/src/util.c#5 integrate .. //depot/projects/hammer/contrib/lukemftp/src/version.h#5 integrate .. //depot/projects/hammer/contrib/pf/man/pfsync.4#4 integrate .. //depot/projects/hammer/contrib/telnet/telnet/commands.c#4 integrate .. //depot/projects/hammer/contrib/telnet/telnet/telnet.1#3 integrate .. //depot/projects/hammer/contrib/telnet/telnet/telnet.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/ChangeLog#7 integrate .. //depot/projects/hammer/crypto/heimdal/FREEBSD-Xlist#2 integrate .. //depot/projects/hammer/crypto/heimdal/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/NEWS#6 integrate .. //depot/projects/hammer/crypto/heimdal/aclocal.m4#7 integrate .. //depot/projects/hammer/crypto/heimdal/admin/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/admin/get.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/appl/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/appl/afsutil/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ChangeLog#7 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/common/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftp/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftp/ftp.c#6 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftpd/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftpd/extern.h#3 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftpd/ftpcmd.y#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftpd/ftpd.8#5 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftpd/ftpd.c#5 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftpd/ftpd_locl.h#3 integrate .. //depot/projects/hammer/crypto/heimdal/appl/kf/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/appl/login/ChangeLog#4 integrate .. //depot/projects/hammer/crypto/heimdal/appl/login/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/appl/login/login.c#4 integrate .. //depot/projects/hammer/crypto/heimdal/appl/push/ChangeLog#3 integrate .. //depot/projects/hammer/crypto/heimdal/appl/push/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/appl/push/push.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/appl/rcp/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/appl/rsh/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/appl/su/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/ChangeLog#7 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/libtelnet/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c#6 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnet/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnet/network.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnetd/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnetd/state.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/test/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/compile#2 integrate .. //depot/projects/hammer/crypto/heimdal/config.guess#5 integrate .. //depot/projects/hammer/crypto/heimdal/config.sub#5 integrate .. //depot/projects/hammer/crypto/heimdal/configure#7 integrate .. //depot/projects/hammer/crypto/heimdal/configure.in#7 integrate .. //depot/projects/hammer/crypto/heimdal/doc/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/include/Makefile.in#7 integrate .. //depot/projects/hammer/crypto/heimdal/include/kadm5/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/install-sh#5 integrate .. //depot/projects/hammer/crypto/heimdal/kadmin/ChangeLog#6 integrate .. //depot/projects/hammer/crypto/heimdal/kadmin/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/kadmin/kadmind.c#4 integrate .. //depot/projects/hammer/crypto/heimdal/kadmin/version4.c#7 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/connect.c#6 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/kerberos5.c#6 integrate .. //depot/projects/hammer/crypto/heimdal/kpasswd/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/kuser/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/kuser/kinit.c#6 integrate .. //depot/projects/hammer/crypto/heimdal/lib/45/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/lib/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/lib/asn1/Makefile.am#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/asn1/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/lib/asn1/k5.asn1#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/auth/ChangeLog#4 integrate .. //depot/projects/hammer/crypto/heimdal/lib/auth/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/lib/auth/afskauthlib/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/lib/auth/afskauthlib/verify.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/auth/pam/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/lib/auth/sia/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/lib/com_err/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/lib/hdb/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kadm5/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kafs/ChangeLog#4 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kafs/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kafs/afssys.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/Makefile.am#7 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/Makefile.in#7 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/changepw.c#7 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/context.c#6 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/init_creds_pw.c#4 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5-protos.h#6 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5.h#6 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_set_password.3#1 branch .. //depot/projects/hammer/crypto/heimdal/lib/roken/Makefile.in#7 integrate .. //depot/projects/hammer/crypto/heimdal/lib/sl/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/lib/vers/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/missing#5 integrate .. //depot/projects/hammer/crypto/heimdal/mkinstalldirs#5 integrate .. //depot/projects/hammer/crypto/heimdal/tools/Makefile.in#7 integrate .. //depot/projects/hammer/crypto/openssl/CHANGES#5 integrate .. //depot/projects/hammer/crypto/openssl/Configure#5 integrate .. //depot/projects/hammer/crypto/openssl/FAQ#5 integrate .. //depot/projects/hammer/crypto/openssl/FREEBSD-Xlist#3 integrate .. //depot/projects/hammer/crypto/openssl/INSTALL#3 integrate .. //depot/projects/hammer/crypto/openssl/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/Makefile.org#5 integrate .. //depot/projects/hammer/crypto/openssl/Makefile.ssl#5 delete .. //depot/projects/hammer/crypto/openssl/NEWS#5 integrate .. //depot/projects/hammer/crypto/openssl/PROBLEMS#4 integrate .. //depot/projects/hammer/crypto/openssl/README#5 integrate .. //depot/projects/hammer/crypto/openssl/apps/CA.pl#5 integrate .. //depot/projects/hammer/crypto/openssl/apps/CA.pl.in#3 integrate .. //depot/projects/hammer/crypto/openssl/apps/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/apps/Makefile.ssl#5 delete .. //depot/projects/hammer/crypto/openssl/apps/apps.c#5 integrate .. //depot/projects/hammer/crypto/openssl/apps/apps.h#4 integrate .. //depot/projects/hammer/crypto/openssl/apps/asn1pars.c#4 integrate .. //depot/projects/hammer/crypto/openssl/apps/ca.c#5 integrate .. //depot/projects/hammer/crypto/openssl/apps/der_chop#4 integrate .. //depot/projects/hammer/crypto/openssl/apps/dgst.c#4 integrate .. //depot/projects/hammer/crypto/openssl/apps/enc.c#4 integrate .. //depot/projects/hammer/crypto/openssl/apps/openssl.c#4 integrate .. //depot/projects/hammer/crypto/openssl/apps/openssl.cnf#5 integrate .. //depot/projects/hammer/crypto/openssl/apps/pkcs8.c#4 integrate .. //depot/projects/hammer/crypto/openssl/apps/prime.c#1 branch .. //depot/projects/hammer/crypto/openssl/apps/progs.h#3 integrate .. //depot/projects/hammer/crypto/openssl/apps/req.c#4 integrate .. //depot/projects/hammer/crypto/openssl/apps/speed.c#4 integrate .. //depot/projects/hammer/crypto/openssl/apps/x509.c#5 integrate .. //depot/projects/hammer/crypto/openssl/certs/eng1.pem#1 branch .. //depot/projects/hammer/crypto/openssl/certs/eng2.pem#1 branch .. //depot/projects/hammer/crypto/openssl/certs/eng3.pem#1 branch .. //depot/projects/hammer/crypto/openssl/certs/eng4.pem#1 branch .. //depot/projects/hammer/crypto/openssl/certs/eng5.pem#1 branch .. //depot/projects/hammer/crypto/openssl/comm.txt#1 branch .. //depot/projects/hammer/crypto/openssl/comms.txt#1 branch .. //depot/projects/hammer/crypto/openssl/config#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/aes/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/aes/Makefile.ssl#3 delete .. //depot/projects/hammer/crypto/openssl/crypto/aes/aes.h#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/aes/aes_cfb.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/aes/aes_core.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/aes/aes_ctr.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/aes/aes_locl.h#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/asn1/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/asn1/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/asn1/a_int.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/asn1/a_strex.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/asn1/f.c#2 delete .. //depot/projects/hammer/crypto/openssl/crypto/asn1/p5_pbev2.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/asn1/x_cinf.c#2 delete .. //depot/projects/hammer/crypto/openssl/crypto/asn1/x_crl.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bf/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/bf/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/bio/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/bio/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/bio/b_print.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bio/bio.h#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bio/bss_file.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bn/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/bn/Makefile.ssl#5 delete .. //depot/projects/hammer/crypto/openssl/crypto/bn/asm/ia64.S#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bn/bntest.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/buffer/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/buffer/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/cast/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/cast/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/comp/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/comp/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/comp/c_zlib.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/conf/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/conf/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/conf/conf_def.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/cryptlib.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/crypto.h#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/des/FILES0#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/des/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/des/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/des/cfb64ede.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/des/des.h#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/des/des_enc.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/des/des_old.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/des/destest.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/des/ecb3_enc.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/des/set_key.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/dh/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/dh/Makefile.ssl#5 delete .. //depot/projects/hammer/crypto/openssl/crypto/dh/dh_check.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/dh/dh_err.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/dh/dh_gen.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/dh/dh_key.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/dsa/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/dsa/Makefile.ssl#5 delete .. //depot/projects/hammer/crypto/openssl/crypto/dsa/dsa.h#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/dsa/dsa_gen.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/dsa/dsa_key.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/dsa/dsa_ossl.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/dsa/dsa_sign.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/dsa/dsa_vrf.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/dso/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/dso/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/ec/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/ec/Makefile.ssl#3 delete .. //depot/projects/hammer/crypto/openssl/crypto/engine/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/engine/Makefile.ssl#3 delete .. //depot/projects/hammer/crypto/openssl/crypto/engine/hw_cryptodev.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/err/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/err/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/err/err.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/err/err.h#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/err/err_all.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/err/openssl.ec#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/evp/Makefile.ssl#5 delete .. //depot/projects/hammer/crypto/openssl/crypto/evp/bio_md.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/c_allc.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/e_aes.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/e_des.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/e_des3.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/e_old.c#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/evp/evp.h#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/evp_err.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/evp_lib.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/evp_locl.h#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/evp_test.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/evptests.txt#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/hmac/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/hmac/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/idea/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/idea/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/krb5/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/krb5/Makefile.ssl#3 delete .. //depot/projects/hammer/crypto/openssl/crypto/lhash/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/lhash/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/md2/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/md2/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/md32_common.h#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/md4/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/md4/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/md5/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/md5/Makefile.ssl#5 delete .. //depot/projects/hammer/crypto/openssl/crypto/mdc2/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/mdc2/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/o_str.c#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/o_str.h#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/o_time.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/objects/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/objects/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/objects/obj_dat.h#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/objects/obj_mac.h#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/objects/obj_mac.num#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/objects/objects.txt#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ocsp/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/ocsp/Makefile.ssl#3 delete .. //depot/projects/hammer/crypto/openssl/crypto/opensslv.h#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/pem/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/pem/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/pem/pem_all.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/pem/pem_pkey.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/pkcs12/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/pkcs12/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/pkcs7/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/pkcs7/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/pkcs7/pk7_attr.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rand/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/rand/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/rand/md_rand.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rand/rand.h#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rand/rand_egd.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rand/rand_err.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rand/rand_lib.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rand/rand_win.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rand/randfile.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rc2/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/rc2/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/rc4/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/rc4/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/rc5/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/rc5/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/ripemd/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/ripemd/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/rsa/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/rsa/Makefile.ssl#5 delete .. //depot/projects/hammer/crypto/openssl/crypto/rsa/rsa.h#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rsa/rsa_eay.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rsa/rsa_gen.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/sha/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/sha/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/sha/sha.h#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/sha/sha1dgst.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/stack/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/stack/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/stack/safestack.h#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/stack/stack.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/stack/stack.h#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/txt_db/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/txt_db/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/ui/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/ui/Makefile.ssl#3 delete .. //depot/projects/hammer/crypto/openssl/crypto/x509/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/x509/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/x509/x509.h#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509/x509_req.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509/x509_vfy.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/ext_dat.h#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_int.c#3 integrate .. //depot/projects/hammer/crypto/openssl/demos/engines/rsaref/Makefile#2 delete .. //depot/projects/hammer/crypto/openssl/demos/engines/rsaref/README#2 delete .. //depot/projects/hammer/crypto/openssl/demos/engines/rsaref/build.com#2 delete .. //depot/projects/hammer/crypto/openssl/demos/engines/rsaref/rsaref.c#2 delete .. //depot/projects/hammer/crypto/openssl/demos/engines/rsaref/rsaref.ec#2 delete .. //depot/projects/hammer/crypto/openssl/demos/engines/rsaref/rsaref_err.c#2 delete .. //depot/projects/hammer/crypto/openssl/demos/engines/rsaref/rsaref_err.h#2 delete .. //depot/projects/hammer/crypto/openssl/doc/apps/enc.pod#3 integrate .. //depot/projects/hammer/crypto/openssl/doc/crypto/BN_num_bytes.pod#2 integrate .. //depot/projects/hammer/crypto/openssl/doc/crypto/RSA_public_encrypt.pod#3 integrate .. //depot/projects/hammer/crypto/openssl/doc/crypto/pem.pod#3 integrate .. //depot/projects/hammer/crypto/openssl/doc/ssl/SSL_CTX_set_session_id_context.pod#2 integrate .. //depot/projects/hammer/crypto/openssl/e_os.h#4 integrate .. //depot/projects/hammer/crypto/openssl/e_os2.h#3 integrate .. //depot/projects/hammer/crypto/openssl/openssl.spec#5 integrate .. //depot/projects/hammer/crypto/openssl/os2/OS2-EMX.cmd#2 delete .. //depot/projects/hammer/crypto/openssl/ssl/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/ssl/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/ssl/s23_clnt.c#3 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s2_clnt.c#4 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s2_srvr.c#4 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s3_clnt.c#5 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s3_lib.c#4 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s3_pkt.c#4 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s3_srvr.c#6 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssl.h#4 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssl_cert.c#4 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssl_ciph.c#5 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssl_lib.c#5 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssl_locl.h#3 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssl_sess.c#5 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssltest.c#5 integrate .. //depot/projects/hammer/crypto/openssl/ssl/t1_enc.c#3 integrate .. //depot/projects/hammer/crypto/openssl/test/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/test/Makefile.ssl#5 delete .. //depot/projects/hammer/crypto/openssl/test/bctest#2 integrate .. //depot/projects/hammer/crypto/openssl/test/evptests.txt#2 integrate .. //depot/projects/hammer/crypto/openssl/test/testenc#2 integrate .. //depot/projects/hammer/crypto/openssl/test/testfipsssl#1 branch .. //depot/projects/hammer/crypto/openssl/tools/Makefile#1 branch .. //depot/projects/hammer/crypto/openssl/tools/Makefile.ssl#4 delete .. //depot/projects/hammer/crypto/openssl/tools/c_issuer#2 integrate .. //depot/projects/hammer/crypto/openssl/tools/c_rehash#5 integrate .. //depot/projects/hammer/crypto/openssl/util/domd#3 integrate .. //depot/projects/hammer/crypto/openssl/util/extract-names.pl#4 integrate .. //depot/projects/hammer/crypto/openssl/util/fixNT.sh#2 integrate .. //depot/projects/hammer/crypto/openssl/util/libeay.num#4 integrate .. //depot/projects/hammer/crypto/openssl/util/mk1mf.pl#5 integrate .. //depot/projects/hammer/crypto/openssl/util/mkdef.pl#5 integrate .. //depot/projects/hammer/crypto/openssl/util/mkerr.pl#4 integrate .. //depot/projects/hammer/crypto/openssl/util/mkfiles.pl#3 integrate .. //depot/projects/hammer/crypto/openssl/util/mkstack.pl#3 integrate .. //depot/projects/hammer/crypto/openssl/util/pl/BC-16.pl#3 integrate .. //depot/projects/hammer/crypto/openssl/util/pl/BC-32.pl#3 integrate .. //depot/projects/hammer/crypto/openssl/util/pl/Mingw32.pl#4 integrate .. //depot/projects/hammer/crypto/openssl/util/pl/OS2-EMX.pl#3 integrate .. //depot/projects/hammer/crypto/openssl/util/pl/VC-16.pl#3 integrate .. //depot/projects/hammer/crypto/openssl/util/pl/VC-32.pl#3 integrate .. //depot/projects/hammer/crypto/openssl/util/pl/VC-CE.pl#2 integrate .. //depot/projects/hammer/crypto/openssl/util/pl/linux.pl#2 integrate .. //depot/projects/hammer/crypto/openssl/util/pl/ultrix.pl#2 integrate .. //depot/projects/hammer/crypto/openssl/util/pl/unix.pl#2 integrate .. //depot/projects/hammer/crypto/openssl/util/pod2mantest#3 integrate .. //depot/projects/hammer/crypto/openssl/util/selftest.pl#3 integrate .. //depot/projects/hammer/etc/Makefile#36 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#48 integrate .. //depot/projects/hammer/etc/mtree/BSD.include.dist#31 integrate .. //depot/projects/hammer/etc/periodic/security/500.ipfwdenied#5 integrate .. //depot/projects/hammer/etc/periodic/security/550.ipfwlimit#5 integrate .. //depot/projects/hammer/etc/protocols#4 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#31 integrate .. //depot/projects/hammer/etc/rc.d/power_profile#6 integrate .. //depot/projects/hammer/etc/rc.d/powerd#1 branch .. //depot/projects/hammer/etc/syslog.conf#7 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#39 integrate .. //depot/projects/hammer/games/fortune/datfiles/freebsd-tips#12 integrate .. //depot/projects/hammer/games/fortune/strfile/Makefile#4 integrate .. //depot/projects/hammer/games/fortune/unstr/Makefile#5 integrate .. //depot/projects/hammer/games/fortune/unstr/unstr.c#4 integrate .. //depot/projects/hammer/gnu/lib/libobjc/Makefile#10 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kgdb.h#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kthr.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/main.c#4 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/trgt.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/trgt_alpha.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c#2 integrate .. //depot/projects/hammer/include/Makefile#38 integrate .. //depot/projects/hammer/include/nl_types.h#4 integrate .. //depot/projects/hammer/include/runefile.h#1 branch .. //depot/projects/hammer/include/stdbool.h#3 integrate .. //depot/projects/hammer/kerberos5/include/config.h#8 integrate .. //depot/projects/hammer/kerberos5/include/version.h#8 integrate .. //depot/projects/hammer/kerberos5/lib/libasn1/Makefile#8 integrate .. //depot/projects/hammer/kerberos5/usr.bin/krb5-config/Makefile#10 integrate .. //depot/projects/hammer/lib/libarchive/archive_util.c#8 integrate .. //depot/projects/hammer/lib/libarchive/libarchive-formats.5#6 integrate .. //depot/projects/hammer/lib/libc/compat-43/getwd.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/devname.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/tls.c#5 integrate .. //depot/projects/hammer/lib/libc/locale/big5.c#8 integrate .. //depot/projects/hammer/lib/libc/locale/collate.c#5 integrate .. //depot/projects/hammer/lib/libc/locale/collate.h#3 integrate .. //depot/projects/hammer/lib/libc/locale/collcmp.c#3 integrate .. //depot/projects/hammer/lib/libc/locale/euc.c#8 integrate .. //depot/projects/hammer/lib/libc/locale/gb18030.c#5 integrate .. //depot/projects/hammer/lib/libc/locale/gb2312.c#5 integrate .. //depot/projects/hammer/lib/libc/locale/gbk.c#9 integrate .. //depot/projects/hammer/lib/libc/locale/mblocal.h#5 integrate .. //depot/projects/hammer/lib/libc/locale/mskanji.c#8 integrate .. //depot/projects/hammer/lib/libc/locale/none.c#9 integrate .. //depot/projects/hammer/lib/libc/locale/rune.c#4 integrate .. //depot/projects/hammer/lib/libc/locale/runetype.c#6 integrate .. //depot/projects/hammer/lib/libc/locale/setrunelocale.c#18 integrate .. //depot/projects/hammer/lib/libc/locale/table.c#12 integrate .. //depot/projects/hammer/lib/libc/locale/utf8.c#11 integrate .. //depot/projects/hammer/lib/libc/nls/C.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/libc/nls/catclose.3#2 integrate .. //depot/projects/hammer/lib/libc/nls/catgets.3#2 integrate .. //depot/projects/hammer/lib/libc/nls/catopen.3#2 integrate .. //depot/projects/hammer/lib/libc/nls/msgcat.c#8 integrate .. //depot/projects/hammer/lib/libc/nls/msgcat.h#3 delete .. //depot/projects/hammer/lib/libc/nls/ru_RU.KOI8-R.msg#1 branch .. //depot/projects/hammer/lib/libc/stdio/vswprintf.c#6 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#17 integrate .. //depot/projects/hammer/lib/libc/string/strerror.c#5 integrate .. //depot/projects/hammer/lib/libc/string/strsignal.c#2 integrate .. //depot/projects/hammer/lib/libc/sys/extattr_get_file.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/mount.2#10 integrate .. //depot/projects/hammer/lib/libc/sys/unlink.2#4 integrate .. //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#14 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_init.c#9 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_stack.c#4 integrate .. //depot/projects/hammer/lib/libpthread/arch/arm/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libpthread/arch/arm/arm/context.S#3 integrate .. //depot/projects/hammer/lib/libpthread/arch/arm/arm/pthread_md.c#4 integrate .. //depot/projects/hammer/lib/libpthread/arch/arm/include/pthread_md.h#6 integrate .. //depot/projects/hammer/lib/libpthread/sys/lock.c#8 integrate .. //depot/projects/hammer/lib/libutil/login.conf.5#7 integrate .. //depot/projects/hammer/lib/msun/Makefile#23 integrate .. //depot/projects/hammer/lib/msun/i387/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/msun/i387/e_acos.S#3 delete .. //depot/projects/hammer/lib/msun/i387/e_asin.S#3 delete .. //depot/projects/hammer/lib/msun/i387/e_atan2.S#3 delete .. //depot/projects/hammer/lib/msun/i387/e_atan2f.S#3 delete .. //depot/projects/hammer/lib/msun/i387/s_atan.S#2 delete .. //depot/projects/hammer/lib/msun/i387/s_cosf.S#2 delete .. //depot/projects/hammer/lib/msun/i387/s_sinf.S#2 delete .. //depot/projects/hammer/lib/msun/i387/s_tanf.S#2 delete .. //depot/projects/hammer/lib/msun/man/exp.3#5 integrate .. //depot/projects/hammer/lib/msun/sparc64/Makefile.inc#1 branch .. //depot/projects/hammer/lib/msun/sparc64/e_sqrt.S#1 branch .. //depot/projects/hammer/lib/msun/sparc64/e_sqrtf.S#1 branch .. //depot/projects/hammer/lib/msun/src/e_expf.c#2 integrate .. //depot/projects/hammer/libexec/rexecd/Makefile#2 integrate .. //depot/projects/hammer/libexec/rexecd/rexecd.c#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/arm/rtld_machdep.h#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/map_object.c#9 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#26 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.h#9 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#71 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/install.sgml#11 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#85 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml#3 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#21 integrate .. //depot/projects/hammer/sbin/devfs/devfs.8#8 integrate .. //depot/projects/hammer/sbin/devfs/rule.c#4 integrate .. //depot/projects/hammer/sbin/fsck_ffs/fsck.h#10 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass5.c#10 integrate .. //depot/projects/hammer/sbin/geom/class/concat/geom_concat.c#7 integrate .. //depot/projects/hammer/sbin/geom/class/label/geom_label.c#5 integrate .. //depot/projects/hammer/sbin/geom/class/mirror/geom_mirror.c#6 integrate .. //depot/projects/hammer/sbin/geom/class/mirror/gmirror.8#7 integrate .. //depot/projects/hammer/sbin/geom/class/raid3/geom_raid3.c#9 integrate .. //depot/projects/hammer/sbin/geom/class/shsec/geom_shsec.c#3 integrate .. //depot/projects/hammer/sbin/geom/class/shsec/gshsec.8#4 integrate .. //depot/projects/hammer/sbin/geom/class/stripe/geom_stripe.c#10 integrate .. //depot/projects/hammer/sbin/geom/core/geom.8#10 integrate .. //depot/projects/hammer/sbin/geom/core/geom.c#6 integrate .. //depot/projects/hammer/sbin/ifconfig/Makefile#5 integrate .. //depot/projects/hammer/sbin/ifconfig/ifcarp.c#1 branch .. //depot/projects/hammer/sbin/ifconfig/ifpfsync.c#1 branch .. //depot/projects/hammer/sbin/ipfw/ipfw.8#39 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#18 integrate .. //depot/projects/hammer/sbin/newfs/mkfs.c#19 integrate .. //depot/projects/hammer/sbin/savecore/savecore.8#6 integrate .. //depot/projects/hammer/sbin/savecore/savecore.c#9 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile#16 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile.asm#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile.inc#9 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile.man#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ASN1_STRING_length.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ASN1_STRING_new.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_ctrl.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_base64.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_buffer.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_cipher.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_md.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_null.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_ssl.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_find_type.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_new.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_push.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_read.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_accept.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_bio.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_connect.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_fd.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_file.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_mem.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_null.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_socket.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_set_callback.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_should_retry.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_CTX_new.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_CTX_start.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_add.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_add_word.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_bn2bin.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_cmp.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_copy.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_generate_prime.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_mod_inverse.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_new.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_num_bytes.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_rand.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_set_bit.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_swap.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_zero.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/CONF_modules_free.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/CONF_modules_load_file.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DH_generate_key.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DH_generate_parameters.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DH_get_ex_new_index.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DH_new.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DH_set_method.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DH_size.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_SIG_new.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_do_sign.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_dup_DH.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_generate_key.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_generate_parameters.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_new.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_set_method.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_sign.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_size.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_GET_LIB.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_clear_error.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_error_string.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_get_error.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_load_strings.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_print_errors.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_put_error.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_remove_state.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_BytesToKey.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_DigestInit.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_EncryptInit.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_OpenInit.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_PKEY_new.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_SealInit.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_SignInit.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_VerifyInit.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/OBJ_nid2obj.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/OPENSSL_config.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS12_create.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS12_parse.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS7_decrypt.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS7_encrypt.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS7_sign.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS7_verify.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_add.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_bytes.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_cleanup.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_egd.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_load_file.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_set_rand_method.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_blinding_on.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_check_key.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_generate_key.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_new.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_print.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_private_encrypt.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_public_encrypt.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_set_method.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_sign.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_size.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/SMIME_read_PKCS7.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/SMIME_write_PKCS7.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/X509_NAME_print_ex.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/X509_new.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/bio.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/blowfish.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/bn.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/bn_internal.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/buffer.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/crypto.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_DHparams.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_DSAPublicKey.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509_ALGOR.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509_CRL.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509_NAME.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509_REQ.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509_SIG.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/des.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/dh.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/dsa.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/engine.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/err.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/evp.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/hmac.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/lh_stats.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/lhash.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/md5.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/mdc2.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/pem.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/rand.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/rc4.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ripemd.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/rsa.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/sha.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/threads.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ui.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ui_compat.3#3 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/Makefile#3 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/Makefile.man#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/CA.pl.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/asn1parse.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/ca.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/ciphers.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/crl.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/crl2pkcs7.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/dgst.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/dhparam.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/dsa.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/dsaparam.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/enc.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/gendsa.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/genrsa.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/nseq.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/ocsp.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/openssl.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/passwd.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/pkcs12.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/pkcs7.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/pkcs8.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/rand.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/req.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/rsa.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/rsautl.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/s_client.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/s_server.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/s_time.1#1 branch .. //depot/projects/hammer/secure/usr.bin/openssl/man/sess_id.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/smime.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/speed.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/spkac.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/verify.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/version.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/x509.1#2 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#34 integrate .. //depot/projects/hammer/share/man/man1/builtin.1#3 integrate .. //depot/projects/hammer/share/man/man4/Makefile#64 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#33 integrate .. //depot/projects/hammer/share/man/man4/carp.4#1 branch .. //depot/projects/hammer/share/man/man4/cpufreq.4#3 integrate .. //depot/projects/hammer/share/man/man4/ed.4#7 integrate .. //depot/projects/hammer/share/man/man4/em.4#9 integrate .. //depot/projects/hammer/share/man/man4/fwohci.4#8 integrate .. //depot/projects/hammer/share/man/man4/hfa.4#4 integrate .. //depot/projects/hammer/share/man/man4/keyboard.4#4 integrate .. //depot/projects/hammer/share/man/man4/snd_neomagic.4#1 branch .. //depot/projects/hammer/share/man/man4/snd_sbc.4#3 integrate .. //depot/projects/hammer/share/man/man4/twa.4#3 integrate .. //depot/projects/hammer/share/man/man4/twe.4#6 integrate .. //depot/projects/hammer/share/man/man4/umct.4#6 integrate .. //depot/projects/hammer/share/man/man5/style.Makefile.5#8 integrate .. //depot/projects/hammer/share/man/man7/build.7#8 integrate .. //depot/projects/hammer/share/man/man7/clocks.7#4 integrate .. //depot/projects/hammer/share/man/man9/Makefile#49 integrate .. //depot/projects/hammer/share/man/man9/bpf.9#4 integrate .. //depot/projects/hammer/share/man/man9/contigmalloc.9#5 integrate .. //depot/projects/hammer/share/man/man9/ifnet.9#18 integrate .. //depot/projects/hammer/share/man/man9/malloc.9#12 integrate .. //depot/projects/hammer/share/man/man9/memguard.9#1 branch .. //depot/projects/hammer/share/man/man9/namei.9#5 integrate .. //depot/projects/hammer/share/mk/Makefile#6 integrate .. //depot/projects/hammer/share/mk/bsd.compat.mk#2 integrate .. //depot/projects/hammer/share/mk/bsd.endian.mk#1 branch .. //depot/projects/hammer/share/mk/bsd.info.mk#6 integrate .. //depot/projects/hammer/share/mk/bsd.nls.mk#2 integrate .. //depot/projects/hammer/share/termcap/Makefile#2 integrate .. //depot/projects/hammer/sys/alpha/include/exec.h#3 integrate .. //depot/projects/hammer/sys/amd64/acpica/madt.c#37 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#35 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_watchdog.c#5 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#56 integrate .. //depot/projects/hammer/sys/amd64/include/exec.h#7 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm.S#4 integrate .. //depot/projects/hammer/sys/arm/arm/fusu.S#6 integrate .. //depot/projects/hammer/sys/arm/arm/genassym.c#5 integrate .. //depot/projects/hammer/sys/arm/arm/locore.S#9 integrate .. //depot/projects/hammer/sys/arm/arm/machdep.c#10 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#16 integrate .. //depot/projects/hammer/sys/arm/arm/swtch.S#12 integrate .. //depot/projects/hammer/sys/arm/arm/sys_machdep.c#4 integrate .. //depot/projects/hammer/sys/arm/include/exec.h#3 integrate .. //depot/projects/hammer/sys/arm/include/machdep.h#2 integrate .. //depot/projects/hammer/sys/arm/include/pmap.h#8 integrate .. //depot/projects/hammer/sys/arm/include/proc.h#3 integrate .. //depot/projects/hammer/sys/arm/include/sysarch.h#3 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/iq31244_machdep.c#7 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/std.i80321#3 integrate .. //depot/projects/hammer/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/hammer/sys/cam/cam_periph.c#16 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.c#17 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_all.c#12 integrate .. //depot/projects/hammer/sys/coda/coda_vfsops.c#16 integrate .. //depot/projects/hammer/sys/coda/coda_vfsops.h#5 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#26 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#24 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#24 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#24 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#28 integrate .. //depot/projects/hammer/sys/compat/linux/linux_stats.c#17 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#25 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#15 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#24 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_pe.c#8 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_usbd.c#1 branch .. //depot/projects/hammer/sys/compat/ndis/usbd_var.h#1 branch .. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#14 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_signal.c#10 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_signal.h#3 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#15 integrate .. //depot/projects/hammer/sys/conf/NOTES#81 integrate .. //depot/projects/hammer/sys/conf/files#105 integrate .. //depot/projects/hammer/sys/conf/files.amd64#63 integrate .. //depot/projects/hammer/sys/conf/files.i386#51 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#29 integrate .. //depot/projects/hammer/sys/conf/majors#27 integrate .. //depot/projects/hammer/sys/conf/options#68 integrate .. //depot/projects/hammer/sys/conf/options.arm#4 integrate .. //depot/projects/hammer/sys/conf/options.i386#30 integrate .. //depot/projects/hammer/sys/contrib/altq/altq/altq_subr.c#4 integrate .. //depot/projects/hammer/sys/contrib/altq/altq/altq_var.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#3 integrate .. //depot/projects/hammer/sys/contrib/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/mlfk_ipl.c#6 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_if.c#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#55 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#29 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcibvar.h#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_perf.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_quirks#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_thermal.c#22 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_throttle.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpiio.h#6 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#39 integrate .. //depot/projects/hammer/sys/dev/advansys/adwlib.c#4 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-tape.c#14 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#17 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus_cis.c#16 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#29 integrate .. //depot/projects/hammer/sys/dev/cp/if_cp.c#15 integrate .. //depot/projects/hammer/sys/dev/cpufreq/ichss.c#4 integrate .. //depot/projects/hammer/sys/dev/ctau/if_ct.c#17 integrate .. //depot/projects/hammer/sys/dev/digi/digi.c#20 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_eisa.c#6 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/drm/drm_bufs.h#10 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_state.c#9 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed.c#27 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_isa.c#8 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#21 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_sic.c#2 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_wd80x3.c#2 integrate .. //depot/projects/hammer/sys/dev/ed/if_edvar.h#8 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc.c#27 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe.c#17 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe_cbus.c#4 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe_pccard.c#11 integrate .. //depot/projects/hammer/sys/dev/fe/if_fereg.h#3 integrate .. //depot/projects/hammer/sys/dev/fe/if_fevar.h#4 integrate .. //depot/projects/hammer/sys/dev/fe/mb86960.h#2 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#42 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme_pci.c#11 integrate .. //depot/projects/hammer/sys/dev/hptmv/access601.h#1 branch .. //depot/projects/hammer/sys/dev/hptmv/array.h#1 branch .. //depot/projects/hammer/sys/dev/hptmv/atapi.h#1 branch .. //depot/projects/hammer/sys/dev/hptmv/command.h#1 branch .. //depot/projects/hammer/sys/dev/hptmv/entry.c#5 integrate .. //depot/projects/hammer/sys/dev/hptmv/gui_lib.c#1 branch .. //depot/projects/hammer/sys/dev/hptmv/hptproc.c#1 branch .. //depot/projects/hammer/sys/dev/hptmv/i386-elf.raid.o.uu#1 branch .. //depot/projects/hammer/sys/dev/hptmv/ioctl.c#1 branch .. //depot/projects/hammer/sys/dev/hptmv/mvSata.h#1 branch .. //depot/projects/hammer/sys/dev/hptmv/mvStorageDev.h#1 branch .. //depot/projects/hammer/sys/dev/hptmv/raid5n.h#1 branch .. //depot/projects/hammer/sys/dev/hptmv/readme.txt#1 branch .. //depot/projects/hammer/sys/dev/hptmv/vdevice.h#1 branch .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#27 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pccard.c#9 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_usb.c#1 branch .. //depot/projects/hammer/sys/dev/kbd/atkbd.c#11 integrate .. //depot/projects/hammer/sys/dev/null/null.c#14 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#32 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#34 integrate .. //depot/projects/hammer/sys/dev/pci/pci_private.h#10 integrate .. //depot/projects/hammer/sys/dev/pci/pci_user.c#9 integrate .. //depot/projects/hammer/sys/dev/puc/puc.c#14 integrate .. //depot/projects/hammer/sys/dev/puc/puc_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/puc/puc_sbus.c#8 integrate .. //depot/projects/hammer/sys/dev/snc/dp83932.c#11 integrate .. //depot/projects/hammer/sys/dev/sound/isa/mss.c#12 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#16 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/mixer.c#13 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sndstat.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sound.h#14 integrate .. //depot/projects/hammer/sys/dev/sym/sym_hipd.c#14 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#28 integrate .. //depot/projects/hammer/sys/dev/syscons/sysmouse.c#11 integrate .. //depot/projects/hammer/sys/dev/tdfx/tdfx_pci.c#13 integrate .. //depot/projects/hammer/sys/dev/tga/tga_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/utopia/idtphy.c#1 branch .. //depot/projects/hammer/sys/dev/utopia/suni.c#1 branch .. //depot/projects/hammer/sys/dev/utopia/utopia.c#8 integrate .. //depot/projects/hammer/sys/dev/utopia/utopia.h#4 integrate .. //depot/projects/hammer/sys/dev/utopia/utopia_priv.h#1 branch .. //depot/projects/hammer/sys/dev/vkbd/vkbd.c#4 integrate .. //depot/projects/hammer/sys/dev/zs/zs_sbus.c#6 delete .. //depot/projects/hammer/sys/fs/devfs/devfs.h#8 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#27 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#30 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#22 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vnops.c#11 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#21 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vfsops.c#15 integrate .. //depot/projects/hammer/sys/geom/concat/g_concat.c#13 integrate .. //depot/projects/hammer/sys/geom/concat/g_concat.h#8 integrate .. //depot/projects/hammer/sys/geom/geom_vfs.c#7 integrate .. //depot/projects/hammer/sys/geom/label/g_label.c#9 integrate .. //depot/projects/hammer/sys/geom/label/g_label.h#4 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#19 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.h#7 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#15 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.h#8 integrate .. //depot/projects/hammer/sys/geom/shsec/g_shsec.c#3 integrate .. //depot/projects/hammer/sys/geom/shsec/g_shsec.h#3 integrate .. //depot/projects/hammer/sys/geom/stripe/g_stripe.c#10 integrate .. //depot/projects/hammer/sys/geom/stripe/g_stripe.h#6 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_var.h#8 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_volume.c#8 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_alloc.c#4 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_linux_balloc.c#6 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vnops.c#22 integrate .. //depot/projects/hammer/sys/i386/acpica/madt.c#13 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#62 integrate .. //depot/projects/hammer/sys/i386/cpufreq/est.c#1 branch .. //depot/projects/hammer/sys/i386/cpufreq/p4tcc.c#1 branch .. //depot/projects/hammer/sys/i386/i386/io_apic.c#13 integrate .. //depot/projects/hammer/sys/i386/i386/mp_watchdog.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/p4tcc.c#7 delete .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_msg.c#5 integrate .. //depot/projects/hammer/sys/i386/include/_types.h#7 integrate .. //depot/projects/hammer/sys/i386/include/exec.h#3 integrate .. //depot/projects/hammer/sys/i386/isa/ic/mb86960.h#3 delete .. //depot/projects/hammer/sys/i386/isa/pcf.c#6 integrate .. //depot/projects/hammer/sys/i386/isa/vesa.c#9 integrate .. //depot/projects/hammer/sys/ia64/conf/NOTES#5 integrate .. //depot/projects/hammer/sys/ia64/include/exec.h#3 integrate .. //depot/projects/hammer/sys/isa/vga_isa.c#13 integrate .. //depot/projects/hammer/sys/kern/imgact_shell.c#8 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#28 integrate .. //depot/projects/hammer/sys/kern/kern_cpu.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#29 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#45 integrate .. //depot/projects/hammer/sys/kern/kern_kse.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_module.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_poll.c#10 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#55 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#56 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#36 integrate .. //depot/projects/hammer/sys/kern/subr_eventhandler.c#5 integrate .. //depot/projects/hammer/sys/kern/subr_log.c#12 integrate .. //depot/projects/hammer/sys/kern/tty_cons.c#20 integrate .. //depot/projects/hammer/sys/kern/tty_pty.c#26 integrate .. //depot/projects/hammer/sys/kern/tty_tty.c#9 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#26 integrate .. //depot/projects/hammer/sys/kern/uipc_sem.c#11 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#52 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#32 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#45 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#30 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#35 integrate .. //depot/projects/hammer/sys/kern/vfs_init.c#17 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#51 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#75 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#30 integrate .. //depot/projects/hammer/sys/modules/acpi/Makefile#20 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi_perf/Makefile#2 delete .. //depot/projects/hammer/sys/modules/auxio/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/cpufreq/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ndis/Makefile#7 integrate .. //depot/projects/hammer/sys/modules/utopia/Makefile#2 integrate .. //depot/projects/hammer/sys/net/bpf.c#27 integrate .. //depot/projects/hammer/sys/net/if.c#41 integrate .. //depot/projects/hammer/sys/net/if.h#18 integrate .. //depot/projects/hammer/sys/net/if_clone.c#6 integrate .. //depot/projects/hammer/sys/net/if_disc.c#14 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#39 integrate .. //depot/projects/hammer/sys/net/if_faith.c#17 integrate .. //depot/projects/hammer/sys/net/if_loop.c#24 integrate .. //depot/projects/hammer/sys/net/if_media.h#12 integrate .. //depot/projects/hammer/sys/net/if_stf.c#18 integrate .. //depot/projects/hammer/sys/net/if_types.h#6 integrate .. //depot/projects/hammer/sys/net/if_var.h#27 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#23 integrate .. //depot/projects/hammer/sys/net/if_vlan_var.h#8 integrate .. //depot/projects/hammer/sys/net/rtsock.c#21 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 28 21:45:12 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D59B916A4D0; Mon, 28 Feb 2005 21:45:11 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AAAFC16A4CE for ; Mon, 28 Feb 2005 21:45:11 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 89F7443D3F for ; Mon, 28 Feb 2005 21:45:11 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1SLjBVX068050 for ; Mon, 28 Feb 2005 21:45:11 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1SLjB85068047 for perforce@freebsd.org; Mon, 28 Feb 2005 21:45:11 GMT (envelope-from peter@freebsd.org) Date: Mon, 28 Feb 2005 21:45:11 GMT Message-Id: <200502282145.j1SLjB85068047@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 72160 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Feb 2005 21:45:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=72160 Change 72160 by peter@peter_daintree on 2005/02/28 21:44:27 integ -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/madt.c#38 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#36 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_watchdog.c#6 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#57 integrate .. //depot/projects/hammer/sys/amd64/include/_types.h#10 integrate .. //depot/projects/hammer/sys/amd64/include/exec.h#8 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/madt.c#38 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#36 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mp_watchdog.c#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/NOTES#57 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1180) +# (XXX from i386:NOTES,v 1.1187) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.26 2005/02/28 00:58:06 obrien Exp $ # ==== //depot/projects/hammer/sys/amd64/include/_types.h#10 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/exec.h#8 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Mar 1 00:06:06 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8424216A4D1; Tue, 1 Mar 2005 00:06:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 564FD16A4CE for ; Tue, 1 Mar 2005 00:06:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 00C8A43D55 for ; Tue, 1 Mar 2005 00:06:06 +0000 (GMT) (envelope-from kelly@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j21065rQ077573 for ; Tue, 1 Mar 2005 00:06:05 GMT (envelope-from kelly@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j21065Tl077570 for perforce@freebsd.org; Tue, 1 Mar 2005 00:06:05 GMT (envelope-from kelly@FreeBSD.org) Date: Tue, 1 Mar 2005 00:06:05 GMT Message-Id: <200503010006.j21065Tl077570@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kelly@FreeBSD.org using -f From: Kelly Djahandari To: Perforce Change Reviews Subject: PERFORCE change 72168 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2005 00:06:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=72168 Change 72168 by kelly@kelly_riveroaks2.earthlink.net on 2005/03/01 00:05:53 Added newline to end of file to avoid error with restorcon comment at end of pwd_mkdb line. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/passwd.fc#6 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/passwd.fc#6 (text+ko) ==== @@ -10,4 +10,4 @@ /usr/sbin/pwunconv -- system_u:object_r:admin_passwd_exec_t /usr/sbin/grpconv -- system_u:object_r:admin_passwd_exec_t /usr/sbin/grpunconv -- system_u:object_r:admin_passwd_exec_t -/usr/sbin/pwd_mkdb -- system_u:object_r:pwdmkdb_exec_t+/usr/sbin/pwd_mkdb -- system_u:object_r:pwdmkdb_exec_t From owner-p4-projects@FreeBSD.ORG Tue Mar 1 04:38:36 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03EFC16A4D0; Tue, 1 Mar 2005 04:38:36 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D3A9316A4CE for ; Tue, 1 Mar 2005 04:38:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B548043D55 for ; Tue, 1 Mar 2005 04:38:35 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j214cZ2r098730 for ; Tue, 1 Mar 2005 04:38:35 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j214cZeR098727 for perforce@freebsd.org; Tue, 1 Mar 2005 04:38:35 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 1 Mar 2005 04:38:35 GMT Message-Id: <200503010438.j214cZeR098727@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 72175 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2005 04:38:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=72175 Change 72175 by davidxu@davidxu_celeron on 2005/03/01 04:37:46 Bring back arm support code. Use new ARM_TP_ADDRESS to store thread pointer. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libpthread/sys/lock.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libthread/arch/arm/Makefile.inc#3 add .. //depot/projects/davidxu_thread/src/lib/libthread/arch/arm/arm/pthread_md.c#3 add .. //depot/projects/davidxu_thread/src/lib/libthread/arch/arm/include/pthread_md.h#3 add Differences ... ==== //depot/projects/davidxu_thread/src/lib/libpthread/sys/lock.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/sys/lock.c,v 1.8 2003/11/04 20:01:38 deischen Exp $ + * $FreeBSD: src/lib/libpthread/sys/lock.c,v 1.9 2005/02/27 17:45:55 delphij Exp $ */ #include @@ -183,7 +183,7 @@ atomic_store_rel_ptr(&lu->lu_watchreq->lr_watcher, lu); if ((lck->l_wait == NULL) || ((lck->l_type & LCK_ADAPTIVE) == 0)) { - while (lu->lu_watchreq->lr_locked == 0) + while (lu->lu_watchreq->lr_locked != 0) ; /* spin, then yield? */ } else { /* From owner-p4-projects@FreeBSD.ORG Tue Mar 1 04:45:46 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0EF2216A4D0; Tue, 1 Mar 2005 04:45:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C585316A4CE for ; Tue, 1 Mar 2005 04:45:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 05DBF43D1F for ; Tue, 1 Mar 2005 04:45:45 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j214jiV8099210 for ; Tue, 1 Mar 2005 04:45:45 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j214jiq8099207 for perforce@freebsd.org; Tue, 1 Mar 2005 04:45:44 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 1 Mar 2005 04:45:44 GMT Message-Id: <200503010445.j214jiq8099207@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 72176 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2005 04:45:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=72176 Change 72176 by davidxu@davidxu_celeron on 2005/03/01 04:45:15 IFC Affected files ... .. //depot/projects/davidxu_thread/src/Makefile#6 integrate .. //depot/projects/davidxu_thread/src/Makefile.inc1#8 integrate .. //depot/projects/davidxu_thread/src/bin/csh/config.h#3 integrate .. //depot/projects/davidxu_thread/src/etc/mtree/BSD.include.dist#4 integrate .. //depot/projects/davidxu_thread/src/include/Makefile#4 integrate .. //depot/projects/davidxu_thread/src/include/nl_types.h#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/compat-43/getwd.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/locale/big5.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/locale/collate.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/locale/collate.h#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/locale/collcmp.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/locale/euc.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/locale/gb18030.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/locale/gb2312.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/locale/gbk.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/locale/mblocal.h#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/locale/mskanji.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/locale/none.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/locale/runetype.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/locale/setrunelocale.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/locale/table.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/locale/utf8.c#3 integrate .. //depot/projects/davidxu_thread/src/lib/libc/nls/C.msg#1 branch .. //depot/projects/davidxu_thread/src/lib/libc/nls/Makefile.inc#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/nls/catclose.3#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/nls/catgets.3#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/nls/catopen.3#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/nls/msgcat.c#3 integrate .. //depot/projects/davidxu_thread/src/lib/libc/nls/msgcat.h#3 delete .. //depot/projects/davidxu_thread/src/lib/libc/nls/ru_RU.KOI8-R.msg#1 branch .. //depot/projects/davidxu_thread/src/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/string/strerror.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/string/strsignal.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libutil/login.conf.5#3 integrate .. //depot/projects/davidxu_thread/src/libexec/rtld-elf/map_object.c#2 integrate .. //depot/projects/davidxu_thread/src/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/davidxu_thread/src/libexec/rtld-elf/rtld.h#2 integrate .. //depot/projects/davidxu_thread/src/sbin/devfs/devfs.8#2 integrate .. //depot/projects/davidxu_thread/src/sbin/devfs/rule.c#2 integrate .. //depot/projects/davidxu_thread/src/sbin/geom/class/concat/geom_concat.c#3 integrate .. //depot/projects/davidxu_thread/src/sbin/geom/class/label/geom_label.c#3 integrate .. //depot/projects/davidxu_thread/src/sbin/geom/class/mirror/geom_mirror.c#4 integrate .. //depot/projects/davidxu_thread/src/sbin/geom/class/raid3/geom_raid3.c#3 integrate .. //depot/projects/davidxu_thread/src/sbin/geom/class/shsec/geom_shsec.c#3 integrate .. //depot/projects/davidxu_thread/src/sbin/geom/class/shsec/gshsec.8#3 integrate .. //depot/projects/davidxu_thread/src/sbin/geom/class/stripe/geom_stripe.c#3 integrate .. //depot/projects/davidxu_thread/src/sbin/geom/core/geom.8#4 integrate .. //depot/projects/davidxu_thread/src/sbin/geom/core/geom.c#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/twa.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/twe.4#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man9/namei.9#2 integrate .. //depot/projects/davidxu_thread/src/share/mk/bsd.info.mk#4 integrate .. //depot/projects/davidxu_thread/src/share/mk/bsd.nls.mk#2 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/amd64/mp_watchdog.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files#6 integrate .. //depot/projects/davidxu_thread/src/sys/conf/majors#3 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi_pcibvar.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpivar.h#5 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/cardbus/cardbus.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/cp/if_cp.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ctau/if_ct.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/dev/fdc/fdc.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/dev/null/null.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/pci/pci.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/sound/isa/mss.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/sound/pcm/sndstat.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/sound/pcm/sound.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/tga/tga_pci.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/zs/zs_sbus.c#2 delete .. //depot/projects/davidxu_thread/src/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/concat/g_concat.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/label/g_label.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/label/g_label.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/mirror/g_mirror.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/geom/mirror/g_mirror.h#5 integrate .. //depot/projects/davidxu_thread/src/sys/geom/raid3/g_raid3.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/geom/raid3/g_raid3.h#4 integrate .. //depot/projects/davidxu_thread/src/sys/geom/shsec/g_shsec.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/geom/shsec/g_shsec.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/geom/stripe/g_stripe.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/geom/stripe/g_stripe.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/gnu/ext2fs/ext2_alloc.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/gnu/ext2fs/ext2_vnops.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/i386/conf/NOTES#5 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/mp_watchdog.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/isa/vga_isa.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_conf.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/subr_bus.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/kern/subr_log.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/tty_cons.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/tty_pty.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/tty_tty.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/tcp_sack.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netinet6/ip6_output.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/opencrypto/cryptodev.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/pc98/pc98/pc98gdc.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/pci/agp_ali.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/powerpc/powerpc/machdep.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/conf/NOTES#3 integrate .. //depot/projects/davidxu_thread/src/sys/sys/param.h#5 integrate .. //depot/projects/davidxu_thread/src/sys/ufs/ufs/ufs_vnops.c#5 integrate .. //depot/projects/davidxu_thread/src/tools/build/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/calendar/calendars/calendar.freebsd#6 integrate .. //depot/projects/davidxu_thread/src/usr.bin/colldef/parse.y#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/gencat/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/gencat/gencat.c#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/gencat/gencat.h#2 delete .. //depot/projects/davidxu_thread/src/usr.bin/gencat/genlib.c#2 delete .. //depot/projects/davidxu_thread/src/usr.sbin/jail/jail.8#3 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/powerd/powerd.8#2 integrate Differences ... ==== //depot/projects/davidxu_thread/src/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.316 2005/02/26 22:02:18 ru Exp $ +# $FreeBSD: src/Makefile,v 1.317 2005/02/27 12:11:34 ru Exp $ # # The user-driven targets are: # @@ -63,7 +63,8 @@ # completely subject to change without notice. # TGTS= all all-man buildenv buildkernel buildworld checkdpadd clean \ - cleandepend cleandir depend distribute distributeworld everything \ + cleandepend cleandir depend distribute distributeworld \ + distribution everything \ hierarchy install installcheck installkernel installkernel.debug\ reinstallkernel reinstallkernel.debug installworld \ kernel-toolchain libraries lint maninstall \ ==== //depot/projects/davidxu_thread/src/Makefile.inc1#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.479 2005/02/27 11:22:57 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.484 2005/02/27 20:31:12 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -546,6 +546,9 @@ @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute +distribution: + cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} distribution + # # buildkernel and installkernel # @@ -591,7 +594,7 @@ # buildkernel: .if empty(BUILDKERNELS) - @echo "ERROR: Missing kernel configuration file(s) (${KERNCONF})."; + @echo "ERROR: Missing kernel configuration file(s) (${KERNCONF})."; \ false .endif .if defined(KERNWARN) @@ -673,7 +676,7 @@ installkernel installkernel.debug \ reinstallkernel reinstallkernel.debug: ${SPECIAL_INSTALLCHECKS} .if empty(INSTALLKERNEL) - @echo "ERROR: No kernel \"${KERNCONF}\" to install." + @echo "ERROR: No kernel \"${KERNCONF}\" to install."; \ false .endif @echo "--------------------------------------------------------------" @@ -738,6 +741,10 @@ # legacy: Build compatibility shims for the next three targets # legacy: +.if ${BOOTSTRAPPING} < 503000 + @echo "ERROR: Source upgrades from versions prior to 5.3 not supported."; \ + false +.endif .for _tool in tools/build ${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \ cd ${.CURDIR}/${_tool}; \ @@ -768,6 +775,14 @@ _cap_mkdb= usr.bin/cap_mkdb .endif +.if ${BOOTSTRAPPING} < 600018 +_colldef= usr.bin/colldef +.endif + +.if ${BOOTSTRAPPING} < 600017 +_gencat= usr.bin/gencat +.endif + .if ${BOOTSTRAPPING} < 600016 _mklocale= usr.bin/mklocale .endif @@ -784,7 +799,8 @@ ${_groff} \ gnu/usr.bin/texinfo \ ${_cap_mkdb} \ - usr.bin/colldef \ + ${_colldef} \ + ${_gencat} \ usr.bin/lorder \ usr.bin/makewhatis \ ${_mklocale} \ ==== //depot/projects/davidxu_thread/src/bin/csh/config.h#3 (text+ko) ==== @@ -7,7 +7,7 @@ * Edit this to match your system type. */ -/* $FreeBSD: src/bin/csh/config.h,v 1.9 2005/02/01 08:48:15 phantom Exp $ */ +/* $FreeBSD: src/bin/csh/config.h,v 1.10 2005/02/27 18:18:32 phantom Exp $ */ #ifndef _h_config #define _h_config @@ -130,7 +130,7 @@ /* we want to use the system malloc when we install as /bin/csh */ #define SYSMALLOC #define BSD_STYLE_COLORLS -/* Use LC_MESSAGES locale category used to open the message catalog */ +/* Use LC_MESSAGES locale category to open the message catalog */ #define MCLoadBySet NL_CAT_LOCALE #endif ==== //depot/projects/davidxu_thread/src/etc/mtree/BSD.include.dist#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.97 2005/02/06 15:17:21 phk Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.98 2005/02/28 02:20:03 njl Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -30,6 +30,8 @@ crypto .. dev + acpica + .. an .. bktr ==== //depot/projects/davidxu_thread/src/include/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.233 2005/02/26 21:47:54 ru Exp $ +# $FreeBSD: src/include/Makefile,v 1.234 2005/02/28 02:20:03 njl Exp $ # # Doing a "make install" builds /usr/include. @@ -36,7 +36,8 @@ pccard posix4 sys vm LSUBDIRS= cam/scsi \ - dev/an dev/bktr dev/firewire dev/ic dev/iicbus ${_dev_ieee488} dev/ofw \ + dev/acpica dev/an dev/bktr dev/firewire \ + dev/ic dev/iicbus ${_dev_ieee488} dev/ofw \ dev/pbio dev/ppbus dev/smbus dev/usb dev/wi dev/utopia \ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ fs/nwfs fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \ ==== //depot/projects/davidxu_thread/src/include/nl_types.h#2 (text+ko) ==== @@ -1,46 +1,94 @@ +/* $NetBSD: nl_types.h,v 1.9 2000/10/03 19:53:32 sommerfeld Exp $ */ + /*- - * Copyright 1990, by Alfalfa Software Incorporated, Cambridge, Massachusetts. + * Copyright (c) 1996 The NetBSD Foundation, Inc. + * All rights reserved. * - * All Rights Reserved + * This code is derived from software contributed to The NetBSD Foundation + * by J.T. Conklin. * - * Permission to use, copy, modify, and distribute this software and its - * documentation for any purpose and without fee is hereby granted, - * provided that the above copyright notice appear in all copies and that - * both that copyright notice and this permission notice appear in - * supporting documentation, and that Alfalfa's name not be used in - * advertising or publicity pertaining to distribution of the software - * without specific, written prior permission. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * ALPHALPHA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING - * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL - * ALPHALPHA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR - * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, - * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, - * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. * - * If you make any modifications, bugfixes or other changes to this software - * we'd appreciate it if you could send a copy to us so we can keep things - * up-to-date. Many thanks. - * Kee Hinckley - * Alfalfa Software, Inc. - * 267 Allston St., #3 - * Cambridge, MA 02139 USA - * nazgul@alfalfa.com - * - * $FreeBSD: src/include/nl_types.h,v 1.10 2002/09/24 17:28:12 mike Exp $ + * $FreeBSD: src/include/nl_types.h,v 1.11 2005/02/27 16:20:53 phantom Exp $ */ #ifndef _NL_TYPES_H_ #define _NL_TYPES_H_ #include -#include +#include + +#ifdef _NLS_PRIVATE +/* + * MESSAGE CATALOG FILE FORMAT. + * + * The NetBSD/FreeBSD message catalog format is similar to the format used by + * Svr4 systems. The differences are: + * * fixed byte order (big endian) + * * fixed data field sizes + * + * A message catalog contains four data types: a catalog header, one + * or more set headers, one or more message headers, and one or more + * text strings. + */ + +#define _NLS_MAGIC 0xff88ff89 + +struct _nls_cat_hdr { + int32_t __magic; + int32_t __nsets; + int32_t __mem; + int32_t __msg_hdr_offset; + int32_t __msg_txt_offset; +} ; + +struct _nls_set_hdr { + int32_t __setno; /* set number: 0 < x <= NL_SETMAX */ + int32_t __nmsgs; /* number of messages in the set */ + int32_t __index; /* index of first msg_hdr in msg_hdr table */ +} ; + +struct _nls_msg_hdr { + int32_t __msgno; /* msg number: 0 < x <= NL_MSGMAX */ + int32_t __msglen; + int32_t __offset; +} ; + +#endif /* _NLS_PRIVATE */ #define NL_SETD 0 #define NL_CAT_LOCALE 1 -typedef void *nl_catd; +typedef struct __nl_cat_d { + void *__data; + int __size; +} *nl_catd; #ifndef _NL_ITEM_DECLARED typedef __nl_item nl_item; @@ -48,9 +96,10 @@ #endif __BEGIN_DECLS -nl_catd catopen(__const char *, int); -char *catgets(nl_catd, int, int, __const char *); +nl_catd catopen(const char *, int); +char *catgets(nl_catd, int, int, const char *) + __attribute__((__format_arg__(4))); int catclose(nl_catd); __END_DECLS -#endif /* !_NL_TYPES_H_ */ +#endif /* _NL_TYPES_H_ */ ==== //depot/projects/davidxu_thread/src/lib/libc/compat-43/getwd.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getwd.c 8.1 (Berkeley) 6/2/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/compat-43/getwd.c,v 1.3 2002/03/22 21:51:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/compat-43/getwd.c,v 1.5 2005/02/27 18:39:02 phantom Exp $"); #include #include @@ -44,13 +44,12 @@ #include char * -getwd(buf) - char *buf; +getwd(char *buf) { char *p; if ( (p = getcwd(buf, MAXPATHLEN)) ) return(p); - (void)strcpy(buf, strerror(errno)); + (void)strerror_r(errno, buf, MAXPATHLEN); return((char *)NULL); } ==== //depot/projects/davidxu_thread/src/lib/libc/locale/big5.c#2 (text+ko) ==== @@ -38,9 +38,10 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)big5.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#include -__FBSDID("$FreeBSD: src/lib/libc/locale/big5.c,v 1.16 2004/05/17 11:16:14 tjr Exp $"); +#include +__FBSDID("$FreeBSD: src/lib/libc/locale/big5.c,v 1.17 2005/02/27 15:11:09 phantom Exp $"); +#include #include #include #include @@ -48,11 +49,11 @@ #include #include "mblocal.h" -int _BIG5_init(_RuneLocale *); -size_t _BIG5_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, - mbstate_t * __restrict); -int _BIG5_mbsinit(const mbstate_t *); -size_t _BIG5_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict); +static size_t _BIG5_mbrtowc(wchar_t * __restrict, const char * __restrict, + size_t, mbstate_t * __restrict); +static int _BIG5_mbsinit(const mbstate_t *); +static size_t _BIG5_wcrtomb(char * __restrict, wchar_t, + mbstate_t * __restrict); typedef struct { wchar_t ch; @@ -70,7 +71,7 @@ return (0); } -int +static int _BIG5_mbsinit(const mbstate_t *ps) { @@ -85,7 +86,7 @@ return ((c >= 0xa1 && c <= 0xfe) ? 2 : 1); } -size_t +static size_t _BIG5_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n, mbstate_t * __restrict ps) { @@ -146,7 +147,7 @@ } } -size_t +static size_t _BIG5_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps) { _BIG5State *bs; ==== //depot/projects/davidxu_thread/src/lib/libc/locale/collate.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/collate.c,v 1.33 2004/09/22 16:56:48 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/collate.c,v 1.35 2005/02/27 20:31:13 ru Exp $"); #include "namespace.h" #include @@ -99,7 +99,7 @@ chains = -1; if (strcmp(strbuf, COLLATE_VERSION) == 0) chains = 0; - else if (strcmp(strbuf, COLLATE_VERSION1_1) == 0) + else if (strcmp(strbuf, COLLATE_VERSION1_2) == 0) chains = 1; if (chains < 0) { (void)fclose(fp); @@ -172,10 +172,21 @@ if (__collate_char_pri_table_ptr != NULL) free(__collate_char_pri_table_ptr); __collate_char_pri_table_ptr = TMP_char_pri_table; + for (i = 0; i < UCHAR_MAX + 1; i++) { + __collate_char_pri_table[i].prim = + ntohl(__collate_char_pri_table[i].prim); + __collate_char_pri_table[i].sec = + ntohl(__collate_char_pri_table[i].sec); + } if (__collate_chain_pri_table != NULL) free(__collate_chain_pri_table); __collate_chain_pri_table = TMP_chain_pri_table; - + for (i = 0; i < chains; i++) { + __collate_chain_pri_table[i].prim = + ntohl(__collate_chain_pri_table[i].prim); + __collate_chain_pri_table[i].sec = + ntohl(__collate_chain_pri_table[i].sec); + } __collate_substitute_nontrivial = 0; for (i = 0; i < UCHAR_MAX + 1; i++) { if (__collate_substitute_table[i][0] != i || @@ -190,8 +201,7 @@ } u_char * -__collate_substitute(s) - const u_char *s; +__collate_substitute(const u_char *s) { int dest_len, len, nlen; int delta = strlen(s); @@ -218,9 +228,7 @@ } void -__collate_lookup(t, len, prim, sec) - const u_char *t; - int *len, *prim, *sec; +__collate_lookup(const u_char *t, int *len, int *prim, int *sec) { struct __collate_st_chain_pri *p2; @@ -240,8 +248,7 @@ } u_char * -__collate_strdup(s) - u_char *s; +__collate_strdup(u_char *s) { u_char *t = strdup(s); ==== //depot/projects/davidxu_thread/src/lib/libc/locale/collate.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/locale/collate.h,v 1.14 2002/08/30 20:26:02 ache Exp $ + * $FreeBSD: src/lib/libc/locale/collate.h,v 1.15 2005/02/27 20:31:13 ru Exp $ */ #ifndef _COLLATE_H_ @@ -37,7 +37,7 @@ #define STR_LEN 10 #define TABLE_SIZE 100 #define COLLATE_VERSION "1.0\n" -#define COLLATE_VERSION1_1 "1.1\n" +#define COLLATE_VERSION1_2 "1.2\n" struct __collate_st_char_pri { int prim, sec; ==== //depot/projects/davidxu_thread/src/lib/libc/locale/collcmp.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/collcmp.c,v 1.17 2003/08/03 19:28:23 ache Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/collcmp.c,v 1.18 2005/02/27 14:54:23 phantom Exp $"); #include #include "collate.h" @@ -34,8 +34,7 @@ * Compare two characters using collate */ -int __collate_range_cmp(c1, c2) - int c1, c2; +int __collate_range_cmp(int c1, int c2) { static char s1[2], s2[2]; ==== //depot/projects/davidxu_thread/src/lib/libc/locale/euc.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)euc.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/euc.c,v 1.20 2004/06/23 07:01:43 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/euc.c,v 1.21 2005/02/27 15:11:09 phantom Exp $"); #include #include @@ -49,11 +49,11 @@ #include #include "mblocal.h" -int _EUC_init(_RuneLocale *); -size_t _EUC_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, - mbstate_t * __restrict); -int _EUC_mbsinit(const mbstate_t *); -size_t _EUC_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict); +static size_t _EUC_mbrtowc(wchar_t * __restrict, const char * __restrict, + size_t, mbstate_t * __restrict); +static int _EUC_mbsinit(const mbstate_t *); +static size_t _EUC_wcrtomb(char * __restrict, wchar_t, + mbstate_t * __restrict); typedef struct { int count[4]; @@ -119,7 +119,7 @@ return (0); } -int +static int _EUC_mbsinit(const mbstate_t *ps) { @@ -136,11 +136,12 @@ static __inline int _euc_set(u_int c) { + c &= 0xff; return ((c & 0x80) ? c == _SS3 ? 3 : c == _SS2 ? 2 : 1 : 0); } -size_t +static size_t _EUC_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n, mbstate_t * __restrict ps) { @@ -213,7 +214,7 @@ return (wc == L'\0' ? 0 : s - os); } -size_t +static size_t _EUC_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps) { _EucState *es; ==== //depot/projects/davidxu_thread/src/lib/libc/locale/gb18030.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/gb18030.c,v 1.6 2004/05/12 14:09:04 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/gb18030.c,v 1.7 2005/02/27 15:11:09 phantom Exp $"); #include #include @@ -39,11 +39,11 @@ #include #include "mblocal.h" -int _GB18030_init(_RuneLocale *); -size_t _GB18030_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, - mbstate_t * __restrict); -int _GB18030_mbsinit(const mbstate_t *); -size_t _GB18030_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict); +static size_t _GB18030_mbrtowc(wchar_t * __restrict, const char * __restrict, + size_t, mbstate_t * __restrict); +static int _GB18030_mbsinit(const mbstate_t *); +static size_t _GB18030_wcrtomb(char * __restrict, wchar_t, + mbstate_t * __restrict); typedef struct { int count; @@ -63,14 +63,14 @@ return (0); } -int +static int _GB18030_mbsinit(const mbstate_t *ps) { return (ps == NULL || ((const _GB18030State *)ps)->count == 0); } -size_t +static size_t _GB18030_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n, mbstate_t * __restrict ps) { @@ -154,7 +154,7 @@ return ((size_t)-1); } -size_t +static size_t _GB18030_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps) { _GB18030State *gs; ==== //depot/projects/davidxu_thread/src/lib/libc/locale/gb2312.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/gb2312.c,v 1.8 2004/05/12 14:09:04 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/gb2312.c,v 1.9 2005/02/27 15:11:09 phantom Exp $"); #include #include @@ -35,11 +35,11 @@ #include #include "mblocal.h" -int _GB2312_init(_RuneLocale *); -size_t _GB2312_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, - mbstate_t * __restrict); -int _GB2312_mbsinit(const mbstate_t *); -size_t _GB2312_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict); +static size_t _GB2312_mbrtowc(wchar_t * __restrict, const char * __restrict, + size_t, mbstate_t * __restrict); +static int _GB2312_mbsinit(const mbstate_t *); +static size_t _GB2312_wcrtomb(char * __restrict, wchar_t, + mbstate_t * __restrict); typedef struct { int count; @@ -58,7 +58,7 @@ return (0); } -int +static int _GB2312_mbsinit(const mbstate_t *ps) { @@ -88,7 +88,7 @@ return (1); } -size_t +static size_t _GB2312_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n, mbstate_t * __restrict ps) { @@ -129,7 +129,7 @@ return (wc == L'\0' ? 0 : len - ocount); } -size_t +static size_t _GB2312_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps) { _GB2312State *gs; ==== //depot/projects/davidxu_thread/src/lib/libc/locale/gbk.c#2 (text+ko) ==== @@ -35,9 +35,10 @@ * SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.11 2004/05/17 11:16:14 tjr Exp $"); +#include +__FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.12 2005/02/27 15:11:09 phantom Exp $"); +#include #include #include #include @@ -45,11 +46,11 @@ #include #include "mblocal.h" -int _GBK_init(_RuneLocale *); -size_t _GBK_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, - mbstate_t * __restrict); -int _GBK_mbsinit(const mbstate_t *); -size_t _GBK_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict); +static size_t _GBK_mbrtowc(wchar_t * __restrict, const char * __restrict, + size_t, mbstate_t * __restrict); +static int _GBK_mbsinit(const mbstate_t *); +static size_t _GBK_wcrtomb(char * __restrict, wchar_t, + mbstate_t * __restrict); typedef struct { wchar_t ch; @@ -67,7 +68,7 @@ return (0); } -int +static int _GBK_mbsinit(const mbstate_t *ps) { @@ -82,7 +83,7 @@ return ((c >= 0x81 && c <= 0xfe) ? 2 : 1); } -size_t +static size_t _GBK_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n, mbstate_t * __restrict ps) { @@ -143,7 +144,7 @@ } } -size_t +static size_t _GBK_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps) { _GBKState *gs; ==== //depot/projects/davidxu_thread/src/lib/libc/locale/mblocal.h#2 (text+ko) ==== @@ -23,13 +23,25 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/locale/mblocal.h,v 1.4 2004/10/17 06:51:50 tjr Exp $ + * $FreeBSD: src/lib/libc/locale/mblocal.h,v 1.5 2005/02/27 15:11:09 phantom Exp $ */ #ifndef _MBLOCAL_H_ #define _MBLOCAL_H_ /* + * Rune initialization function prototypes. + */ +int _none_init(_RuneLocale *); +int _UTF8_init(_RuneLocale *); +int _EUC_init(_RuneLocale *); +int _GB18030_init(_RuneLocale *); +int _GB2312_init(_RuneLocale *); +int _GBK_init(_RuneLocale *); +int _BIG5_init(_RuneLocale *); +int _MSKanji_init(_RuneLocale *); + +/* * Conversion function pointers for current encoding. */ extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict, @@ -41,19 +53,6 @@ extern size_t (*__wcsnrtombs)(char * __restrict, const wchar_t ** __restrict, size_t, size_t, mbstate_t * __restrict); -/* - * Conversion functions for "NONE"/C/POSIX encoding. - */ -extern size_t _none_mbrtowc(wchar_t * __restrict, const char * __restrict, - size_t, mbstate_t * __restrict); -extern int _none_mbsinit(const mbstate_t *); -extern size_t _none_mbsnrtowcs(wchar_t * __restrict, const char ** __restrict, - size_t, size_t, mbstate_t * __restrict); -extern size_t _none_wcrtomb(char * __restrict, wchar_t, - mbstate_t * __restrict); -extern size_t _none_wcsnrtombs(char * __restrict, const wchar_t ** __restrict, - size_t, size_t, mbstate_t * __restrict); - extern size_t __mbsnrtowcs_std(wchar_t * __restrict, const char ** __restrict, size_t, size_t, mbstate_t * __restrict); extern size_t __wcsnrtombs_std(char * __restrict, const wchar_t ** __restrict, ==== //depot/projects/davidxu_thread/src/lib/libc/locale/mskanji.c#2 (text+ko) ==== @@ -36,9 +36,10 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)mskanji.c 1.0 (Phase One) 5/5/95"; #endif /* LIBC_SCCS and not lint */ -#include -__FBSDID("$FreeBSD: src/lib/libc/locale/mskanji.c,v 1.16 2004/05/14 15:40:47 tjr Exp $"); +#include +__FBSDID("$FreeBSD: src/lib/libc/locale/mskanji.c,v 1.17 2005/02/27 15:11:09 phantom Exp $"); +#include #include #include #include @@ -46,11 +47,11 @@ #include #include "mblocal.h" -int _MSKanji_init(_RuneLocale *); -size_t _MSKanji_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, - mbstate_t * __restrict); -int _MSKanji_mbsinit(const mbstate_t *); -size_t _MSKanji_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict); +static size_t _MSKanji_mbrtowc(wchar_t * __restrict, const char * __restrict, + size_t, mbstate_t * __restrict); +static int _MSKanji_mbsinit(const mbstate_t *); +static size_t _MSKanji_wcrtomb(char * __restrict, wchar_t, + mbstate_t * __restrict); typedef struct { wchar_t ch; @@ -68,14 +69,14 @@ return (0); } -int +static int _MSKanji_mbsinit(const mbstate_t *ps) { return (ps == NULL || ((const _MSKanjiState *)ps)->ch == 0); } -size_t +static size_t _MSKanji_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n, mbstate_t * __restrict ps) { @@ -133,7 +134,7 @@ } } -size_t +static size_t _MSKanji_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps) { _MSKanjiState *ms; ==== //depot/projects/davidxu_thread/src/lib/libc/locale/none.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)none.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/none.c,v 1.12 2004/07/21 10:54:57 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/none.c,v 1.13 2005/02/27 15:11:09 phantom Exp $"); #include #include @@ -51,16 +51,16 @@ #include #include "mblocal.h" -int _none_init(_RuneLocale *); -size_t _none_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, - mbstate_t * __restrict); -int _none_mbsinit(const mbstate_t *); -size_t _none_mbsnrtowcs(wchar_t * __restrict dst, - const char ** __restrict src, size_t nms, size_t len, - mbstate_t * __restrict ps __unused); -size_t _none_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict); -size_t _none_wcsnrtombs(char * __restrict, const wchar_t ** __restrict, - size_t, size_t, mbstate_t * __restrict); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 1 05:10:17 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55ED116A4E2; Tue, 1 Mar 2005 05:10:16 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C53C16A4DE for ; Tue, 1 Mar 2005 05:10:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F84D43D5D for ; Tue, 1 Mar 2005 05:10:15 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j215AFQO007011 for ; Tue, 1 Mar 2005 05:10:15 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j215AE84007008 for perforce@freebsd.org; Tue, 1 Mar 2005 05:10:14 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 1 Mar 2005 05:10:14 GMT Message-Id: <200503010510.j215AE84007008@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 72178 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2005 05:10:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=72178 Change 72178 by davidxu@davidxu_celeron on 2005/03/01 05:09:22 Fix comment and style. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/arch/i386/include/pthread_md.h#8 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/i386/include/pthread_md.h#8 (text+ko) ==== @@ -26,8 +26,9 @@ * * $FreeBSD$ */ + /* - * Machine-dependent thread prototypes/definitions for the thread kernel. + * Machine-dependent thread prototypes/definitions. */ #ifndef _PTHREAD_MD_H_ #define _PTHREAD_MD_H_ From owner-p4-projects@FreeBSD.ORG Tue Mar 1 05:14:23 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C004416A4E0; Tue, 1 Mar 2005 05:14:22 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 84AB116A4E8 for ; Tue, 1 Mar 2005 05:14:22 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 467CA43D49 for ; Tue, 1 Mar 2005 05:14:22 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j215EMRj007328 for ; Tue, 1 Mar 2005 05:14:22 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j215ELjQ007325 for perforce@freebsd.org; Tue, 1 Mar 2005 05:14:21 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 1 Mar 2005 05:14:21 GMT Message-Id: <200503010514.j215ELjQ007325@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 72182 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2005 05:14:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=72182 Change 72182 by davidxu@davidxu_celeron on 2005/03/01 05:14:04 Fix comment. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/arch/powerpc/include/pthread_md.h#6 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/powerpc/include/pthread_md.h#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ /* - * Machine-dependent thread prototypes/definitions for the thread kernel. + * Machine-dependent thread prototypes/definitions. */ #ifndef _PTHREAD_MD_H_ #define _PTHREAD_MD_H_ From owner-p4-projects@FreeBSD.ORG Tue Mar 1 05:15:25 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A76B316A4EE; Tue, 1 Mar 2005 05:15:24 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6251116A4D6 for ; Tue, 1 Mar 2005 05:15:24 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C03943D3F for ; Tue, 1 Mar 2005 05:15:24 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j215FNbm007454 for ; Tue, 1 Mar 2005 05:15:23 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j215FNDW007451 for perforce@freebsd.org; Tue, 1 Mar 2005 05:15:23 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 1 Mar 2005 05:15:23 GMT Message-Id: <200503010515.j215FNDW007451@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 72183 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2005 05:15:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=72183 Change 72183 by davidxu@davidxu_celeron on 2005/03/01 05:14:52 Fix comment. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/include/pthread_md.h#9 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/include/pthread_md.h#9 (text+ko) ==== @@ -28,7 +28,7 @@ */ /* - * Machine-dependent thread prototypes/definitions for the thread kernel. + * Machine-dependent thread prototypes/definitions. */ #ifndef _PTHREAD_MD_H_ #define _PTHREAD_MD_H_ From owner-p4-projects@FreeBSD.ORG Tue Mar 1 05:16:26 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3AF4416A4F5; Tue, 1 Mar 2005 05:16:26 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EA16416A4E0 for ; Tue, 1 Mar 2005 05:16:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BBDC443D5A for ; Tue, 1 Mar 2005 05:16:25 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j215GPsB007475 for ; Tue, 1 Mar 2005 05:16:25 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j215GPJx007472 for perforce@freebsd.org; Tue, 1 Mar 2005 05:16:25 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 1 Mar 2005 05:16:25 GMT Message-Id: <200503010516.j215GPJx007472@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 72184 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2005 05:16:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=72184 Change 72184 by davidxu@davidxu_celeron on 2005/03/01 05:15:30 Fix comment. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/include/pthread_md.h#10 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/include/pthread_md.h#10 (text+ko) ==== @@ -28,7 +28,7 @@ */ /* - * Machine-dependent thread prototypes/definitions for the thread kernel. + * Machine-dependent thread prototypes/definitions. */ #ifndef _PTHREAD_MD_H_ #define _PTHREAD_MD_H_ From owner-p4-projects@FreeBSD.ORG Tue Mar 1 11:49:57 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C007A16A4D0; Tue, 1 Mar 2005 11:49:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9A21716A4CE for ; Tue, 1 Mar 2005 11:49:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6BD8B43D2D for ; Tue, 1 Mar 2005 11:49:56 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j21BnuA8042306 for ; Tue, 1 Mar 2005 11:49:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j21BnuI2042303 for perforce@freebsd.org; Tue, 1 Mar 2005 11:49:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 1 Mar 2005 11:49:56 GMT Message-Id: <200503011149.j21BnuI2042303@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 Subject: PERFORCE change 72223 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2005 11:49:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=72223 Change 72223 by rwatson@rwatson_paprika on 2005/03/01 11:49:44 Initialize error to 0 in sysctl_rule, as we'll later check it to see if we need to copyout or not. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#88 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#88 (text+ko) ==== @@ -140,6 +140,7 @@ u_int namelen; int error, index, *name; + error = 0; name = (int *)arg1; namelen = arg2; From owner-p4-projects@FreeBSD.ORG Tue Mar 1 11:57:07 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60A7D16A4D0; Tue, 1 Mar 2005 11:57:07 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 39CFD16A4CE for ; Tue, 1 Mar 2005 11:57:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AECB143D55 for ; Tue, 1 Mar 2005 11:57:06 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j21Bv6gn042734 for ; Tue, 1 Mar 2005 11:57:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j21Bv6oT042731 for perforce@freebsd.org; Tue, 1 Mar 2005 11:57:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 1 Mar 2005 11:57:06 GMT Message-Id: <200503011157.j21Bv6oT042731@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 Subject: PERFORCE change 72226 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2005 11:57:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=72226 Change 72226 by rwatson@rwatson_paprika on 2005/03/01 11:56:08 Rename several MAC Framework and policy entry points relating to POSIX semaphores for improved consistency: mac_init_posix_ksem() -> mac_init_posix_sem() mac_create_posix_ksem() -> mac_create_posix_sem() mac_destroy_posix_ksem() -> mac_destroy_posix_sem() Similarly rename functions in mac_posix_sem.c, as well as the various policies currently implementing those entry points. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/uipc_sem.c#19 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_posix_sem.c#9 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#248 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#88 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#201 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#25 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#140 edit .. //depot/projects/trustedbsd/mac/sys/sys/file.h#22 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#265 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#222 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_sem.c#19 (text+ko) ==== @@ -1,6 +1,6 @@ /* * Copyright (c) 2002 Alfred Perlstein - * Copyright (c) 2003 Networks Associates Technology, Inc. + * Copyright (c) 2003-2005 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project in part by Network @@ -259,8 +259,8 @@ else ret->ks_ref = 1; #ifdef MAC - mac_init_posix_ksem(ret); - mac_create_posix_ksem(uc, ret); + mac_init_posix_sem(ret); + mac_create_posix_sem(uc, ret); #endif mtx_lock(&sem_lock); nsems++; @@ -524,7 +524,7 @@ free(ks->ks_name, M_SEM); cv_destroy(&ks->ks_cv); #ifdef MAC - mac_destroy_posix_ksem(ks); + mac_destroy_posix_sem(ks); #endif mtx_destroy(&ks->ks_mtx); free(ks, M_SEM); ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_posix_sem.c#9 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003 Networks Associates Technology, Inc. + * Copyright (c) 2003-2005 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project in part by Network @@ -55,50 +55,50 @@ TUNABLE_INT("security.mac.enforce_posix_sem", &mac_enforce_posix_sem); #ifdef MAC_DEBUG -static unsigned int nmacposixksems; -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, posix_ksems, CTLFLAG_RD, - &nmacposixksems, 0, "number of posix global semaphores inuse"); +static unsigned int nmacposixsems; +SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, posix_sems, CTLFLAG_RD, + &nmacposixsems, 0, "number of posix global semaphores inuse"); #endif static struct label * -mac_posix_ksem_label_alloc(void) +mac_posix_sem_label_alloc(void) { struct label *label; label = mac_labelzone_alloc(M_WAITOK); - MAC_PERFORM(init_posix_ksem_label, label); - MAC_DEBUG_COUNTER_INC(&nmacposixksems); + MAC_PERFORM(init_posix_sem_label, label); + MAC_DEBUG_COUNTER_INC(&nmacposixsems); return (label); } void -mac_init_posix_ksem(struct ksem *ksemptr) +mac_init_posix_sem(struct ksem *ksemptr) { - ksemptr->ks_label = mac_posix_ksem_label_alloc(); + ksemptr->ks_label = mac_posix_sem_label_alloc(); } static void -mac_posix_ksem_label_free(struct label *label) +mac_posix_sem_label_free(struct label *label) { - MAC_PERFORM(destroy_posix_ksem_label, label); - MAC_DEBUG_COUNTER_DEC(&nmacposixksems); + MAC_PERFORM(destroy_posix_sem_label, label); + MAC_DEBUG_COUNTER_DEC(&nmacposixsems); } void -mac_destroy_posix_ksem(struct ksem *ksemptr) +mac_destroy_posix_sem(struct ksem *ksemptr) { - mac_posix_ksem_label_free(ksemptr->ks_label); + mac_posix_sem_label_free(ksemptr->ks_label); ksemptr->ks_label = NULL; } void -mac_create_posix_ksem(struct ucred *cred, struct ksem *ksemptr) +mac_create_posix_sem(struct ucred *cred, struct ksem *ksemptr) { - MAC_PERFORM(create_posix_ksem, cred, ksemptr, ksemptr->ks_label); + MAC_PERFORM(create_posix_sem, cred, ksemptr, ksemptr->ks_label); } int ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#248 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 1999-2002 Robert N. M. Watson - * Copyright (c) 2001-2004 Networks Associates Technology, Inc. + * Copyright (c) 2001-2005 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -1116,7 +1116,7 @@ } static void -mac_biba_create_posix_ksem(struct ucred *cred, struct ksem *ksemptr, +mac_biba_create_posix_sem(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label) { struct mac_biba *source, *dest; @@ -3158,7 +3158,7 @@ .mpo_init_mount_label = mac_biba_init_label, .mpo_init_mount_fs_label = mac_biba_init_label, .mpo_init_pipe_label = mac_biba_init_label, - .mpo_init_posix_ksem_label = mac_biba_init_label, + .mpo_init_posix_sem_label = mac_biba_init_label, .mpo_init_socket_label = mac_biba_init_label_waitcheck, .mpo_init_socket_peer_label = mac_biba_init_label_waitcheck, .mpo_init_vnode_label = mac_biba_init_label, @@ -3176,7 +3176,7 @@ .mpo_destroy_mount_label = mac_biba_destroy_label, .mpo_destroy_mount_fs_label = mac_biba_destroy_label, .mpo_destroy_pipe_label = mac_biba_destroy_label, - .mpo_destroy_posix_ksem_label = mac_biba_destroy_label, + .mpo_destroy_posix_sem_label = mac_biba_destroy_label, .mpo_destroy_socket_label = mac_biba_destroy_label, .mpo_destroy_socket_peer_label = mac_biba_destroy_label, .mpo_destroy_vnode_label = mac_biba_destroy_label, @@ -3211,7 +3211,7 @@ .mpo_setlabel_vnode_extattr = mac_biba_setlabel_vnode_extattr, .mpo_create_mbuf_from_socket = mac_biba_create_mbuf_from_socket, .mpo_create_pipe = mac_biba_create_pipe, - .mpo_create_posix_ksem = mac_biba_create_posix_ksem, + .mpo_create_posix_sem = mac_biba_create_posix_sem, .mpo_create_socket = mac_biba_create_socket, .mpo_create_socket_from_socket = mac_biba_create_socket_from_socket, .mpo_relabel_pipe = mac_biba_relabel_pipe, ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#88 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 1999-2002 Robert N. M. Watson - * Copyright (c) 2001-2003 Networks Associates Technology, Inc. + * Copyright (c) 2001-2005 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -1188,7 +1188,7 @@ } static void -mac_lomac_create_posix_ksem(struct ucred *cred, struct ksem *ksemptr, +mac_lomac_create_posix_sem(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label) { struct mac_lomac *source, *dest; @@ -3083,7 +3083,7 @@ .mpo_init_mount_label = mac_lomac_init_label, .mpo_init_mount_fs_label = mac_lomac_init_label, .mpo_init_pipe_label = mac_lomac_init_label, - .mpo_init_posix_ksem_label = mac_lomac_init_label, + .mpo_init_posix_sem_label = mac_lomac_init_label, .mpo_init_proc_label = mac_lomac_init_proc_label, .mpo_init_socket_label = mac_lomac_init_label_waitcheck, .mpo_init_socket_peer_label = mac_lomac_init_label_waitcheck, @@ -3102,7 +3102,7 @@ .mpo_destroy_mount_label = mac_lomac_destroy_label, .mpo_destroy_mount_fs_label = mac_lomac_destroy_label, .mpo_destroy_pipe_label = mac_lomac_destroy_label, - .mpo_destroy_posix_ksem_label = mac_lomac_destroy_label, + .mpo_destroy_posix_sem_label = mac_lomac_destroy_label, .mpo_destroy_proc_label = mac_lomac_destroy_proc_label, .mpo_destroy_socket_label = mac_lomac_destroy_label, .mpo_destroy_socket_peer_label = mac_lomac_destroy_label, @@ -3139,7 +3139,7 @@ .mpo_setlabel_vnode_extattr = mac_lomac_setlabel_vnode_extattr, .mpo_create_mbuf_from_socket = mac_lomac_create_mbuf_from_socket, .mpo_create_pipe = mac_lomac_create_pipe, - .mpo_create_posix_ksem = mac_lomac_create_posix_ksem, + .mpo_create_posix_sem = mac_lomac_create_posix_sem, .mpo_create_socket = mac_lomac_create_socket, .mpo_create_socket_from_socket = mac_lomac_create_socket_from_socket, .mpo_relabel_pipe = mac_lomac_relabel_pipe, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#201 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 1999-2002 Robert N. M. Watson - * Copyright (c) 2001-2004 Networks Associates Technology, Inc. + * Copyright (c) 2001-2005 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -1082,7 +1082,7 @@ } static void -mac_mls_create_posix_ksem(struct ucred *cred, struct ksem *ksemptr, +mac_mls_create_posix_sem(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label) { struct mac_mls *source, *dest; @@ -2939,7 +2939,7 @@ .mpo_init_mount_label = mac_mls_init_label, .mpo_init_mount_fs_label = mac_mls_init_label, .mpo_init_pipe_label = mac_mls_init_label, - .mpo_init_posix_ksem_label = mac_mls_init_label, + .mpo_init_posix_sem_label = mac_mls_init_label, .mpo_init_socket_label = mac_mls_init_label_waitcheck, .mpo_init_socket_peer_label = mac_mls_init_label_waitcheck, .mpo_init_vnode_label = mac_mls_init_label, @@ -2957,7 +2957,7 @@ .mpo_destroy_mount_label = mac_mls_destroy_label, .mpo_destroy_mount_fs_label = mac_mls_destroy_label, .mpo_destroy_pipe_label = mac_mls_destroy_label, - .mpo_destroy_posix_ksem_label = mac_mls_destroy_label, + .mpo_destroy_posix_sem_label = mac_mls_destroy_label, .mpo_destroy_socket_label = mac_mls_destroy_label, .mpo_destroy_socket_peer_label = mac_mls_destroy_label, .mpo_destroy_vnode_label = mac_mls_destroy_label, @@ -2992,7 +2992,7 @@ .mpo_setlabel_vnode_extattr = mac_mls_setlabel_vnode_extattr, .mpo_create_mbuf_from_socket = mac_mls_create_mbuf_from_socket, .mpo_create_pipe = mac_mls_create_pipe, - .mpo_create_posix_ksem = mac_mls_create_posix_ksem, + .mpo_create_posix_sem = mac_mls_create_posix_sem, .mpo_create_socket = mac_mls_create_socket, .mpo_create_socket_from_socket = mac_mls_create_socket_from_socket, .mpo_relabel_pipe = mac_mls_relabel_pipe, ==== //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#25 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 1999-2002 Robert N. M. Watson - * Copyright (c) 2001-2003 Networks Associates Technology, Inc. + * Copyright (c) 2001-2005 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -277,7 +277,7 @@ } static void -stub_create_posix_ksem(struct ucred *cred, struct ksem *ksemptr, +stub_create_posix_sem(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label) { @@ -1370,7 +1370,7 @@ .mpo_init_mount_label = stub_init_label, .mpo_init_mount_fs_label = stub_init_label, .mpo_init_pipe_label = stub_init_label, - .mpo_init_posix_ksem_label = stub_init_label, + .mpo_init_posix_sem_label = stub_init_label, .mpo_init_socket_label = stub_init_label_waitcheck, .mpo_init_socket_peer_label = stub_init_label_waitcheck, .mpo_init_vnode_label = stub_init_label, @@ -1388,7 +1388,7 @@ .mpo_destroy_mount_label = stub_destroy_label, .mpo_destroy_mount_fs_label = stub_destroy_label, .mpo_destroy_pipe_label = stub_destroy_label, - .mpo_destroy_posix_ksem_label = stub_destroy_label, + .mpo_destroy_posix_sem_label = stub_destroy_label, .mpo_destroy_socket_label = stub_destroy_label, .mpo_destroy_socket_peer_label = stub_destroy_label, .mpo_destroy_vnode_label = stub_destroy_label, @@ -1427,7 +1427,7 @@ .mpo_update_devfsdirent = stub_update_devfsdirent, .mpo_create_mbuf_from_socket = stub_create_mbuf_from_socket, .mpo_create_pipe = stub_create_pipe, - .mpo_create_posix_ksem = stub_create_posix_ksem, + .mpo_create_posix_sem = stub_create_posix_sem, .mpo_create_socket = stub_create_socket, .mpo_create_socket_from_socket = stub_create_socket_from_socket, .mpo_relabel_pipe = stub_relabel_pipe, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#140 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 1999-2002 Robert N. M. Watson - * Copyright (c) 2001-2004 Networks Associates Technology, Inc. + * Copyright (c) 2001-2005 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -457,7 +457,7 @@ } static void -mac_test_init_posix_ksem_label(struct label *label) +mac_test_init_posix_sem_label(struct label *label) { SLOT(label) = POSIXSEMMAGIC; @@ -715,16 +715,16 @@ } static void -mac_test_destroy_posix_ksem_label(struct label *label) +mac_test_destroy_posix_sem_label(struct label *label) { if ((SLOT(label) == POSIXSEMMAGIC || SLOT(label) == 0)) { atomic_add_int(&destroy_count_posixsems, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - DEBUGGER("mac_test_destroy_posix_ksem: dup destroy"); + DEBUGGER("mac_test_destroy_posix_sem: dup destroy"); } else { - DEBUGGER("mac_test_destroy_posix_ksem: corrupted label"); + DEBUGGER("mac_test_destroy_posix_sem: corrupted label"); } } @@ -988,7 +988,7 @@ } static void -mac_test_create_posix_ksem(struct ucred *cred, struct ksem *ksem, +mac_test_create_posix_sem(struct ucred *cred, struct ksem *ksem, struct label *posixlabel) { @@ -1745,7 +1745,7 @@ } static int -mac_test_check_posix_ksem(struct ucred *cred, struct ksem *ksemptr, +mac_test_check_posix_sem(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label) { @@ -2412,7 +2412,7 @@ .mpo_init_mount_label = mac_test_init_mount_label, .mpo_init_mount_fs_label = mac_test_init_mount_fs_label, .mpo_init_pipe_label = mac_test_init_pipe_label, - .mpo_init_posix_ksem_label = mac_test_init_posix_ksem_label, + .mpo_init_posix_sem_label = mac_test_init_posix_sem_label, .mpo_init_proc_label = mac_test_init_proc_label, .mpo_init_socket_label = mac_test_init_socket_label, .mpo_init_socket_peer_label = mac_test_init_socket_peer_label, @@ -2432,7 +2432,7 @@ .mpo_destroy_mount_label = mac_test_destroy_mount_label, .mpo_destroy_mount_fs_label = mac_test_destroy_mount_fs_label, .mpo_destroy_pipe_label = mac_test_destroy_pipe_label, - .mpo_destroy_posix_ksem_label = mac_test_destroy_posix_ksem_label, + .mpo_destroy_posix_sem_label = mac_test_destroy_posix_sem_label, .mpo_destroy_proc_label = mac_test_destroy_proc_label, .mpo_destroy_socket_label = mac_test_destroy_socket_label, .mpo_destroy_socket_peer_label = mac_test_destroy_socket_peer_label, @@ -2468,7 +2468,7 @@ .mpo_update_devfsdirent = mac_test_update_devfsdirent, .mpo_create_mbuf_from_socket = mac_test_create_mbuf_from_socket, .mpo_create_pipe = mac_test_create_pipe, - .mpo_create_posix_ksem = mac_test_create_posix_ksem, + .mpo_create_posix_sem = mac_test_create_posix_sem, .mpo_create_socket = mac_test_create_socket, .mpo_create_socket_from_socket = mac_test_create_socket_from_socket, .mpo_relabel_pipe = mac_test_relabel_pipe, @@ -2543,13 +2543,13 @@ .mpo_check_pipe_relabel = mac_test_check_pipe_relabel, .mpo_check_pipe_stat = mac_test_check_pipe_stat, .mpo_check_pipe_write = mac_test_check_pipe_write, - .mpo_check_posix_sem_close = mac_test_check_posix_ksem, - .mpo_check_posix_sem_destroy = mac_test_check_posix_ksem, - .mpo_check_posix_sem_getvalue = mac_test_check_posix_ksem, - .mpo_check_posix_sem_openexisting = mac_test_check_posix_ksem, - .mpo_check_posix_sem_post = mac_test_check_posix_ksem, - .mpo_check_posix_sem_unlink = mac_test_check_posix_ksem, - .mpo_check_posix_sem_wait = mac_test_check_posix_ksem, + .mpo_check_posix_sem_close = mac_test_check_posix_sem, + .mpo_check_posix_sem_destroy = mac_test_check_posix_sem, + .mpo_check_posix_sem_getvalue = mac_test_check_posix_sem, + .mpo_check_posix_sem_openexisting = mac_test_check_posix_sem, + .mpo_check_posix_sem_post = mac_test_check_posix_sem, + .mpo_check_posix_sem_unlink = mac_test_check_posix_sem, + .mpo_check_posix_sem_wait = mac_test_check_posix_sem, .mpo_check_proc_debug = mac_test_check_proc_debug, .mpo_check_proc_sched = mac_test_check_proc_sched, .mpo_check_proc_setuid = mac_test_check_proc_setuid, ==== //depot/projects/trustedbsd/mac/sys/sys/file.h#22 (text+ko) ==== @@ -131,6 +131,7 @@ off_t f_nextoff; /* * offset of next expected read or write */ + void *f_label; /* Place-holder for struct label pointer. */ }; #endif /* _KERNEL */ ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#265 (text+ko) ==== @@ -156,7 +156,7 @@ int mac_init_ipq(struct ipq *, int flag); int mac_init_socket(struct socket *, int flag); void mac_init_pipe(struct pipepair *); -void mac_init_posix_ksem(struct ksem *); +void mac_init_posix_sem(struct ksem *); int mac_init_mbuf(struct mbuf *mbuf, int flag); int mac_init_mbuf_tag(struct m_tag *, int flag); void mac_init_mount(struct mount *); @@ -176,7 +176,7 @@ void mac_destroy_ipq(struct ipq *); void mac_destroy_socket(struct socket *); void mac_destroy_pipe(struct pipepair *); -void mac_destroy_posix_ksem(struct ksem *); +void mac_destroy_posix_sem(struct ksem *); void mac_destroy_proc(struct proc *); void mac_destroy_mbuf_tag(struct m_tag *); void mac_destroy_mount(struct mount *); @@ -239,7 +239,7 @@ /* * Labeling event operations: POSIX (global/inter-process) semaphores. */ -void mac_create_posix_ksem(struct ucred *cred, struct ksem *ksemptr); +void mac_create_posix_sem(struct ucred *cred, struct ksem *ksemptr); /* ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#222 (text+ko) ==== @@ -115,7 +115,7 @@ int (*mpo_init_socket_label)(struct label *label, int flag); int (*mpo_init_socket_peer_label)(struct label *label, int flag); void (*mpo_init_pipe_label)(struct label *label); - void (*mpo_init_posix_ksem_label)(struct label *label); + void (*mpo_init_posix_sem_label)(struct label *label); void (*mpo_init_proc_label)(struct label *label); void (*mpo_init_vnode_label)(struct label *label); void (*mpo_destroy_bpfdesc_label)(struct label *label); @@ -134,7 +134,7 @@ void (*mpo_destroy_socket_label)(struct label *label); void (*mpo_destroy_socket_peer_label)(struct label *label); void (*mpo_destroy_pipe_label)(struct label *label); - void (*mpo_destroy_posix_ksem_label)(struct label *label); + void (*mpo_destroy_posix_sem_label)(struct label *label); void (*mpo_destroy_proc_label)(struct label *label); void (*mpo_destroy_vnode_label)(struct label *label); void (*mpo_cleanup_sysv_msgmsg)(struct label *msglabel); @@ -259,7 +259,7 @@ /* * Labeling event operations: POSIX (global/inter-process) semaphores. */ - void (*mpo_create_posix_ksem)(struct ucred *cred, + void (*mpo_create_posix_sem)(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label); /* From owner-p4-projects@FreeBSD.ORG Tue Mar 1 14:05:47 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0779E16A4EA; Tue, 1 Mar 2005 14:05:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D4DBA16A4DB for ; Tue, 1 Mar 2005 14:05:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7DD5643D48 for ; Tue, 1 Mar 2005 14:05:46 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j21E5k3W056091 for ; Tue, 1 Mar 2005 14:05:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j21E5kX9056088 for perforce@freebsd.org; Tue, 1 Mar 2005 14:05:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 1 Mar 2005 14:05:46 GMT Message-Id: <200503011405.j21E5kX9056088@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 Subject: PERFORCE change 72237 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2005 14:05:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=72237 Change 72237 by rwatson@rwatson_paprika on 2005/03/01 14:04:59 Rename check_posix_sem_openexisting MAC Framework entry points and policy entry points to check_posix_sem_open, which while less specific may be more clear. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/uipc_sem.c#20 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_posix_sem.c#10 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#249 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#89 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#202 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#26 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#141 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#266 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#223 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_sem.c#20 (text+ko) ==== @@ -378,8 +378,8 @@ mtx_unlock(&sem_lock); #ifdef MAC mtx_lock(&ks->ks_mtx); - if((error = mac_check_posix_sem_openexisting(td->td_ucred, ks))) { - DP(("MAC Framework: mac_check_posix_sem_openexisting access denied\n")); + if((error = mac_check_posix_sem_open(td->td_ucred, ks))) { + DP(("MAC Framework: mac_check_posix_sem_open access denied\n")); mtx_unlock(&ks->ks_mtx); goto err_open_existing; } ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_posix_sem.c#10 (text+ko) ==== @@ -128,15 +128,14 @@ } int -mac_check_posix_sem_openexisting(struct ucred *cred, struct ksem *ksemptr) +mac_check_posix_sem_open(struct ucred *cred, struct ksem *ksemptr) { int error; if (!mac_enforce_posix_sem) return (0); - MAC_CHECK(check_posix_sem_openexisting, cred, ksemptr, - ksemptr->ks_label); + MAC_CHECK(check_posix_sem_open, cred, ksemptr, ksemptr->ks_label); return(error); } ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#249 (text+ko) ==== @@ -3277,7 +3277,7 @@ .mpo_check_posix_sem_close = mac_biba_check_posix_sem_write, .mpo_check_posix_sem_destroy = mac_biba_check_posix_sem_write, .mpo_check_posix_sem_getvalue = mac_biba_check_posix_sem_rdonly, - .mpo_check_posix_sem_openexisting = mac_biba_check_posix_sem_write, + .mpo_check_posix_sem_open = mac_biba_check_posix_sem_write, .mpo_check_posix_sem_post = mac_biba_check_posix_sem_write, .mpo_check_posix_sem_unlink = mac_biba_check_posix_sem_write, .mpo_check_posix_sem_wait = mac_biba_check_posix_sem_write, ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#89 (text+ko) ==== @@ -3207,7 +3207,7 @@ .mpo_check_posix_sem_close = mac_lomac_check_posix_sem_write, .mpo_check_posix_sem_destroy = mac_lomac_check_posix_sem_write, .mpo_check_posix_sem_getvalue = mac_lomac_check_posix_sem_rdonly, - .mpo_check_posix_sem_openexisting = mac_lomac_check_posix_sem_write, + .mpo_check_posix_sem_open = mac_lomac_check_posix_sem_write, .mpo_check_posix_sem_post = mac_lomac_check_posix_sem_write, .mpo_check_posix_sem_unlink = mac_lomac_check_posix_sem_write, .mpo_check_posix_sem_wait = mac_lomac_check_posix_sem_write, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#202 (text+ko) ==== @@ -3056,7 +3056,7 @@ .mpo_check_posix_sem_close = mac_mls_check_posix_sem_write, .mpo_check_posix_sem_destroy = mac_mls_check_posix_sem_write, .mpo_check_posix_sem_getvalue = mac_mls_check_posix_sem_rdonly, - .mpo_check_posix_sem_openexisting = mac_mls_check_posix_sem_write, + .mpo_check_posix_sem_open = mac_mls_check_posix_sem_write, .mpo_check_posix_sem_post = mac_mls_check_posix_sem_write, .mpo_check_posix_sem_unlink = mac_mls_check_posix_sem_write, .mpo_check_posix_sem_wait = mac_mls_check_posix_sem_write, ==== //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#26 (text+ko) ==== @@ -864,7 +864,7 @@ } static int -stub_check_posix_sem_openexisting(struct ucred *cred, struct ksem *ksemptr, +stub_check_posix_sem_open(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label) { @@ -1502,7 +1502,7 @@ .mpo_check_posix_sem_close = stub_check_posix_sem_close, .mpo_check_posix_sem_destroy = stub_check_posix_sem_destroy, .mpo_check_posix_sem_getvalue = stub_check_posix_sem_getvalue, - .mpo_check_posix_sem_openexisting = stub_check_posix_sem_openexisting, + .mpo_check_posix_sem_open = stub_check_posix_sem_open, .mpo_check_posix_sem_post = stub_check_posix_sem_post, .mpo_check_posix_sem_unlink = stub_check_posix_sem_unlink, .mpo_check_posix_sem_wait = stub_check_posix_sem_wait, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#141 (text+ko) ==== @@ -2546,7 +2546,7 @@ .mpo_check_posix_sem_close = mac_test_check_posix_sem, .mpo_check_posix_sem_destroy = mac_test_check_posix_sem, .mpo_check_posix_sem_getvalue = mac_test_check_posix_sem, - .mpo_check_posix_sem_openexisting = mac_test_check_posix_sem, + .mpo_check_posix_sem_open = mac_test_check_posix_sem, .mpo_check_posix_sem_post = mac_test_check_posix_sem, .mpo_check_posix_sem_unlink = mac_test_check_posix_sem, .mpo_check_posix_sem_wait = mac_test_check_posix_sem, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#266 (text+ko) ==== @@ -343,8 +343,7 @@ int mac_check_posix_sem_close(struct ucred *cred, struct ksem *ksemptr); int mac_check_posix_sem_destroy(struct ucred *cred, struct ksem *ksemptr); int mac_check_posix_sem_getvalue(struct ucred *cred,struct ksem *ksemptr); -int mac_check_posix_sem_openexisting(struct ucred *cred, - struct ksem *ksemptr); +int mac_check_posix_sem_open(struct ucred *cred, struct ksem *ksemptr); int mac_check_posix_sem_post(struct ucred *cred, struct ksem *ksemptr); int mac_check_posix_sem_unlink(struct ucred *cred, struct ksem *ksemptr); int mac_check_posix_sem_wait(struct ucred *cred, struct ksem *ksemptr); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#223 (text+ko) ==== @@ -423,7 +423,7 @@ struct ksem *ksemptr, struct label *ks_label); int (*mpo_check_posix_sem_getvalue)(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label); - int (*mpo_check_posix_sem_openexisting)(struct ucred *cred, + int (*mpo_check_posix_sem_open)(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label); int (*mpo_check_posix_sem_post)(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label); From owner-p4-projects@FreeBSD.ORG Tue Mar 1 14:13:57 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C4AC16A4D0; Tue, 1 Mar 2005 14:13:57 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3AA5016A4CE for ; Tue, 1 Mar 2005 14:13:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC8F643D49 for ; Tue, 1 Mar 2005 14:13:56 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j21EDuA5056558 for ; Tue, 1 Mar 2005 14:13:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j21EDu54056555 for perforce@freebsd.org; Tue, 1 Mar 2005 14:13:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 1 Mar 2005 14:13:56 GMT Message-Id: <200503011413.j21EDu54056555@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 Subject: PERFORCE change 72238 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2005 14:13:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=72238 Change 72238 by rwatson@rwatson_paprika on 2005/03/01 14:13:19 Don't perform an access control check on POSIX semaphore close, as applications generally won't be able to handle the failure, nor does the closing of a semaphore represent a communications channel. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/uipc_sem.c#21 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_posix_sem.c#11 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#250 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#90 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#203 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#27 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#142 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#267 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#224 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_sem.c#21 (text+ko) ==== @@ -688,13 +688,6 @@ /* this is not a valid operation for unnamed sems */ error = EINVAL; if (ks != NULL && ks->ks_name != NULL) { -#ifdef MAC - if ((error = mac_check_posix_sem_close(td->td_ucred, ks))) { - DP(("MAC Framework: mac_check_posix_sem_close access \ - denied\n")); - goto err_close; - } -#endif if ((error = sem_leave(td->td_proc, ks))) goto err_close; if (ks->ks_unlinked && LIST_EMPTY(&ks->ks_users)) ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_posix_sem.c#11 (text+ko) ==== @@ -102,19 +102,6 @@ } int -mac_check_posix_sem_close(struct ucred *cred, struct ksem *ksemptr) -{ - int error; - - if (!mac_enforce_posix_sem) - return (0); - - MAC_CHECK(check_posix_sem_close, cred, ksemptr, ksemptr->ks_label); - - return(error); -} - -int mac_check_posix_sem_destroy(struct ucred *cred, struct ksem *ksemptr) { int error; ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#250 (text+ko) ==== @@ -3274,7 +3274,6 @@ .mpo_check_pipe_relabel = mac_biba_check_pipe_relabel, .mpo_check_pipe_stat = mac_biba_check_pipe_stat, .mpo_check_pipe_write = mac_biba_check_pipe_write, - .mpo_check_posix_sem_close = mac_biba_check_posix_sem_write, .mpo_check_posix_sem_destroy = mac_biba_check_posix_sem_write, .mpo_check_posix_sem_getvalue = mac_biba_check_posix_sem_rdonly, .mpo_check_posix_sem_open = mac_biba_check_posix_sem_write, ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#90 (text+ko) ==== @@ -3204,7 +3204,6 @@ .mpo_check_pipe_read = mac_lomac_check_pipe_read, .mpo_check_pipe_relabel = mac_lomac_check_pipe_relabel, .mpo_check_pipe_write = mac_lomac_check_pipe_write, - .mpo_check_posix_sem_close = mac_lomac_check_posix_sem_write, .mpo_check_posix_sem_destroy = mac_lomac_check_posix_sem_write, .mpo_check_posix_sem_getvalue = mac_lomac_check_posix_sem_rdonly, .mpo_check_posix_sem_open = mac_lomac_check_posix_sem_write, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#203 (text+ko) ==== @@ -3053,7 +3053,6 @@ .mpo_check_pipe_relabel = mac_mls_check_pipe_relabel, .mpo_check_pipe_stat = mac_mls_check_pipe_stat, .mpo_check_pipe_write = mac_mls_check_pipe_write, - .mpo_check_posix_sem_close = mac_mls_check_posix_sem_write, .mpo_check_posix_sem_destroy = mac_mls_check_posix_sem_write, .mpo_check_posix_sem_getvalue = mac_mls_check_posix_sem_rdonly, .mpo_check_posix_sem_open = mac_mls_check_posix_sem_write, ==== //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#27 (text+ko) ==== @@ -840,14 +840,6 @@ } static int -stub_check_posix_sem_close(struct ucred *cred, struct ksem *ksemptr, - struct label *ks_label) -{ - - return (0); -} - -static int stub_check_posix_sem_destroy(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label) { @@ -1499,7 +1491,6 @@ .mpo_check_pipe_relabel = stub_check_pipe_relabel, .mpo_check_pipe_stat = stub_check_pipe_stat, .mpo_check_pipe_write = stub_check_pipe_write, - .mpo_check_posix_sem_close = stub_check_posix_sem_close, .mpo_check_posix_sem_destroy = stub_check_posix_sem_destroy, .mpo_check_posix_sem_getvalue = stub_check_posix_sem_getvalue, .mpo_check_posix_sem_open = stub_check_posix_sem_open, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#142 (text+ko) ==== @@ -2543,7 +2543,6 @@ .mpo_check_pipe_relabel = mac_test_check_pipe_relabel, .mpo_check_pipe_stat = mac_test_check_pipe_stat, .mpo_check_pipe_write = mac_test_check_pipe_write, - .mpo_check_posix_sem_close = mac_test_check_posix_sem, .mpo_check_posix_sem_destroy = mac_test_check_posix_sem, .mpo_check_posix_sem_getvalue = mac_test_check_posix_sem, .mpo_check_posix_sem_open = mac_test_check_posix_sem, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#267 (text+ko) ==== @@ -340,7 +340,6 @@ int mac_check_pipe_read(struct ucred *cred, struct pipepair *pp); int mac_check_pipe_stat(struct ucred *cred, struct pipepair *pp); int mac_check_pipe_write(struct ucred *cred, struct pipepair *pp); -int mac_check_posix_sem_close(struct ucred *cred, struct ksem *ksemptr); int mac_check_posix_sem_destroy(struct ucred *cred, struct ksem *ksemptr); int mac_check_posix_sem_getvalue(struct ucred *cred,struct ksem *ksemptr); int mac_check_posix_sem_open(struct ucred *cred, struct ksem *ksemptr); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#224 (text+ko) ==== @@ -417,8 +417,6 @@ struct pipepair *pp, struct label *pipelabel); int (*mpo_check_pipe_write)(struct ucred *cred, struct pipepair *pp, struct label *pipelabel); - int (*mpo_check_posix_sem_close)(struct ucred *cred, - struct ksem *ksemptr, struct label *ks_label); int (*mpo_check_posix_sem_destroy)(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label); int (*mpo_check_posix_sem_getvalue)(struct ucred *cred, From owner-p4-projects@FreeBSD.ORG Tue Mar 1 16:05:19 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6EA6C16A4D0; Tue, 1 Mar 2005 16:05:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3DE7B16A4CF for ; Tue, 1 Mar 2005 16:05:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 72FE343D58 for ; Tue, 1 Mar 2005 16:05:16 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j21G5Gmt062688 for ; Tue, 1 Mar 2005 16:05:16 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j21G5Eg1062663 for perforce@freebsd.org; Tue, 1 Mar 2005 16:05:14 GMT (envelope-from jhb@freebsd.org) Date: Tue, 1 Mar 2005 16:05:14 GMT Message-Id: <200503011605.j21G5Eg1062663@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 72246 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2005 16:05:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=72246 Change 72246 by jhb@jhb_slimer on 2005/03/01 16:04:42 IFC of d00m @72243. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/dec_kn20aa.c#11 integrate .. //depot/projects/smpng/sys/alpha/include/exec.h#3 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_machdep.c#19 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#35 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_mount.c#14 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#26 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_util.h#6 integrate .. //depot/projects/smpng/sys/amd64/acpica/madt.c#5 integrate .. //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/io_apic.c#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/legacy.c#7 integrate .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#11 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#36 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#17 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_watchdog.c#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/mptable.c#7 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#28 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#12 integrate .. //depot/projects/smpng/sys/amd64/include/apicvar.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/exec.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/sf_buf.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/smp.h#7 integrate .. //depot/projects/smpng/sys/amd64/isa/clock.c#10 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#5 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc.c#7 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm.S#4 integrate .. //depot/projects/smpng/sys/arm/arm/fusu.S#6 integrate .. //depot/projects/smpng/sys/arm/arm/genassym.c#5 integrate .. //depot/projects/smpng/sys/arm/arm/locore.S#8 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#10 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#13 integrate .. //depot/projects/smpng/sys/arm/arm/swtch.S#8 integrate .. //depot/projects/smpng/sys/arm/arm/sys_machdep.c#4 integrate .. //depot/projects/smpng/sys/arm/include/exec.h#3 integrate .. //depot/projects/smpng/sys/arm/include/intr.h#4 integrate .. //depot/projects/smpng/sys/arm/include/machdep.h#2 integrate .. //depot/projects/smpng/sys/arm/include/pmap.h#8 integrate .. //depot/projects/smpng/sys/arm/include/proc.h#4 integrate .. //depot/projects/smpng/sys/arm/include/sysarch.h#3 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_space.c#3 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_timer.c#4 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq31244_machdep.c#7 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq80321.c#4 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/std.i80321#3 integrate .. //depot/projects/smpng/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/smpng/sys/boot/common/loader.8#33 integrate .. //depot/projects/smpng/sys/boot/forth/loader.4th.8#8 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#33 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/boot0.S#6 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#18 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#26 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.c#22 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#17 integrate .. //depot/projects/smpng/sys/coda/coda_vfsops.c#22 integrate .. //depot/projects/smpng/sys/coda/coda_vfsops.h#6 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#15 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#16 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#16 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#16 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#16 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#16 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ipc.c#20 integrate .. //depot/projects/smpng/sys/compat/linux/linux_signal.c#17 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#23 integrate .. //depot/projects/smpng/sys/compat/ndis/hal_var.h#7 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#22 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_windrv.c#1 branch .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#17 integrate .. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#14 integrate .. //depot/projects/smpng/sys/compat/ndis/pe_var.h#8 integrate .. //depot/projects/smpng/sys/compat/ndis/resource_var.h#3 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_hal.c#12 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#24 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#24 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_pe.c#6 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_usbd.c#1 branch .. //depot/projects/smpng/sys/compat/ndis/usbd_var.h#1 branch .. //depot/projects/smpng/sys/compat/ndis/winx64_wrap.S#1 branch .. //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#26 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_signal.c#14 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_signal.h#4 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#20 integrate .. //depot/projects/smpng/sys/conf/Makefile.alpha#22 integrate .. //depot/projects/smpng/sys/conf/Makefile.amd64#8 integrate .. //depot/projects/smpng/sys/conf/Makefile.arm#6 integrate .. //depot/projects/smpng/sys/conf/Makefile.i386#20 integrate .. //depot/projects/smpng/sys/conf/Makefile.ia64#27 integrate .. //depot/projects/smpng/sys/conf/Makefile.pc98#19 integrate .. //depot/projects/smpng/sys/conf/Makefile.powerpc#27 integrate .. //depot/projects/smpng/sys/conf/Makefile.sparc64#23 integrate .. //depot/projects/smpng/sys/conf/NOTES#93 integrate .. //depot/projects/smpng/sys/conf/files#136 integrate .. //depot/projects/smpng/sys/conf/files.alpha#33 integrate .. //depot/projects/smpng/sys/conf/files.amd64#27 integrate .. //depot/projects/smpng/sys/conf/files.i386#76 integrate .. //depot/projects/smpng/sys/conf/files.pc98#71 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#47 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#42 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#44 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#43 integrate .. //depot/projects/smpng/sys/conf/majors#43 integrate .. //depot/projects/smpng/sys/conf/options#94 integrate .. //depot/projects/smpng/sys/conf/options.amd64#10 integrate .. //depot/projects/smpng/sys/conf/options.arm#4 integrate .. //depot/projects/smpng/sys/conf/options.i386#44 integrate .. //depot/projects/smpng/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/smpng/sys/contrib/altq/altq/altq_var.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/mlfk_ipl.c#7 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.c#7 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#10 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_if.c#6 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#12 integrate .. //depot/projects/smpng/sys/dev/aac/aac_cam.c#15 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#79 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#35 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcibvar.h#5 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_quirks#4 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#31 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_throttle.c#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpiio.h#7 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#52 integrate .. //depot/projects/smpng/sys/dev/advansys/adwlib.c#4 integrate .. //depot/projects/smpng/sys/dev/advansys/adwlib.h#3 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#24 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#18 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_pci.c#21 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.c#24 integrate .. //depot/projects/smpng/sys/dev/amr/amr_cam.c#13 integrate .. //depot/projects/smpng/sys/dev/ar/if_ar.c#17 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#29 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_card.c#11 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#24 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#24 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#37 integrate .. //depot/projects/smpng/sys/dev/cp/if_cp.c#9 integrate .. //depot/projects/smpng/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/smpng/sys/dev/ctau/if_ct.c#12 integrate .. //depot/projects/smpng/sys/dev/digi/digi.c#28 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_eisa.c#6 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/drm_bufs.h#10 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_state.c#11 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed.c#29 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_3c503.c#1 branch .. //depot/projects/smpng/sys/dev/ed/if_ed_cbus.c#12 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_hpp.c#1 branch .. //depot/projects/smpng/sys/dev/ed/if_ed_isa.c#9 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_novell.c#1 branch .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#27 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_sic.c#1 branch .. //depot/projects/smpng/sys/dev/ed/if_ed_wd80x3.c#1 branch .. //depot/projects/smpng/sys/dev/ed/if_edreg.h#5 integrate .. //depot/projects/smpng/sys/dev/ed/if_edvar.h#9 integrate .. //depot/projects/smpng/sys/dev/fb/vgareg.h#5 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc.c#18 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe.c#18 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe_cbus.c#7 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe_pccard.c#12 integrate .. //depot/projects/smpng/sys/dev/fe/if_fereg.h#3 integrate .. //depot/projects/smpng/sys/dev/fe/if_fevar.h#5 integrate .. //depot/projects/smpng/sys/dev/fe/mb86960.h#2 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#60 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/hptmv/access601.h#1 branch .. //depot/projects/smpng/sys/dev/hptmv/array.h#1 branch .. //depot/projects/smpng/sys/dev/hptmv/atapi.h#1 branch .. //depot/projects/smpng/sys/dev/hptmv/command.h#1 branch .. //depot/projects/smpng/sys/dev/hptmv/entry.c#4 integrate .. //depot/projects/smpng/sys/dev/hptmv/gui_lib.c#1 branch .. //depot/projects/smpng/sys/dev/hptmv/hptproc.c#1 branch .. //depot/projects/smpng/sys/dev/hptmv/i386-elf.raid.o.uu#1 branch .. //depot/projects/smpng/sys/dev/hptmv/ioctl.c#1 branch .. //depot/projects/smpng/sys/dev/hptmv/mvSata.h#1 branch .. //depot/projects/smpng/sys/dev/hptmv/mvStorageDev.h#1 branch .. //depot/projects/smpng/sys/dev/hptmv/raid5n.h#1 branch .. //depot/projects/smpng/sys/dev/hptmv/readme.txt#1 branch .. //depot/projects/smpng/sys/dev/hptmv/vdevice.h#1 branch .. //depot/projects/smpng/sys/dev/ieee488/ibfoo.c#1 branch .. //depot/projects/smpng/sys/dev/ieee488/ibfoo_int.h#2 integrate .. //depot/projects/smpng/sys/dev/ieee488/pcii.c#2 integrate .. //depot/projects/smpng/sys/dev/ieee488/ugpib.h#2 integrate .. //depot/projects/smpng/sys/dev/ieee488/upd7210.c#2 integrate .. //depot/projects/smpng/sys/dev/ieee488/upd7210.h#2 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#24 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pccard.c#6 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_usb.c#1 branch .. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#12 integrate .. //depot/projects/smpng/sys/dev/kbd/atkbd.c#14 integrate .. //depot/projects/smpng/sys/dev/led/led.c#11 integrate .. //depot/projects/smpng/sys/dev/md/md.c#65 integrate .. //depot/projects/smpng/sys/dev/mii/mii.c#13 integrate .. //depot/projects/smpng/sys/dev/mii/mii_physubr.c#11 integrate .. //depot/projects/smpng/sys/dev/null/null.c#19 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_pci.h#2 integrate .. //depot/projects/smpng/sys/dev/pbio/pbio.c#4 integrate .. //depot/projects/smpng/sys/dev/pccard/card_if.m#13 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#32 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard_cis.c#17 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#43 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#52 integrate .. //depot/projects/smpng/sys/dev/pci/pci_pci.c#23 integrate .. //depot/projects/smpng/sys/dev/pci/pci_private.h#12 integrate .. //depot/projects/smpng/sys/dev/pci/pci_user.c#14 integrate .. //depot/projects/smpng/sys/dev/puc/puc.c#21 integrate .. //depot/projects/smpng/sys/dev/puc/puc_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/puc/puc_sbus.c#8 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#30 integrate .. //depot/projects/smpng/sys/dev/ray/if_ray.c#19 integrate .. //depot/projects/smpng/sys/dev/ray/if_rayvar.h#5 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#20 integrate .. //depot/projects/smpng/sys/dev/rp/rp_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/safe/safe.c#7 integrate .. //depot/projects/smpng/sys/dev/sbsh/if_sbsh.c#8 integrate .. //depot/projects/smpng/sys/dev/si/si_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#53 integrate .. //depot/projects/smpng/sys/dev/snc/dp83932.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#19 integrate .. //depot/projects/smpng/sys/dev/sound/isa/mss.c#22 integrate .. //depot/projects/smpng/sys/dev/sound/pci/als4000.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pci/au88x0.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/pci/aureal.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#25 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cs4281.c#14 integrate .. //depot/projects/smpng/sys/dev/sound/pci/csa.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ds1.c#18 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#24 integrate .. //depot/projects/smpng/sys/dev/sound/pci/es137x.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pci/fm801.c#17 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#33 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro3.c#20 integrate .. //depot/projects/smpng/sys/dev/sound/pci/solo.c#14 integrate .. //depot/projects/smpng/sys/dev/sound/pci/t4dwave.c#21 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via8233.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via82c686.c#21 integrate .. //depot/projects/smpng/sys/dev/sound/pci/vibes.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#24 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#18 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sndstat.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.h#20 integrate .. //depot/projects/smpng/sys/dev/sound/sbus/cs4231.c#3 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio_pcm.c#8 integrate .. //depot/projects/smpng/sys/dev/sr/if_sr.c#18 integrate .. //depot/projects/smpng/sys/dev/sr/if_sr_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/sx/sx_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/sym/sym_hipd.c#20 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#46 integrate .. //depot/projects/smpng/sys/dev/syscons/sysmouse.c#12 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#18 integrate .. //depot/projects/smpng/sys/dev/tga/tga_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/trm/trm.c#20 integrate .. //depot/projects/smpng/sys/dev/twa/twa.h#4 integrate .. //depot/projects/smpng/sys/dev/twa/twa_cam.c#4 integrate .. //depot/projects/smpng/sys/dev/twa/twa_freebsd.c#6 integrate .. //depot/projects/smpng/sys/dev/twa/twa_globals.c#3 integrate .. //depot/projects/smpng/sys/dev/twa/twa_ioctl.h#2 integrate .. //depot/projects/smpng/sys/dev/twe/twe.c#14 integrate .. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#22 integrate .. //depot/projects/smpng/sys/dev/twe/tweio.h#5 integrate .. //depot/projects/smpng/sys/dev/tx/if_tx.c#20 integrate .. //depot/projects/smpng/sys/dev/txp/if_txp.c#24 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_sparc64.c#11 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/ohci_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/uhci_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#45 integrate .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#30 integrate .. //depot/projects/smpng/sys/dev/usb/usbcdc.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.h#15 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi_util.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi_util.h#8 integrate .. //depot/projects/smpng/sys/dev/utopia/idtphy.c#1 branch .. //depot/projects/smpng/sys/dev/utopia/suni.c#1 branch .. //depot/projects/smpng/sys/dev/utopia/utopia.c#8 integrate .. //depot/projects/smpng/sys/dev/utopia/utopia.h#4 integrate .. //depot/projects/smpng/sys/dev/utopia/utopia_priv.h#1 branch .. //depot/projects/smpng/sys/dev/vge/if_vge.c#5 integrate .. //depot/projects/smpng/sys/dev/vkbd/vkbd.c#4 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#21 integrate .. //depot/projects/smpng/sys/dev/zs/zs_sbus.c#7 delete .. //depot/projects/smpng/sys/fs/deadfs/dead_vnops.c#13 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs.h#12 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_devs.c#14 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#41 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc.h#7 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vfsops.c#18 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_hash.c#10 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_conv.c#10 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#40 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#32 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#28 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.h#3 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#21 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_node.c#15 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vnops.c#13 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#21 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.c#20 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_subr.h#5 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#28 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#31 integrate .. //depot/projects/smpng/sys/fs/udf/udf.h#7 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#20 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#25 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.c#11 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.h#8 integrate .. //depot/projects/smpng/sys/geom/gate/g_gate.c#10 integrate .. //depot/projects/smpng/sys/geom/gate/g_gate.h#2 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#43 integrate .. //depot/projects/smpng/sys/geom/geom_kern.c#20 integrate .. //depot/projects/smpng/sys/geom/geom_vfs.c#4 integrate .. //depot/projects/smpng/sys/geom/geom_vfs.h#3 integrate .. //depot/projects/smpng/sys/geom/geom_vol_ffs.c#9 integrate .. //depot/projects/smpng/sys/geom/label/g_label.c#8 integrate .. //depot/projects/smpng/sys/geom/label/g_label.h#4 integrate .. //depot/projects/smpng/sys/geom/label/g_label_ufs.c#2 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#18 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.h#7 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror_ctl.c#5 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#15 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.h#7 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3_ctl.c#6 integrate .. //depot/projects/smpng/sys/geom/shsec/g_shsec.c#2 integrate .. //depot/projects/smpng/sys/geom/shsec/g_shsec.h#2 integrate .. //depot/projects/smpng/sys/geom/stripe/g_stripe.c#10 integrate .. //depot/projects/smpng/sys/geom/stripe/g_stripe.h#5 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_drive.c#9 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_var.h#7 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_volume.c#6 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_alloc.c#9 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_linux_balloc.c#7 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_lookup.c#15 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#30 integrate .. //depot/projects/smpng/sys/i386/acpica/madt.c#11 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#96 integrate .. //depot/projects/smpng/sys/i386/cpufreq/est.c#1 branch .. //depot/projects/smpng/sys/i386/cpufreq/p4tcc.c#1 branch .. //depot/projects/smpng/sys/i386/i386/apic_vector.s#13 integrate .. //depot/projects/smpng/sys/i386/i386/io_apic.c#10 integrate .. //depot/projects/smpng/sys/i386/i386/legacy.c#10 integrate .. //depot/projects/smpng/sys/i386/i386/local_apic.c#26 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#89 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#79 integrate .. //depot/projects/smpng/sys/i386/i386/mp_watchdog.c#2 integrate .. //depot/projects/smpng/sys/i386/i386/mptable.c#15 integrate .. //depot/projects/smpng/sys/i386/i386/p4tcc.c#6 delete .. //depot/projects/smpng/sys/i386/i386/uio_machdep.c#6 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#63 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_msg.c#6 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_signal.c#13 integrate .. //depot/projects/smpng/sys/i386/include/_types.h#7 integrate .. //depot/projects/smpng/sys/i386/include/apicvar.h#13 integrate .. //depot/projects/smpng/sys/i386/include/exec.h#3 integrate .. //depot/projects/smpng/sys/i386/include/sf_buf.h#3 integrate .. //depot/projects/smpng/sys/i386/include/smp.h#15 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#38 integrate .. //depot/projects/smpng/sys/i386/isa/ic/mb86960.h#3 delete .. //depot/projects/smpng/sys/i386/isa/pcf.c#8 integrate .. //depot/projects/smpng/sys/i386/isa/vesa.c#13 integrate .. //depot/projects/smpng/sys/i386/pci/pci_pir.c#7 integrate .. //depot/projects/smpng/sys/ia64/conf/NOTES#6 integrate .. //depot/projects/smpng/sys/ia64/ia64/mca.c#8 integrate .. //depot/projects/smpng/sys/ia64/include/exec.h#3 integrate .. //depot/projects/smpng/sys/isa/vga_isa.c#13 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#36 integrate .. //depot/projects/smpng/sys/kern/cpufreq_if.m#2 integrate .. //depot/projects/smpng/sys/kern/imgact_shell.c#9 integrate .. //depot/projects/smpng/sys/kern/init_main.c#54 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#36 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#35 integrate .. //depot/projects/smpng/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#78 integrate .. //depot/projects/smpng/sys/kern/kern_environment.c#16 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#36 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#83 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#36 integrate .. //depot/projects/smpng/sys/kern/kern_kse.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#43 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#5 integrate .. //depot/projects/smpng/sys/kern/kern_mib.c#26 integrate .. //depot/projects/smpng/sys/kern/kern_module.c#16 integrate .. //depot/projects/smpng/sys/kern/kern_mtxpool.c#9 integrate .. //depot/projects/smpng/sys/kern/kern_poll.c#15 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#72 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#87 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#103 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#24 integrate .. //depot/projects/smpng/sys/kern/md5c.c#7 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#52 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#47 integrate .. //depot/projects/smpng/sys/kern/subr_eventhandler.c#22 integrate .. //depot/projects/smpng/sys/kern/subr_log.c#17 integrate .. //depot/projects/smpng/sys/kern/subr_sbuf.c#15 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#14 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#19 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#40 integrate .. //depot/projects/smpng/sys/kern/sysv_msg.c#28 integrate .. //depot/projects/smpng/sys/kern/sysv_sem.c#31 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#29 integrate .. //depot/projects/smpng/sys/kern/tty_cons.c#33 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#38 integrate .. //depot/projects/smpng/sys/kern/tty_tty.c#14 integrate .. //depot/projects/smpng/sys/kern/uipc_accf.c#6 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#34 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf2.c#19 integrate .. //depot/projects/smpng/sys/kern/uipc_sem.c#13 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#67 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#41 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#65 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#46 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#54 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#75 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#24 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#38 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#37 integrate .. //depot/projects/smpng/sys/kern/vfs_export.c#17 integrate .. //depot/projects/smpng/sys/kern/vfs_init.c#21 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#46 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#97 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#85 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#58 integrate .. //depot/projects/smpng/sys/libkern/strspn.c#1 branch .. //depot/projects/smpng/sys/modules/Makefile#91 integrate .. //depot/projects/smpng/sys/modules/acpi/Makefile#26 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi_perf/Makefile#2 delete .. //depot/projects/smpng/sys/modules/arl/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/auxio/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/cpufreq/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/ed/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/ndis/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/netgraph/Makefile#20 integrate .. //depot/projects/smpng/sys/modules/netgraph/Makefile.inc#3 integrate .. //depot/projects/smpng/sys/modules/netgraph/ether/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/sysvipc/sysvmsg/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/sysvipc/sysvsem/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/sysvipc/sysvshm/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/utopia/Makefile#2 integrate .. //depot/projects/smpng/sys/net/bpf.c#46 integrate .. //depot/projects/smpng/sys/net/bridge.c#35 integrate .. //depot/projects/smpng/sys/net/if.c#62 integrate .. //depot/projects/smpng/sys/net/if.h#24 integrate .. //depot/projects/smpng/sys/net/if_clone.c#5 integrate .. //depot/projects/smpng/sys/net/if_disc.c#17 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#57 integrate .. //depot/projects/smpng/sys/net/if_faith.c#25 integrate .. //depot/projects/smpng/sys/net/if_loop.c#35 integrate .. //depot/projects/smpng/sys/net/if_media.h#15 integrate .. //depot/projects/smpng/sys/net/if_stf.c#30 integrate .. //depot/projects/smpng/sys/net/if_types.h#6 integrate .. //depot/projects/smpng/sys/net/if_var.h#36 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#34 integrate .. //depot/projects/smpng/sys/net/if_vlan_var.h#13 integrate .. //depot/projects/smpng/sys/net/rtsock.c#43 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#14 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#15 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#12 integrate .. //depot/projects/smpng/sys/netatalk/aarp.c#17 integrate .. //depot/projects/smpng/sys/netatalk/at_control.c#13 integrate .. //depot/projects/smpng/sys/netatalk/at_extern.h#7 integrate .. //depot/projects/smpng/sys/netatalk/at_var.h#5 integrate .. //depot/projects/smpng/sys/netatalk/ddp_output.c#9 integrate .. //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#23 integrate .. //depot/projects/smpng/sys/netatm/atm_cm.c#14 integrate .. //depot/projects/smpng/sys/netatm/atm_proto.c#7 integrate .. //depot/projects/smpng/sys/netatm/atm_socket.c#14 integrate .. //depot/projects/smpng/sys/netatm/atm_var.h#14 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_load.c#8 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#14 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#9 integrate .. //depot/projects/smpng/sys/netgraph/netgraph.h#16 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#33 integrate .. //depot/projects/smpng/sys/netgraph/ng_bpf.h#6 integrate .. //depot/projects/smpng/sys/netgraph/ng_bridge.c#18 integrate .. //depot/projects/smpng/sys/netgraph/ng_device.c#15 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.c#17 integrate .. //depot/projects/smpng/sys/netgraph/ng_etf.c#8 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.c#23 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.h#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_fec.c#13 integrate .. //depot/projects/smpng/sys/netgraph/ng_gif.c#13 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.h#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_ipfw.c#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_ksocket.c#25 integrate .. //depot/projects/smpng/sys/netgraph/ng_ksocket.h#8 integrate .. //depot/projects/smpng/sys/netgraph/ng_parse.c#15 integrate .. //depot/projects/smpng/sys/netgraph/ng_ppp.h#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#25 integrate .. //depot/projects/smpng/sys/netgraph/ng_source.c#11 integrate .. //depot/projects/smpng/sys/netgraph/ng_split.c#5 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#33 integrate .. //depot/projects/smpng/sys/netinet/if_ether.h#8 integrate .. //depot/projects/smpng/sys/netinet/in.h#30 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#53 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#19 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.c#1 branch .. //depot/projects/smpng/sys/netinet/ip_carp.h#1 branch .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#36 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#50 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#64 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#39 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#71 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#68 integrate .. //depot/projects/smpng/sys/netinet/tcp_sack.c#6 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#65 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#37 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#38 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#34 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#54 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#26 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#24 integrate .. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#13 integrate .. //depot/projects/smpng/sys/netinet6/in6_proto.c#11 integrate .. //depot/projects/smpng/sys/netinet6/in6_var.h#11 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#38 integrate .. //depot/projects/smpng/sys/netinet6/ipsec.c#20 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#25 integrate .. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#14 integrate .. //depot/projects/smpng/sys/netipx/spx_usrreq.c#21 integrate .. //depot/projects/smpng/sys/netnatm/natm_proto.c#12 integrate .. //depot/projects/smpng/sys/netncp/ncp_nls.c#4 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vnops.c#14 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#32 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#50 integrate .. //depot/projects/smpng/sys/opencrypto/cryptodev.c#17 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#34 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#77 integrate .. //depot/projects/smpng/sys/pc98/pc98/clock.c#27 integrate .. //depot/projects/smpng/sys/pc98/pc98/pc98gdc.c#14 integrate .. //depot/projects/smpng/sys/pc98/pc98/sio.c#51 integrate .. //depot/projects/smpng/sys/pccard/pccard_nbk.c#13 integrate .. //depot/projects/smpng/sys/pci/agp_ali.c#12 integrate .. //depot/projects/smpng/sys/pci/agp_amd.c#15 integrate .. //depot/projects/smpng/sys/pci/agp_amd64.c#3 integrate .. //depot/projects/smpng/sys/pci/agp_i810.c#18 integrate .. //depot/projects/smpng/sys/pci/agp_intel.c#19 integrate .. //depot/projects/smpng/sys/pci/agp_nvidia.c#4 integrate .. //depot/projects/smpng/sys/pci/agp_sis.c#12 integrate .. //depot/projects/smpng/sys/pci/agp_via.c#15 integrate .. //depot/projects/smpng/sys/pci/alpm.c#9 integrate .. //depot/projects/smpng/sys/pci/amdpm.c#12 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#63 integrate .. //depot/projects/smpng/sys/pci/if_de.c#24 integrate .. //depot/projects/smpng/sys/pci/if_mn.c#12 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#31 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#54 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#34 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#48 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#43 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#34 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#42 integrate .. //depot/projects/smpng/sys/pci/if_tl.c#25 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#34 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#28 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#54 integrate .. //depot/projects/smpng/sys/pci/intpm.c#10 integrate .. //depot/projects/smpng/sys/pci/ncr.c#19 integrate .. //depot/projects/smpng/sys/pci/viapm.c#8 integrate .. //depot/projects/smpng/sys/pci/xrpu.c#16 integrate .. //depot/projects/smpng/sys/powerpc/include/exec.h#3 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_syscons.c#5 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_syscons.h#4 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#59 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#53 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_msg.c#2 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#27 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#53 integrate .. //depot/projects/smpng/sys/sparc64/conf/NOTES#14 integrate .. //depot/projects/smpng/sys/sparc64/include/ofw_machdep.h#6 integrate .. //depot/projects/smpng/sys/sparc64/include/pmap.h#29 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/ofw_machdep.c#10 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#58 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tick.c#13 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tsb.c#23 integrate .. //depot/projects/smpng/sys/sys/buf.h#36 integrate .. //depot/projects/smpng/sys/sys/bufobj.h#4 integrate .. //depot/projects/smpng/sys/sys/bus.h#20 integrate .. //depot/projects/smpng/sys/sys/conf.h#38 integrate .. //depot/projects/smpng/sys/sys/cpu.h#2 integrate .. //depot/projects/smpng/sys/sys/file.h#23 integrate .. //depot/projects/smpng/sys/sys/filedesc.h#27 integrate .. //depot/projects/smpng/sys/sys/imgact.h#12 integrate .. //depot/projects/smpng/sys/sys/jail.h#13 integrate .. //depot/projects/smpng/sys/sys/libkern.h#17 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#48 integrate .. //depot/projects/smpng/sys/sys/md5.h#5 integrate .. //depot/projects/smpng/sys/sys/mount.h#38 integrate .. //depot/projects/smpng/sys/sys/mutex.h#48 integrate .. //depot/projects/smpng/sys/sys/param.h#78 integrate .. //depot/projects/smpng/sys/sys/proc.h#139 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#43 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#18 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#34 integrate .. //depot/projects/smpng/sys/sys/syslimits.h#10 integrate .. //depot/projects/smpng/sys/sys/systm.h#62 integrate .. //depot/projects/smpng/sys/sys/vnode.h#58 integrate .. //depot/projects/smpng/sys/tools/vnode_if.awk#11 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#35 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_balloc.c#17 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#18 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#22 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_rawread.c#13 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#46 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#41 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep_stub.c#9 delete .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#68 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#40 integrate .. //depot/projects/smpng/sys/ufs/ffs/fs.h#19 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#21 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#33 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extern.h#16 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_ihash.c#14 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_inode.c#20 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#48 integrate .. //depot/projects/smpng/sys/vm/memguard.c#2 integrate .. //depot/projects/smpng/sys/vm/memguard.h#2 integrate .. //depot/projects/smpng/sys/vm/uma.h#15 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#54 integrate .. //depot/projects/smpng/sys/vm/uma_dbg.c#13 integrate .. //depot/projects/smpng/sys/vm/uma_dbg.h#6 integrate .. //depot/projects/smpng/sys/vm/uma_int.h#25 integrate .. //depot/projects/smpng/sys/vm/vm_meter.c#23 integrate .. //depot/projects/smpng/sys/vm/vm_pager.c#21 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#49 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/dec_kn20aa.c#11 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.20 2005/01/05 20:05:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.21 2005/02/10 00:35:31 ticso Exp $"); #include #include @@ -51,7 +51,7 @@ void dec_kn20aa_init(void); static void dec_kn20aa_cons_init(void); static void dec_kn20aa_intr_init(void); -static void dec_kn20aa_intr_map(void *); +static int dec_kn20aa_intr_route(device_t pcib, device_t dev, int pin); static void dec_kn20aa_intr_disable(int); static void dec_kn20aa_intr_enable(int); @@ -81,7 +81,7 @@ platform.iobus = "cia"; platform.cons_init = dec_kn20aa_cons_init; platform.pci_intr_init = dec_kn20aa_intr_init; - platform.pci_intr_map = dec_kn20aa_intr_map; + platform.pci_intr_route = dec_kn20aa_intr_route; platform.pci_intr_disable = dec_kn20aa_intr_disable; platform.pci_intr_enable = dec_kn20aa_intr_enable; } @@ -242,58 +242,45 @@ dec_kn20aa_intr_enable(31); } -void -dec_kn20aa_intr_map(void *arg) +static int +dec_kn20aa_intr_route(device_t pcib, device_t dev, int pin) { - pcicfgregs *cfg; + int irq = 255; + int slot = pci_get_slot(dev); - cfg = (pcicfgregs *)arg; - /* - * Slot->interrupt translation. Appears to work, though it - * may not hold up forever. - * - * The DEC engineers who did this hardware obviously engaged - * in random drug testing. - */ - switch (cfg->slot) { + switch (slot) { case 11: + irq = pin - 1; + break; + case 12: - cfg->intline = ((cfg->slot - 11) + 0) * 4; + irq = 4 + pin - 1; break; case 7: - cfg->intline = 8; + irq = 8 + pin - 1; break; - case 9: - cfg->intline = 12; + case 9: /* slot on AlphaStation 600 only */ + irq = 12 + pin - 1; break; - case 6: /* 21040 on AlphaStation 500 */ - cfg->intline = 13; + case 8: + irq = 16 + pin - 1; break; - case 8: - cfg->intline = 16; + case 6: /* 21040 on AlphaStation 500 */ + if (pin == 1) + irq = 13; break; case 10: /* 8275EB on AlphaStation 500 */ - return; + break; default: - if(!cfg->bus){ - printf("dec_kn20aa_intr_map: weird slot %d\n", - cfg->slot); - return; - } else { - cfg->intline = cfg->slot; - } + printf("dec_kn20aa_intr_route: weird slot %d\n", slot); } - - cfg->intline += cfg->bus*16; - if (cfg->intline > KN20AA_MAX_IRQ) - panic("dec_kn20aa_intr_map: cfg->intline too large (%d)\n", - cfg->intline); + return (irq); } void ==== //depot/projects/smpng/sys/alpha/include/exec.h#3 (text+ko) ==== @@ -29,7 +29,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/exec.h,v 1.3 2005/01/05 20:05:50 imp Exp $ + * $FreeBSD: src/sys/alpha/include/exec.h,v 1.4 2005/02/19 21:16:48 ru Exp $ */ -#define __LDPGSZ 8192 +#ifndef _MACHINE_EXEC_H_ +#define _MACHINE_EXEC_H_ + +#define __LDPGSZ 8192 + +#endif /* !_MACHINE_EXEC_H_ */ ==== //depot/projects/smpng/sys/alpha/linux/linux_machdep.c#19 (text+ko) ==== @@ -27,11 +27,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.35 2004/11/27 06:51:32 das Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.36 2005/02/18 18:32:32 jhb Exp $"); #include #include +#include #include +#include #include #include #include @@ -64,20 +66,23 @@ int linux_execve(struct thread *td, struct linux_execve_args *args) { - struct execve_args bsd; - caddr_t sg; + struct image_args eargs; + char *path; + int error; - sg = stackgap_init(); - CHECKALTEXIST(td, &sg, args->path); + LCONVPATHEXIST(td, args->path, &path); #ifdef DEBUG if (ldebug(execve)) - printf(ARGS(execve, "%s"), args->path); + printf(ARGS(execve, "%s"), path); #endif - bsd.fname = args->path; - bsd.argv = args->argp; - bsd.envv = args->envp; - return (execve(td, &bsd)); + error = exec_copyin_args(&eargs, path, UIO_SYSSPACE, args->argp, + args->envp); + free(path, M_TEMP); + if (error == 0) + error = kern_execve(td, &eargs, NULL); + exec_free_args(&eargs); + return (error); } /* ==== //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#35 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.52 2005/01/05 20:05:51 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.53 2005/02/18 18:37:26 jhb Exp $"); #include #include @@ -95,6 +95,7 @@ static int osf2bsd_pathconf(int *); static const char osf1_emul_path[] = "/compat/osf1"; + /* * [ taken from the linux emulator ] * Search an alternate path before passing pathname arguments on @@ -105,133 +106,12 @@ * be in exists. */ int -osf1_emul_find(td, sgp, prefix, path, pbuf, cflag) - struct thread *td; - caddr_t *sgp; /* Pointer to stackgap memory */ - const char *prefix; - char *path; - char **pbuf; - int cflag; +osf1_emul_find(struct thread *td, char *path, enum uio_seg pathseg, + char **pbuf, int create) { - int error; - size_t len, sz; - char *buf, *cp, *ptr; - struct ucred *ucred; - struct nameidata nd; - struct nameidata ndroot; - struct vattr vat; - struct vattr vatroot; - buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK); - *pbuf = path; - - for (ptr = buf; (*ptr = *prefix) != '\0'; ptr++, prefix++) - continue; - - sz = MAXPATHLEN - (ptr - buf); - - /* - * If sgp is not given then the path is already in kernel space - */ - if (sgp == NULL) - error = copystr(path, ptr, sz, &len); - else - error = copyinstr(path, ptr, sz, &len); - - if (error) { - free(buf, M_TEMP); - return error; - } - - if (*ptr != '/') { - free(buf, M_TEMP); - return EINVAL; - } - - /* - * We know that there is a / somewhere in this pathname. - * Search backwards for it, to find the file's parent dir - * to see if it exists in the alternate tree. If it does, - * and we want to create a file (cflag is set). We don't - * need to worry about the root comparison in this case. - */ - - if (cflag) { - for (cp = &ptr[len] - 1; *cp != '/'; cp--) - ; - *cp = '\0'; - - NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, buf, td); - - if ((error = namei(&nd)) != 0) { - free(buf, M_TEMP); - return error; - } - - *cp = '/'; - } else { - NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, buf, td); - - if ((error = namei(&nd)) != 0) { - free(buf, M_TEMP); - return error; - } - - /* - * We now compare the vnode of the osf1_root to the one - * vnode asked. If they resolve to be the same, then we - * ignore the match so that the real root gets used. - * This avoids the problem of traversing "../.." to find the - * root directory and never finding it, because "/" resolves - * to the emulation root directory. This is expensive :-( - */ - NDINIT(&ndroot, LOOKUP, FOLLOW, UIO_SYSSPACE, osf1_emul_path, - td); - - if ((error = namei(&ndroot)) != 0) { - /* Cannot happen! */ - free(buf, M_TEMP); - vrele(nd.ni_vp); - return error; - } - - ucred = td->td_ucred; - if ((error = VOP_GETATTR(nd.ni_vp, &vat, ucred, td)) != 0) { - goto bad; - } - - if ((error = VOP_GETATTR(ndroot.ni_vp, &vatroot, ucred, - td)) != 0) { - goto bad; - } - - if (vat.va_fsid == vatroot.va_fsid && - vat.va_fileid == vatroot.va_fileid) { - error = ENOENT; - goto bad; - } - - } - if (sgp == NULL) - *pbuf = buf; - else { - sz = &ptr[len] - buf; - *pbuf = stackgap_alloc(sgp, sz + 1); - error = copyout(buf, *pbuf, sz); - free(buf, M_TEMP); - } - - vrele(nd.ni_vp); - if (!cflag) - vrele(ndroot.ni_vp); - - return error; - -bad: - vrele(ndroot.ni_vp); - vrele(nd.ni_vp); - free(buf, M_TEMP); - return error; + return (kern_alternate_path(td, osf1_emul_path, path, pathseg, pbuf, + create)); } @@ -240,21 +120,15 @@ struct thread *td; struct osf1_open_args *uap; { - struct open_args /* { - syscallarg(char *) path; - syscallarg(int) flags; - syscallarg(int) mode; - } */ a; - caddr_t sg; + char *path; + int error; - sg = stackgap_init(); - CHECKALTEXIST(td, &sg, uap->path); + CHECKALTEXIST(td, uap->path, &path); - a.path = uap->path; - a.flags = uap->flags; /* XXX translate */ - a.mode = uap->mode; - >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 1 18:15:56 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D05116A4D0; Tue, 1 Mar 2005 18:15:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2E7C516A4CF for ; Tue, 1 Mar 2005 18:15:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B146643D48 for ; Tue, 1 Mar 2005 18:15:55 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j21IFtoG079596 for ; Tue, 1 Mar 2005 18:15:55 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j21IFttm079593 for perforce@freebsd.org; Tue, 1 Mar 2005 18:15:55 GMT (envelope-from jhb@freebsd.org) Date: Tue, 1 Mar 2005 18:15:55 GMT Message-Id: <200503011815.j21IFttm079593@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 72266 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2005 18:15:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=72266 Change 72266 by jhb@jhb_slimer on 2005/03/01 18:15:27 IFC @72263. Affected files ... .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#16 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.c#14 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.h#12 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#54 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#37 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#54 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#55 integrate .. //depot/projects/smpng/sys/sys/event.h#14 integrate .. //depot/projects/smpng/sys/sys/syscall.h#53 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#53 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#19 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#55 integrate Differences ... ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#16 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.29 2005/03/01 13:50:57 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.30 2005/03/01 17:45:55 ps Exp $"); #include "opt_compat.h" @@ -556,44 +556,34 @@ int freebsd32_kevent(struct thread *td, struct freebsd32_kevent_args *uap) { - int error; - caddr_t sg; struct timespec32 ts32; - struct timespec ts; + struct timespec ts, *tsp; + struct kevent *ks; struct kevent32 ks32; - struct kevent *ks; - struct kevent_args a; - int i; - - sg = stackgap_init(); + struct kevent *changes, *events; + int error, i; - a.fd = uap->fd; - a.changelist = (struct kevent *)uap->changelist; - a.nchanges = uap->nchanges; - a.eventlist = (struct kevent *)uap->eventlist; - a.nevents = uap->nevents; - a.timeout = NULL; if (uap->timeout) { - a.timeout = stackgap_alloc(&sg, sizeof(struct timespec)); error = copyin(uap->timeout, &ts32, sizeof(ts32)); if (error) return (error); CP(ts32, ts, tv_sec); CP(ts32, ts, tv_nsec); - error = copyout(&ts, (void *)(uintptr_t)a.timeout, sizeof(ts)); - if (error) - return (error); - } - if (uap->changelist) { - a.changelist = (struct kevent *)stackgap_alloc(&sg, - uap->nchanges * sizeof(struct kevent)); + tsp = &ts; + } else + tsp = NULL; + if (uap->changelist && uap->nchanges > 0) { + changes = malloc(sizeof(struct kevent) * uap->nchanges, M_TEMP, + M_WAITOK); for (i = 0; i < uap->nchanges; i++) { error = copyin(&uap->changelist[i], &ks32, sizeof(ks32)); - if (error) + if (error) { + free(changes, M_TEMP); return (error); - ks = (struct kevent *)(uintptr_t)&a.changelist[i]; + } + ks = &changes[i]; CP(ks32, *ks, ident); CP(ks32, *ks, filter); CP(ks32, *ks, flags); @@ -601,15 +591,19 @@ CP(ks32, *ks, data); PTRIN_CP(ks32, *ks, udata); } - } - if (uap->eventlist) { - a.eventlist = stackgap_alloc(&sg, - uap->nevents * sizeof(struct kevent)); - } - error = kevent(td, &a); - if (uap->eventlist && error > 0) { - for (i = 0; i < error; i++) { - ks = &a.eventlist[i]; + } else + changes = NULL; + if (uap->eventlist && uap->nevents > 0) + events = malloc(sizeof(struct kevent) * uap->nevents, M_TEMP, + M_WAITOK); + else + events = NULL; + error = kern_kevent(td, uap->fd, changes, uap->nchanges, UIO_SYSSPACE, + events, uap->nevents, UIO_SYSSPACE, tsp); + free(changes, M_TEMP); + if (uap->eventlist && events && td->td_retval[0] > 0) { + for (i = 0; i < td->td_retval[0]; i++) { + ks = &events[i]; CP(*ks, ks32, ident); CP(*ks, ks32, filter); CP(*ks, ks32, flags); @@ -619,10 +613,12 @@ error = copyout(&ks32, &uap->eventlist[i], sizeof(ks32)); if (error) - return (error); + break; } } - return error; + if (events) + free(events, M_TEMP); + return (error); } int ==== //depot/projects/smpng/sys/compat/linux/linux_util.c#14 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.28 2005/02/07 18:46:05 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.29 2005/03/01 17:57:45 jhb Exp $"); #include #include @@ -57,39 +57,6 @@ * be in exists. */ int -linux_emul_find(td, sgp, path, pbuf, cflag) - struct thread *td; - caddr_t *sgp; /* Pointer to stackgap memory */ - char *path; - char **pbuf; - int cflag; -{ - char *newpath; - size_t sz; - int error; - - error = linux_emul_convpath(td, path, (sgp == NULL) ? UIO_SYSSPACE : - UIO_USERSPACE, &newpath, cflag); - if (newpath == NULL) - return (error); - - if (sgp == NULL) { - *pbuf = newpath; - return (error); - } - - sz = strlen(newpath); - *pbuf = stackgap_alloc(sgp, sz + 1); - if (*pbuf != NULL) - error = copyout(newpath, *pbuf, sz + 1); - else - error = ENAMETOOLONG; - free(newpath, M_TEMP); - - return (error); -} - -int linux_emul_convpath(td, path, pathseg, pbuf, cflag) struct thread *td; char *path; ==== //depot/projects/smpng/sys/compat/linux/linux_util.h#12 (text+ko) ==== @@ -28,7 +28,7 @@ * * from: svr4_util.h,v 1.5 1994/11/18 02:54:31 christos Exp * from: linux_util.h,v 1.2 1995/03/05 23:23:50 fvdl Exp - * $FreeBSD: src/sys/compat/linux/linux_util.h,v 1.24 2005/01/05 22:34:35 imp Exp $ + * $FreeBSD: src/sys/compat/linux/linux_util.h,v 1.25 2005/03/01 17:57:45 jhb Exp $ */ /* @@ -78,19 +78,6 @@ extern const char linux_emul_path[]; int linux_emul_convpath(struct thread *, char *, enum uio_seg, char **, int); -int linux_emul_find(struct thread *, caddr_t *, char *, char **, int); - -#define CHECKALT(td, sgp, path, i) \ - do { \ - int _error; \ - \ - _error = linux_emul_find(td, sgp, path, &path, i); \ - if (_error == EFAULT) \ - return (_error); \ - } while (0) - -#define CHECKALTEXIST(td, sgp, path) CHECKALT(td, sgp, path, 0) -#define CHECKALTCREAT(td, sgp, path) CHECKALT(td, sgp, path, 1) #define LCONVPATH(td, upath, pathp, i) \ do { \ ==== //depot/projects/smpng/sys/compat/ndis/kern_windrv.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_windrv.c,v 1.4 2005/02/24 21:49:14 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_windrv.c,v 1.5 2005/03/01 17:21:25 wpaul Exp $"); #include #include @@ -234,7 +234,7 @@ image_optional_header opt_hdr; driver_entry entry; struct drvdb_ent *new; - struct driver_object *dobj; + struct driver_object *drv; int status; /* @@ -277,43 +277,43 @@ if (new == NULL) return (ENOMEM); - dobj = malloc(sizeof(device_object), M_DEVBUF, M_NOWAIT|M_ZERO); - if (dobj == NULL) { + drv = malloc(sizeof(driver_object), M_DEVBUF, M_NOWAIT|M_ZERO); + if (drv == NULL) { free (new, M_DEVBUF); return (ENOMEM); } /* Allocate a driver extension structure too. */ - dobj->dro_driverext = malloc(sizeof(driver_extension), + drv->dro_driverext = malloc(sizeof(driver_extension), M_DEVBUF, M_NOWAIT|M_ZERO); - if (dobj->dro_driverext == NULL) { + if (drv->dro_driverext == NULL) { free(new, M_DEVBUF); - free(dobj, M_DEVBUF); + free(drv, M_DEVBUF); return(ENOMEM); } - INIT_LIST_HEAD((&dobj->dro_driverext->dre_usrext)); + INIT_LIST_HEAD((&drv->dro_driverext->dre_usrext)); - dobj->dro_driverstart = (void *)img; - dobj->dro_driversize = len; + drv->dro_driverstart = (void *)img; + drv->dro_driversize = len; - dobj->dro_drivername.us_len = strlen(DUMMY_REGISTRY_PATH) * 2; - dobj->dro_drivername.us_maxlen = strlen(DUMMY_REGISTRY_PATH) * 2; - dobj->dro_drivername.us_buf = NULL; + drv->dro_drivername.us_len = strlen(DUMMY_REGISTRY_PATH) * 2; + drv->dro_drivername.us_maxlen = strlen(DUMMY_REGISTRY_PATH) * 2; + drv->dro_drivername.us_buf = NULL; ndis_ascii_to_unicode(DUMMY_REGISTRY_PATH, - &dobj->dro_drivername.us_buf); + &drv->dro_drivername.us_buf); - new->windrv_object = dobj; + new->windrv_object = drv; /* Now call the DriverEntry() function. */ - status = MSCALL2(entry, dobj, &dobj->dro_drivername); + status = MSCALL2(entry, drv, &drv->dro_drivername); if (status != STATUS_SUCCESS) { - free(dobj->dro_drivername.us_buf, M_DEVBUF); - free(dobj, M_DEVBUF); + free(drv->dro_drivername.us_buf, M_DEVBUF); + free(drv, M_DEVBUF); free(new, M_DEVBUF); return(ENODEV); } ==== //depot/projects/smpng/sys/kern/init_sysent.c#54 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.185 2005/01/26 02:29:18 jeff Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.184 2005/01/24 10:49:26 jeff Exp + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.186 2005/03/01 17:44:34 ps Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.186 2005/03/01 17:43:08 ps Exp */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/kern/kern_event.c#37 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_event.c,v 1.88 2005/02/22 13:11:33 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_event.c,v 1.89 2005/03/01 17:45:55 ps Exp $"); #include #include @@ -54,6 +54,7 @@ #include #include #include +#include #include #include @@ -80,14 +81,17 @@ TASKQUEUE_DEFINE_THREAD(kqueue); +static int kevent_copyout(struct kevent **eventlist, enum uio_seg eventseg, + struct kevent *kevp, int count); static int kqueue_aquire(struct file *fp, struct kqueue **kqp); static void kqueue_release(struct kqueue *kq, int locked); static int kqueue_expand(struct kqueue *kq, struct filterops *fops, uintptr_t ident, int waitok); static void kqueue_task(void *arg, int pending); static int kqueue_scan(struct kqueue *kq, int maxevents, - struct kevent *ulistp, const struct timespec *timeout, - struct kevent *keva, struct thread *td); + struct kevent *eventlist, enum uio_seg eventseg, + const struct timespec *timeout, struct kevent *keva, + struct thread *td); static void kqueue_wakeup(struct kqueue *kq); static struct filterops *kqueue_fo_find(int filt); static void kqueue_fo_release(int filt); @@ -531,54 +535,91 @@ int kevent(struct thread *td, struct kevent_args *uap) { + struct timespec ts, *tsp; + int error; + + if (uap->timeout != NULL) { + error = copyin(uap->timeout, &ts, sizeof(ts)); + if (error) + return (error); + tsp = &ts; + } else + tsp = NULL; + + return (kern_kevent(td, uap->fd, uap->changelist, uap->nchanges, + UIO_USERSPACE, uap->eventlist, uap->nevents, UIO_USERSPACE, tsp)); +} + +/* + * Copy 'count' items into the destination list pointd to by *eventlist. The + * eventlist and nevents values are updated to point after the copied out + * item(s) upon return. + */ +static int +kevent_copyout(struct kevent **eventlist, enum uio_seg eventseg, + struct kevent *kevp, int count) +{ + int error; + + if (eventseg == UIO_USERSPACE) + error = copyout(kevp, *eventlist, + sizeof(struct kevent) * count); + else { + bcopy(kevp, *eventlist, sizeof(struct kevent) * count); + error = 0; + } + *eventlist += count; + return (error); +} + +int +kern_kevent(struct thread *td, int fd, struct kevent *changelist, int nchanges, + enum uio_seg changeseg, struct kevent *eventlist, int nevents, + enum uio_seg eventseg, const struct timespec *timeout) +{ struct kevent keva[KQ_NEVENTS]; - struct kevent *kevp; + struct kevent *kevp, *changes; struct kqueue *kq; struct file *fp; - struct timespec ts; int i, n, nerrors, error; - if ((error = fget(td, uap->fd, &fp)) != 0) + if ((error = fget(td, fd, &fp)) != 0) return (error); if ((error = kqueue_aquire(fp, &kq)) != 0) goto done_norel; - if (uap->timeout != NULL) { - error = copyin(uap->timeout, &ts, sizeof(ts)); - if (error) - goto done; - uap->timeout = &ts; - } - nerrors = 0; - while (uap->nchanges > 0) { - n = uap->nchanges > KQ_NEVENTS ? KQ_NEVENTS : uap->nchanges; - error = copyin(uap->changelist, keva, - n * sizeof *keva); - if (error) - goto done; + while (nchanges > 0) { + if (changeseg == UIO_USERSPACE) { + n = nchanges > KQ_NEVENTS ? KQ_NEVENTS : nchanges; + error = copyin(changelist, keva, n * sizeof *keva); + if (error) + goto done; + changes = keva; + } else { + changes = changelist; + n = nchanges; + } for (i = 0; i < n; i++) { - kevp = &keva[i]; + kevp = &changes[i]; kevp->flags &= ~EV_SYSFLAGS; error = kqueue_register(kq, kevp, td, 1); if (error) { - if (uap->nevents != 0) { + if (nevents != 0) { kevp->flags = EV_ERROR; kevp->data = error; - (void) copyout(kevp, - uap->eventlist, - sizeof(*kevp)); - uap->eventlist++; - uap->nevents--; + (void) kevent_copyout(&eventlist, + eventseg, kevp, 1); + nevents--; nerrors++; } else { goto done; } } } - uap->nchanges -= n; - uap->changelist += n; + nchanges -= n; + changelist += n; } if (nerrors) { td->td_retval[0] = nerrors; @@ -586,7 +627,7 @@ goto done; } - error = kqueue_scan(kq, uap->nevents, uap->eventlist, uap->timeout, + error = kqueue_scan(kq, nevents, eventlist, eventseg, timeout, keva, td); done: kqueue_release(kq, 0); @@ -1046,8 +1087,9 @@ * We treat KN_MARKER knotes as if they are INFLUX. */ static int -kqueue_scan(struct kqueue *kq, int maxevents, struct kevent *ulistp, - const struct timespec *tsp, struct kevent *keva, struct thread *td) +kqueue_scan(struct kqueue *kq, int maxevents, struct kevent *eventlist, + enum uio_seg eventseg, const struct timespec *tsp, struct kevent *keva, + struct thread *td) { struct kevent *kevp; struct timeval atv, rtv, ttv; @@ -1200,8 +1242,8 @@ if (nkev == KQ_NEVENTS) { KQ_UNLOCK_FLUX(kq); - error = copyout(keva, ulistp, sizeof *keva * nkev); - ulistp += nkev; + error = kevent_copyout(&eventlist, eventseg, keva, + nkev); nkev = 0; kevp = keva; KQ_LOCK(kq); @@ -1218,7 +1260,7 @@ done_nl: KQ_NOTOWNED(kq); if (nkev != 0) - error = copyout(keva, ulistp, sizeof *keva * nkev); + error = kevent_copyout(&eventlist, eventseg, keva, nkev); td->td_retval[0] = maxevents - count; return (error); } ==== //depot/projects/smpng/sys/kern/syscalls.c#54 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.171 2005/01/26 02:29:18 jeff Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.184 2005/01/24 10:49:26 jeff Exp + * $FreeBSD: src/sys/kern/syscalls.c,v 1.172 2005/03/01 17:44:34 ps Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.186 2005/03/01 17:43:08 ps Exp */ const char *syscallnames[] = { ==== //depot/projects/smpng/sys/kern/syscalls.master#55 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.185 2005/01/26 02:28:43 jeff Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.186 2005/03/01 17:43:08 ps Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. @@ -515,7 +515,7 @@ 361 MSTD { int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid); } 362 MSTD { int kqueue(void); } 363 MSTD { int kevent(int fd, \ - const struct kevent *changelist, int nchanges, \ + struct kevent *changelist, int nchanges, \ struct kevent *eventlist, int nevents, \ const struct timespec *timeout); } 364 UNIMPL __cap_get_proc ==== //depot/projects/smpng/sys/sys/event.h#14 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/event.h,v 1.26 2004/08/15 15:36:18 jmg Exp $ + * $FreeBSD: src/sys/sys/event.h,v 1.27 2005/03/01 17:45:55 ps Exp $ */ #ifndef _SYS_EVENT_H_ @@ -221,7 +221,7 @@ __BEGIN_DECLS int kqueue(void); -int kevent(int kq, const struct kevent *changelist, int nchanges, +int kevent(int kq, struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout); __END_DECLS ==== //depot/projects/smpng/sys/sys/syscall.h#53 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.168 2005/01/26 02:29:18 jeff Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.184 2005/01/24 10:49:26 jeff Exp + * $FreeBSD: src/sys/sys/syscall.h,v 1.169 2005/03/01 17:44:34 ps Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.186 2005/03/01 17:43:08 ps Exp */ #define SYS_syscall 0 ==== //depot/projects/smpng/sys/sys/syscall.mk#53 (text+ko) ==== @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.123 2005/01/26 02:29:18 jeff Exp $ -# created from FreeBSD: src/sys/kern/syscalls.master,v 1.184 2005/01/24 10:49:26 jeff Exp +# $FreeBSD: src/sys/sys/syscall.mk,v 1.124 2005/03/01 17:44:34 ps Exp $ +# created from FreeBSD: src/sys/kern/syscalls.master,v 1.186 2005/03/01 17:43:08 ps Exp MIASM = \ syscall.o \ exit.o \ ==== //depot/projects/smpng/sys/sys/syscallsubr.h#19 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/syscallsubr.h,v 1.25 2005/02/13 17:37:20 sobomax Exp $ + * $FreeBSD: src/sys/sys/syscallsubr.h,v 1.26 2005/03/01 17:44:34 ps Exp $ */ #ifndef _SYS_SYSCALLSUBR_H_ @@ -43,6 +43,7 @@ struct rusage; struct sockaddr; struct stat; +struct kevent; int kern___getcwd(struct thread *td, u_char *buf, enum uio_seg bufseg, u_int buflen); @@ -69,6 +70,9 @@ int kern_getrusage(struct thread *td, int who, struct rusage *rup); int kern_getsockopt(struct thread *td, int s, int level, int name, void *optval, enum uio_seg valseg, socklen_t *valsize); +int kern_kevent(struct thread *td, int fd, struct kevent *changelist, + int nchanges, enum uio_seg changeseg, struct kevent *eventlist, + int nevents, enum uio_seg eventseg, const struct timespec *timeout); int kern_lchown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid); int kern_link(struct thread *td, char *path, char *link, ==== //depot/projects/smpng/sys/sys/sysproto.h#55 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.167 2005/01/26 02:29:18 jeff Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.184 2005/01/24 10:49:26 jeff Exp + * $FreeBSD: src/sys/sys/sysproto.h,v 1.168 2005/03/01 17:44:34 ps Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.186 2005/03/01 17:43:08 ps Exp */ #ifndef _SYS_SYSPROTO_H_ @@ -1009,7 +1009,7 @@ }; struct kevent_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char changelist_l_[PADL_(const struct kevent *)]; const struct kevent * changelist; char changelist_r_[PADR_(const struct kevent *)]; + char changelist_l_[PADL_(struct kevent *)]; struct kevent * changelist; char changelist_r_[PADR_(struct kevent *)]; char nchanges_l_[PADL_(int)]; int nchanges; char nchanges_r_[PADR_(int)]; char eventlist_l_[PADL_(struct kevent *)]; struct kevent * eventlist; char eventlist_r_[PADR_(struct kevent *)]; char nevents_l_[PADL_(int)]; int nevents; char nevents_r_[PADR_(int)]; From owner-p4-projects@FreeBSD.ORG Tue Mar 1 19:30:34 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7498916A4D1; Tue, 1 Mar 2005 19:30:34 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D02116A4CE for ; Tue, 1 Mar 2005 19:30:34 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 74F2743D1D for ; Tue, 1 Mar 2005 19:30:33 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j21JUXOP083789 for ; Tue, 1 Mar 2005 19:30:33 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j21JUV8O083786 for perforce@freebsd.org; Tue, 1 Mar 2005 19:30:32 GMT (envelope-from jmg@freebsd.org) Date: Tue, 1 Mar 2005 19:30:32 GMT Message-Id: <200503011930.j21JUV8O083786@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Subject: PERFORCE change 72279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2005 19:30:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=72279 Change 72279 by jmg@jmg_carbon on 2005/03/01 19:29:45 bring up projects/arm to HEAD.. I'm keeping cognet's fixup till we figure out what the correct fix is... Affected files ... .. //depot/projects/arm/src/sys/alpha/include/exec.h#2 integrate .. //depot/projects/arm/src/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mp_watchdog.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/arm/src/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/arm/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/arm/src/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/exec.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/sf_buf.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/smp.h#2 integrate .. //depot/projects/arm/src/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/arm/src/sys/arm/arm/cpufunc_asm.S#3 integrate .. //depot/projects/arm/src/sys/arm/arm/fusu.S#2 integrate .. //depot/projects/arm/src/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/arm/src/sys/arm/arm/locore.S#8 integrate .. //depot/projects/arm/src/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/arm/src/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/arm/src/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/arm/src/sys/arm/arm/sys_machdep.c#2 integrate .. //depot/projects/arm/src/sys/arm/include/exec.h#2 integrate .. //depot/projects/arm/src/sys/arm/include/machdep.h#2 integrate .. //depot/projects/arm/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/arm/src/sys/arm/include/proc.h#2 integrate .. //depot/projects/arm/src/sys/arm/include/sysarch.h#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/std.i80321#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/arm/src/sys/cam/cam_periph.c#2 integrate .. //depot/projects/arm/src/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/arm/src/sys/coda/coda_vfsops.c#2 integrate .. //depot/projects/arm/src/sys/coda/coda_vfsops.h#2 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/arm/src/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/arm/src/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/arm/src/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/arm/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/arm/src/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/arm/src/sys/compat/ndis/subr_usbd.c#1 branch .. //depot/projects/arm/src/sys/compat/ndis/usbd_var.h#1 branch .. //depot/projects/arm/src/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_signal.c#2 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_signal.h#2 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/arm/src/sys/conf/NOTES#2 integrate .. //depot/projects/arm/src/sys/conf/files#2 integrate .. //depot/projects/arm/src/sys/conf/files.amd64#2 integrate .. //depot/projects/arm/src/sys/conf/files.i386#2 integrate .. //depot/projects/arm/src/sys/conf/kern.post.mk#3 integrate .. //depot/projects/arm/src/sys/conf/majors#2 integrate .. //depot/projects/arm/src/sys/conf/options#2 integrate .. //depot/projects/arm/src/sys/conf/options.arm#3 integrate .. //depot/projects/arm/src/sys/conf/options.i386#2 integrate .. //depot/projects/arm/src/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/arm/src/sys/contrib/altq/altq/altq_var.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_pcibvar.h#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_quirks#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_throttle.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/arm/src/sys/dev/advansys/adwlib.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/arm/src/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/arm/src/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/arm/src/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/arm/src/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/arm/src/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/arm/src/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/arm/src/sys/dev/digi/digi.c#2 integrate .. //depot/projects/arm/src/sys/dev/dpt/dpt_eisa.c#2 integrate .. //depot/projects/arm/src/sys/dev/dpt/dpt_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_bufs.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_isa.c#2 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_sic.c#2 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_wd80x3.c#2 integrate .. //depot/projects/arm/src/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/arm/src/sys/dev/fb/vgareg.h#2 integrate .. //depot/projects/arm/src/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/arm/src/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/arm/src/sys/dev/fe/if_fe_cbus.c#2 integrate .. //depot/projects/arm/src/sys/dev/fe/if_fe_isa.c#2 integrate .. //depot/projects/arm/src/sys/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/arm/src/sys/dev/fe/if_fereg.h#2 integrate .. //depot/projects/arm/src/sys/dev/fe/if_fevar.h#2 integrate .. //depot/projects/arm/src/sys/dev/fe/mb86960.h#2 integrate .. //depot/projects/arm/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/arm/src/sys/dev/hme/if_hme_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/access601.h#1 branch .. //depot/projects/arm/src/sys/dev/hptmv/array.h#1 branch .. //depot/projects/arm/src/sys/dev/hptmv/atapi.h#1 branch .. //depot/projects/arm/src/sys/dev/hptmv/command.h#1 branch .. //depot/projects/arm/src/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/gui_lib.c#1 branch .. //depot/projects/arm/src/sys/dev/hptmv/hptproc.c#1 branch .. //depot/projects/arm/src/sys/dev/hptmv/i386-elf.raid.o.uu#1 branch .. //depot/projects/arm/src/sys/dev/hptmv/ioctl.c#1 branch .. //depot/projects/arm/src/sys/dev/hptmv/mvSata.h#1 branch .. //depot/projects/arm/src/sys/dev/hptmv/mvStorageDev.h#1 branch .. //depot/projects/arm/src/sys/dev/hptmv/raid5n.h#1 branch .. //depot/projects/arm/src/sys/dev/hptmv/readme.txt#1 branch .. //depot/projects/arm/src/sys/dev/hptmv/vdevice.h#1 branch .. //depot/projects/arm/src/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/arm/src/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/arm/src/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/if_ndis/if_ndis_usb.c#1 branch .. //depot/projects/arm/src/sys/dev/kbd/atkbd.c#2 integrate .. //depot/projects/arm/src/sys/dev/null/null.c#2 integrate .. //depot/projects/arm/src/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/arm/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/arm/src/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/arm/src/sys/dev/puc/puc.c#2 integrate .. //depot/projects/arm/src/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/puc/puc_sbus.c#2 integrate .. //depot/projects/arm/src/sys/dev/re/if_re.c#2 integrate .. //depot/projects/arm/src/sys/dev/rp/rp_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/safe/safe.c#2 integrate .. //depot/projects/arm/src/sys/dev/sbsh/if_sbsh.c#2 integrate .. //depot/projects/arm/src/sys/dev/si/si_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/snc/dp83932.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/als4000.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/au88x0.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/aureal.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/ds1.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/maestro3.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/via82c686.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/sndstat.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/arm/src/sys/dev/sound/sbus/cs4231.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/arm/src/sys/dev/sr/if_sr_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/stg/tmc18c30_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/sx/sx_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/arm/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/arm/src/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/arm/src/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/tga/tga_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/trm/trm.c#2 integrate .. //depot/projects/arm/src/sys/dev/twa/twa_freebsd.c#2 integrate .. //depot/projects/arm/src/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/arm/src/sys/dev/tx/if_tx.c#2 integrate .. //depot/projects/arm/src/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/arm/src/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_subr.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/usbcdc.h#2 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdi.h#2 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdi_util.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdi_util.h#2 integrate .. //depot/projects/arm/src/sys/dev/utopia/idtphy.c#1 branch .. //depot/projects/arm/src/sys/dev/utopia/suni.c#1 branch .. //depot/projects/arm/src/sys/dev/utopia/utopia.c#2 integrate .. //depot/projects/arm/src/sys/dev/utopia/utopia.h#2 integrate .. //depot/projects/arm/src/sys/dev/utopia/utopia_priv.h#1 branch .. //depot/projects/arm/src/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/arm/src/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/arm/src/sys/dev/vx/if_vx_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/wi/if_wi_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/zs/zs_sbus.c#2 delete .. //depot/projects/arm/src/sys/fs/devfs/devfs.h#2 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/arm/src/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/arm/src/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate .. //depot/projects/arm/src/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/arm/src/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/arm/src/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/arm/src/sys/geom/concat/g_concat.h#2 integrate .. //depot/projects/arm/src/sys/geom/geom_vfs.c#2 integrate .. //depot/projects/arm/src/sys/geom/label/g_label.c#2 integrate .. //depot/projects/arm/src/sys/geom/label/g_label.h#2 integrate .. //depot/projects/arm/src/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/arm/src/sys/geom/mirror/g_mirror.h#2 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.h#2 integrate .. //depot/projects/arm/src/sys/geom/shsec/g_shsec.c#2 integrate .. //depot/projects/arm/src/sys/geom/shsec/g_shsec.h#2 integrate .. //depot/projects/arm/src/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/arm/src/sys/geom/stripe/g_stripe.h#2 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/arm/src/sys/gnu/ext2fs/ext2_alloc.c#2 integrate .. //depot/projects/arm/src/sys/gnu/ext2fs/ext2_linux_balloc.c#2 integrate .. //depot/projects/arm/src/sys/gnu/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/arm/src/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/arm/src/sys/i386/conf/NOTES#2 integrate .. //depot/projects/arm/src/sys/i386/cpufreq/est.c#1 branch .. //depot/projects/arm/src/sys/i386/cpufreq/p4tcc.c#1 branch .. //depot/projects/arm/src/sys/i386/i386/io_apic.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/mp_watchdog.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/p4tcc.c#2 delete .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_msg.c#2 integrate .. //depot/projects/arm/src/sys/i386/include/_types.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/exec.h#2 integrate .. //depot/projects/arm/src/sys/i386/isa/ic/mb86960.h#2 delete .. //depot/projects/arm/src/sys/i386/isa/pcf.c#2 integrate .. //depot/projects/arm/src/sys/i386/isa/vesa.c#2 integrate .. //depot/projects/arm/src/sys/ia64/conf/NOTES#2 integrate .. //depot/projects/arm/src/sys/ia64/include/exec.h#2 integrate .. //depot/projects/arm/src/sys/isa/vga_isa.c#2 integrate .. //depot/projects/arm/src/sys/kern/imgact_shell.c#2 integrate .. //depot/projects/arm/src/sys/kern/init_sysent.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_acct.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_conf.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_event.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_exec.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_kse.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_mib.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_module.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_poll.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_sig.c#2 integrate .. //depot/projects/arm/src/sys/kern/sched_ule.c#2 integrate .. //depot/projects/arm/src/sys/kern/subr_bus.c#2 integrate .. //depot/projects/arm/src/sys/kern/subr_eventhandler.c#2 integrate .. //depot/projects/arm/src/sys/kern/subr_log.c#2 integrate .. //depot/projects/arm/src/sys/kern/syscalls.c#2 integrate .. //depot/projects/arm/src/sys/kern/syscalls.master#2 integrate .. //depot/projects/arm/src/sys/kern/tty_cons.c#2 integrate .. //depot/projects/arm/src/sys/kern/tty_pty.c#2 integrate .. //depot/projects/arm/src/sys/kern/tty_tty.c#2 integrate .. //depot/projects/arm/src/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/arm/src/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket2.c#2 integrate .. //depot/projects/arm/src/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/arm/src/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/arm/src/sys/kern/vfs_default.c#2 integrate .. //depot/projects/arm/src/sys/kern/vfs_init.c#2 integrate .. //depot/projects/arm/src/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/arm/src/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/arm/src/sys/modules/acpi/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/acpi/acpi_perf/Makefile#2 delete .. //depot/projects/arm/src/sys/modules/auxio/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/cpufreq/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/ndis/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/utopia/Makefile#2 integrate .. //depot/projects/arm/src/sys/net/bpf.c#2 integrate .. //depot/projects/arm/src/sys/net/bridge.c#2 integrate .. //depot/projects/arm/src/sys/net/if.c#2 integrate .. //depot/projects/arm/src/sys/net/if.h#2 integrate .. //depot/projects/arm/src/sys/net/if_clone.c#2 integrate .. //depot/projects/arm/src/sys/net/if_disc.c#2 integrate .. //depot/projects/arm/src/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/arm/src/sys/net/if_faith.c#2 integrate .. //depot/projects/arm/src/sys/net/if_loop.c#2 integrate .. //depot/projects/arm/src/sys/net/if_media.h#2 integrate .. //depot/projects/arm/src/sys/net/if_stf.c#2 integrate .. //depot/projects/arm/src/sys/net/if_types.h#2 integrate .. //depot/projects/arm/src/sys/net/if_var.h#2 integrate .. //depot/projects/arm/src/sys/net/if_vlan.c#2 integrate .. //depot/projects/arm/src/sys/net/if_vlan_var.h#2 integrate .. //depot/projects/arm/src/sys/net/rtsock.c#2 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/arm/src/sys/netatalk/aarp.c#2 integrate .. //depot/projects/arm/src/sys/netatalk/at_control.c#2 integrate .. //depot/projects/arm/src/sys/netatalk/at_extern.h#2 integrate .. //depot/projects/arm/src/sys/netatalk/at_var.h#2 integrate .. //depot/projects/arm/src/sys/netatalk/ddp_output.c#2 integrate .. //depot/projects/arm/src/sys/netatm/atm_cm.c#2 integrate .. //depot/projects/arm/src/sys/netatm/atm_socket.c#2 integrate .. //depot/projects/arm/src/sys/netatm/atm_var.h#2 integrate .. //depot/projects/arm/src/sys/netatm/ipatm/ipatm_load.c#2 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/arm/src/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/arm/src/sys/netgraph/ng_parse.c#2 integrate .. //depot/projects/arm/src/sys/netinet/if_ether.c#2 integrate .. //depot/projects/arm/src/sys/netinet/if_ether.h#2 integrate .. //depot/projects/arm/src/sys/netinet/in.h#2 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/arm/src/sys/netinet/in_proto.c#2 integrate .. //depot/projects/arm/src/sys/netinet/ip_carp.c#1 branch .. //depot/projects/arm/src/sys/netinet/ip_carp.h#1 branch .. //depot/projects/arm/src/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/arm/src/sys/netinet/ip_input.c#2 integrate .. //depot/projects/arm/src/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/arm/src/sys/netinet/ip_output.c#2 integrate .. //depot/projects/arm/src/sys/netinet/tcp_sack.c#2 integrate .. //depot/projects/arm/src/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/arm/src/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/arm/src/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/arm/src/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/arm/src/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/arm/src/sys/netinet6/in6.c#2 integrate .. //depot/projects/arm/src/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/arm/src/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/arm/src/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/arm/src/sys/netinet6/ipsec.c#2 integrate .. //depot/projects/arm/src/sys/netinet6/nd6.c#2 integrate .. //depot/projects/arm/src/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/arm/src/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/arm/src/sys/netncp/ncp_nls.c#2 integrate .. //depot/projects/arm/src/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/arm/src/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/arm/src/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/arm/src/sys/pc98/i386/machdep.c#2 integrate .. //depot/projects/arm/src/sys/pc98/pc98/pc98gdc.c#2 integrate .. //depot/projects/arm/src/sys/pci/agp_ali.c#2 integrate .. //depot/projects/arm/src/sys/pci/agp_amd.c#2 integrate .. //depot/projects/arm/src/sys/pci/agp_amd64.c#2 integrate .. //depot/projects/arm/src/sys/pci/agp_i810.c#2 integrate .. //depot/projects/arm/src/sys/pci/agp_intel.c#2 integrate .. //depot/projects/arm/src/sys/pci/agp_nvidia.c#2 integrate .. //depot/projects/arm/src/sys/pci/agp_sis.c#2 integrate .. //depot/projects/arm/src/sys/pci/agp_via.c#2 integrate .. //depot/projects/arm/src/sys/pci/alpm.c#2 integrate .. //depot/projects/arm/src/sys/pci/amdpm.c#2 integrate .. //depot/projects/arm/src/sys/pci/if_dc.c#2 integrate .. //depot/projects/arm/src/sys/pci/if_de.c#2 integrate .. //depot/projects/arm/src/sys/pci/if_mn.c#2 integrate .. //depot/projects/arm/src/sys/pci/if_pcn.c#2 integrate .. //depot/projects/arm/src/sys/pci/if_rl.c#2 integrate .. //depot/projects/arm/src/sys/pci/if_sf.c#2 integrate .. //depot/projects/arm/src/sys/pci/if_sis.c#2 integrate .. //depot/projects/arm/src/sys/pci/if_sk.c#2 integrate .. //depot/projects/arm/src/sys/pci/if_ste.c#2 integrate .. //depot/projects/arm/src/sys/pci/if_ti.c#2 integrate .. //depot/projects/arm/src/sys/pci/if_tl.c#2 integrate .. //depot/projects/arm/src/sys/pci/if_vr.c#2 integrate .. //depot/projects/arm/src/sys/pci/if_wb.c#2 integrate .. //depot/projects/arm/src/sys/pci/if_xl.c#2 integrate .. //depot/projects/arm/src/sys/pci/intpm.c#2 integrate .. //depot/projects/arm/src/sys/pci/ncr.c#2 integrate .. //depot/projects/arm/src/sys/pci/viapm.c#2 integrate .. //depot/projects/arm/src/sys/pci/xrpu.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/exec.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/ofw/ofw_syscons.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/ofw/ofw_syscons.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/pmap.c#2 integrate .. //depot/projects/arm/src/sys/security/mac/mac_sysv_msg.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/arm/src/sys/sparc64/conf/NOTES#2 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/arm/src/sys/sys/bufobj.h#2 integrate .. //depot/projects/arm/src/sys/sys/bus.h#2 integrate .. //depot/projects/arm/src/sys/sys/conf.h#2 integrate .. //depot/projects/arm/src/sys/sys/cpu.h#2 integrate .. //depot/projects/arm/src/sys/sys/event.h#2 integrate .. //depot/projects/arm/src/sys/sys/imgact.h#2 integrate .. //depot/projects/arm/src/sys/sys/mbuf.h#2 integrate .. //depot/projects/arm/src/sys/sys/mount.h#2 integrate .. //depot/projects/arm/src/sys/sys/mutex.h#2 integrate .. //depot/projects/arm/src/sys/sys/param.h#2 integrate .. //depot/projects/arm/src/sys/sys/socketvar.h#2 integrate .. //depot/projects/arm/src/sys/sys/syscall.h#2 integrate .. //depot/projects/arm/src/sys/sys/syscall.mk#2 integrate .. //depot/projects/arm/src/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/arm/src/sys/sys/sysctl.h#2 integrate .. //depot/projects/arm/src/sys/sys/sysproto.h#2 integrate .. //depot/projects/arm/src/sys/sys/systm.h#2 integrate .. //depot/projects/arm/src/sys/sys/vnode.h#2 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/arm/src/sys/ufs/ffs/fs.h#2 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_inode.c#2 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/arm/src/sys/vm/uma_core.c#2 integrate .. //depot/projects/arm/src/sys/vm/vnode_pager.c#2 integrate .. //depot/user/jmg/arm/src/sys/arm/conf/TS7200#7 edit Differences ... ==== //depot/projects/arm/src/sys/alpha/include/exec.h#2 (text+ko) ==== @@ -29,7 +29,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/exec.h,v 1.3 2005/01/05 20:05:50 imp Exp $ + * $FreeBSD: src/sys/alpha/include/exec.h,v 1.4 2005/02/19 21:16:48 ru Exp $ */ -#define __LDPGSZ 8192 +#ifndef _MACHINE_EXEC_H_ +#define _MACHINE_EXEC_H_ + +#define __LDPGSZ 8192 + +#endif /* !_MACHINE_EXEC_H_ */ ==== //depot/projects/arm/src/sys/amd64/acpica/madt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.14 2004/06/10 21:30:08 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.15 2005/02/22 21:52:51 jhb Exp $"); #include #include @@ -367,7 +367,7 @@ } /* First, we run through adding I/O APIC's. */ - if (madt->PCATCompat) + if (madt->PCATCompat && !(acpi_quirks & ACPI_Q_MADT_IRQ0)) ioapic_enable_mixed_mode(); madt_walk_table(madt_parse_apics, NULL); @@ -596,8 +596,14 @@ enum intr_polarity pol; char buf[64]; + if (acpi_quirks & ACPI_Q_MADT_IRQ0 && intr->Source == 0 && + intr->Interrupt == 2) { + if (bootverbose) + printf("MADT: Skipping timer override\n"); + return; + } if (bootverbose) - printf("MADT: intr override: source %u, irq %u\n", + printf("MADT: Interrupt override: source %u, irq %u\n", intr->Source, intr->Interrupt); KASSERT(intr->Bus == 0, ("bus for interrupt overrides must be zero")); if (madt_find_interrupt(intr->Interrupt, &new_ioapic, ==== //depot/projects/arm/src/sys/amd64/amd64/apic_vector.S#2 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.101 2005/01/21 06:01:19 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.102 2005/02/28 23:37:35 peter Exp $ */ /* @@ -137,6 +137,23 @@ ISR_VEC(6, apic_isr6) ISR_VEC(7, apic_isr7) +/* + * Local APIC periodic timer handler. + */ + .text + SUPERALIGN_TEXT +IDTVEC(timerint) + PUSH_FRAME + + movq lapic, %rdx + movl $0, LA_EOI(%rdx) /* End Of Interrupt to APIC */ + + FAKE_MCOUNT(TF_EIP(%esp)) + + call lapic_handle_timer + MEXITCOUNT + jmp doreti + #ifdef SMP /* * Global address space TLB shootdown. ==== //depot/projects/arm/src/sys/amd64/amd64/io_apic.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.12 2005/01/21 06:01:19 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.14 2005/02/28 23:37:35 peter Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -66,7 +66,7 @@ #define TODO printf("%s: not implemented!\n", __func__) -MALLOC_DEFINE(M_IOAPIC, "I/O APIC", "I/O APIC structures"); +static MALLOC_DEFINE(M_IOAPIC, "I/O APIC", "I/O APIC structures"); /* * New interrupt support code.. @@ -548,10 +548,11 @@ /* * Assume that pin 0 on the first I/O APIC is an ExtINT pin - * and that pins 1-15 are ISA interrupts. Assume that all + * if mixed mode is enabled and an ISA interrupt if not. + * Assume that pins 1-15 are ISA interrupts and that all * other pins are PCI interrupts. */ - if (intpin->io_vector == 0) + if (intpin->io_vector == 0 && mixed_mode_enabled) ioapic_set_extint(io, i); else if (intpin->io_vector < IOAPIC_ISA_INTS) { intpin->io_bus = APIC_BUS_ISA; ==== //depot/projects/arm/src/sys/amd64/amd64/local_apic.c#2 (text+ko) ==== @@ -32,13 +32,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.11 2005/01/21 06:01:19 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.12 2005/02/28 23:37:35 peter Exp $"); #include #include #include #include #include +#include #include #include @@ -66,6 +67,10 @@ CTASSERT(APIC_LOCAL_INTS == 240); CTASSERT(IPI_STOP < APIC_SPURIOUS_INT); +#define LAPIC_TIMER_HZ_DIVIDER 3 +#define LAPIC_TIMER_STATHZ_DIVIDER 23 +#define LAPIC_TIMER_PROFHZ_DIVIDER 2 + /* * Support for local APICs. Local APICs manage interrupts on each * individual processor as opposed to I/O APICs which receive interrupts @@ -90,6 +95,10 @@ u_int la_cluster:4; u_int la_cluster_id:2; u_int la_present:1; + u_long *la_timer_count; + u_long la_hard_ticks; + u_long la_stat_ticks; + u_long la_prof_ticks; } static lapics[MAX_APICID]; /* XXX: should thermal be an NMI? */ @@ -115,9 +124,21 @@ IDTVEC(apic_isr7), /* 224 - 255 */ }; +static u_int32_t lapic_timer_divisors[] = { + APIC_TDCR_1, APIC_TDCR_2, APIC_TDCR_4, APIC_TDCR_8, APIC_TDCR_16, + APIC_TDCR_32, APIC_TDCR_64, APIC_TDCR_128 +}; + volatile lapic_t *lapic; +static u_long lapic_timer_divisor, lapic_timer_period, lapic_timer_hz; +static u_long *lapic_virtual_hardclock, *lapic_virtual_statclock, + *lapic_virtual_profclock; static void lapic_enable(void); +static void lapic_timer_enable_intr(void); +static void lapic_timer_oneshot(u_int count); +static void lapic_timer_periodic(u_int count); +static void lapic_timer_set_divisor(u_int divisor); static uint32_t lvt_mode(struct lapic *la, u_int pin, uint32_t value); static uint32_t @@ -180,7 +201,10 @@ /* Set BSP's per-CPU local APIC ID. */ PCPU_SET(apic_id, lapic_id()); - /* XXX: timer/error/thermal interrupts */ + /* Local APIC timer interrupt. */ + setidt(APIC_TIMER_INT, IDTVEC(timerint), SDT_SYSIGT, SEL_KPL, 0); + + /* XXX: error/thermal interrupts */ } /* @@ -251,6 +275,7 @@ struct lapic *la; u_int32_t value, maxlvt; register_t eflags; + char buf[MAXCOMLEN + 1]; la = &lapics[lapic_id()]; KASSERT(la->la_present, ("missing APIC structure")); @@ -280,11 +305,84 @@ lapic->lvt_lint0 = lvt_mode(la, LVT_LINT0, lapic->lvt_lint0); lapic->lvt_lint1 = lvt_mode(la, LVT_LINT1, lapic->lvt_lint1); - /* XXX: more LVT entries */ + /* Program timer LVT and setup handler. */ + lapic->lvt_timer = lvt_mode(la, LVT_TIMER, lapic->lvt_timer); + snprintf(buf, sizeof(buf), "lapic%d: timer", lapic_id()); + intrcnt_add(buf, &la->la_timer_count); + if (PCPU_GET(cpuid) != 0) { + KASSERT(lapic_timer_period != 0, ("lapic%u: zero divisor", + lapic_id())); + lapic_timer_set_divisor(lapic_timer_divisor); + lapic_timer_periodic(lapic_timer_period); + lapic_timer_enable_intr(); + } + + /* XXX: Performance counter, error, and thermal LVTs */ intr_restore(eflags); } +/* + * Called by cpu_initclocks() on the BSP to setup the local APIC timer so + * that it can drive hardclock, statclock, and profclock. This function + * returns true if it is able to use the local APIC timer to drive the + * clocks and false if it is not able. + */ +int +lapic_setup_clock(void) +{ + u_long value; + + /* Can't drive the timer without a local APIC. */ + if (lapic == NULL) + return (0); + + /* If we've only got one CPU, then use the RTC and ISA timer instead. */ + if (mp_ncpus == 1) + return (0); + + /* Start off with a divisor of 2 (power on reset default). */ + lapic_timer_divisor = 2; + + /* Try to calibrate the local APIC timer. */ + do { + lapic_timer_set_divisor(lapic_timer_divisor); + lapic_timer_oneshot(APIC_TIMER_MAX_COUNT); + DELAY(2000000); + value = APIC_TIMER_MAX_COUNT - lapic->ccr_timer; + if (value != APIC_TIMER_MAX_COUNT) + break; + lapic_timer_divisor <<= 1; + } while (lapic_timer_divisor <= 128); + if (lapic_timer_divisor > 128) + panic("lapic: Divisor too big"); + value /= 2; + if (bootverbose) + printf("lapic: Divisor %lu, Frequency %lu hz\n", + lapic_timer_divisor, value); + + /* + * We will drive the timer at a small multiple of hz and drive + * both of the other timers with similarly small but relatively + * prime divisors. + */ + lapic_timer_hz = hz * LAPIC_TIMER_HZ_DIVIDER; + stathz = lapic_timer_hz / LAPIC_TIMER_STATHZ_DIVIDER; + profhz = lapic_timer_hz / LAPIC_TIMER_PROFHZ_DIVIDER; + lapic_timer_period = value / lapic_timer_hz; + intrcnt_add("lapic: hardclock", &lapic_virtual_hardclock); + intrcnt_add("lapic: statclock", &lapic_virtual_statclock); + intrcnt_add("lapic: profclock", &lapic_virtual_profclock); + + /* + * Start up the timer on the BSP. The APs will kick off their + * timer during lapic_setup(). + */ + lapic_timer_periodic(lapic_timer_period); + lapic_timer_enable_intr(); + return (1); +} + void lapic_disable(void) { @@ -516,6 +614,91 @@ intr_execute_handlers(isrc, &frame); } +void +lapic_handle_timer(struct clockframe frame) +{ + struct lapic *la; + + la = &lapics[PCPU_GET(apic_id)]; + (*la->la_timer_count)++; + critical_enter(); + + /* Fire hardclock at hz. */ + la->la_hard_ticks += hz; + if (la->la_hard_ticks >= lapic_timer_hz) { + la->la_hard_ticks -= lapic_timer_hz; + if (PCPU_GET(cpuid) == 0) { + (*lapic_virtual_hardclock)++; + hardclock(&frame); + } else + hardclock_process(&frame); + } + + /* Fire statclock at stathz. */ + la->la_stat_ticks += stathz; + if (la->la_stat_ticks >= lapic_timer_hz) { + la->la_stat_ticks -= lapic_timer_hz; + if (PCPU_GET(cpuid) == 0) + (*lapic_virtual_statclock)++; + statclock(&frame); + } + + /* Fire profclock at profhz, but only when needed. */ + la->la_prof_ticks += profhz; + if (la->la_prof_ticks >= lapic_timer_hz) { + la->la_prof_ticks -= lapic_timer_hz; + if (PCPU_GET(cpuid) == 0) + (*lapic_virtual_profclock)++; + if (profprocs != 0) + profclock(&frame); + } + critical_exit(); +} + +static void +lapic_timer_set_divisor(u_int divisor) +{ + + KASSERT(powerof2(divisor), ("lapic: invalid divisor %u", divisor)); + KASSERT(ffs(divisor) <= sizeof(lapic_timer_divisors) / + sizeof(u_int32_t), ("lapic: invalid divisor %u", divisor)); + lapic->dcr_timer = lapic_timer_divisors[ffs(divisor) - 1]; +} + +static void +lapic_timer_oneshot(u_int count) +{ + u_int32_t value; + + value = lapic->lvt_timer; + value &= ~APIC_LVTT_TM; + value |= APIC_LVTT_TM_ONE_SHOT; + lapic->lvt_timer = value; + lapic->icr_timer = count; +} + +static void +lapic_timer_periodic(u_int count) +{ + u_int32_t value; + + value = lapic->lvt_timer; + value &= ~APIC_LVTT_TM; + value |= APIC_LVTT_TM_PERIODIC; + lapic->lvt_timer = value; + lapic->icr_timer = count; +} + +static void +lapic_timer_enable_intr(void) +{ + u_int32_t value; + + value = lapic->lvt_timer; + value &= ~APIC_LVT_M; + lapic->lvt_timer = value; +} + /* Translate between IDT vectors and IRQ vectors. */ u_int apic_irq_to_idt(u_int irq) ==== //depot/projects/arm/src/sys/amd64/amd64/machdep.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.629 2005/02/06 01:55:06 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.630 2005/03/01 04:18:32 obrien Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -156,6 +156,7 @@ int cold = 1; long Maxmem = 0; +long realmem = 0; vm_paddr_t phys_avail[20]; @@ -188,6 +189,7 @@ #endif printf("real memory = %ju (%ju MB)\n", ptoa((uintmax_t)Maxmem), ptoa((uintmax_t)Maxmem) / 1048576); + realmem = Maxmem; /* * Display any holes after the first chunk of extended memory. */ ==== //depot/projects/arm/src/sys/amd64/amd64/mp_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.249 2005/01/21 06:01:19 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.250 2005/02/28 23:37:35 peter Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -872,82 +872,15 @@ } -/* - * For statclock, we send an IPI to all CPU's to have them call this - * function. - */ - void -forward_statclock(void) -{ - int map; - - CTR0(KTR_SMP, "forward_statclock"); - - if (!smp_started || cold || panicstr) - return; - - map = PCPU_GET(other_cpus) & ~(stopped_cpus|hlt_cpus_mask); - if (map != 0) - ipi_selected(map, IPI_STATCLOCK); -} - -/* - * For each hardclock(), we send an IPI to all other CPU's to have them - * execute this function. It would be nice to reduce contention on - * sched_lock if we could simply peek at the CPU to determine the user/kernel - * state and call hardclock_process() on the CPU receiving the clock interrupt - * and then just use a simple IPI to handle any ast's if needed. - */ - -void -forward_hardclock(void) -{ - u_int map; - - CTR0(KTR_SMP, "forward_hardclock"); - - if (!smp_started || cold || panicstr) - return; - - map = PCPU_GET(other_cpus) & ~(stopped_cpus|hlt_cpus_mask); - if (map != 0) - ipi_selected(map, IPI_HARDCLOCK); -} - -void ipi_bitmap_handler(struct clockframe frame) { int cpu = PCPU_GET(cpuid); u_int ipi_bitmap; - struct thread *td; ipi_bitmap = atomic_readandclear_int(&cpu_ipi_pending[cpu]); - critical_enter(); - /* Nothing to do for AST */ - - if (ipi_bitmap & (1 << IPI_HARDCLOCK)) { - td = curthread; - td->td_intr_nesting_level++; - hardclock_process(&frame); - td->td_intr_nesting_level--; - } - - if (ipi_bitmap & (1 << IPI_STATCLOCK)) { - CTR0(KTR_SMP, "forwarded_statclock"); - - td = curthread; - td->td_intr_nesting_level++; - if (profprocs != 0) - profclock(&frame); - if (pscnt == psdiv) - statclock(&frame); - td->td_intr_nesting_level--; - } - - critical_exit(); } /* ==== //depot/projects/arm/src/sys/amd64/amd64/mp_watchdog.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/mp_watchdog.c,v 1.2 2004/08/15 20:32:40 rwatson Exp $ + * $FreeBSD: src/sys/amd64/amd64/mp_watchdog.c,v 1.4 2005/02/28 08:55:53 pjd Exp $ */ #include "opt_mp_watchdog.h" @@ -49,11 +49,11 @@ #include /* - * mp_swatchdog hijacks the idle thread on a specified CPU, prevents new work + * mp_watchdog hijacks the idle thread on a specified CPU, prevents new work * from being scheduled there, and uses it as a "watchdog" to detect kernel * failure on other CPUs. This is made reasonable by inclusion of logical * processors in Xeon hardware. The watchdog is configured by setting the - * debug.watchdog_cpu sysctl to the CPU of interest. A callout will then + * debug.watchdog sysctl/tunable to the CPU of interest. A callout will then * begin executing reseting a timer that is gradually lowered by the watching * thread. If the timer reaches 0, the watchdog fires by ether dropping * directly to the debugger, or by sending an NMI IPI to the boot processor. @@ -68,11 +68,14 @@ static int watchdog_timer = -1; static int watchdog_nmi = 1; +TUNABLE_INT("debug.watchdog", &watchdog_cpu); SYSCTL_INT(_debug, OID_AUTO, watchdog_nmi, CTLFLAG_RW, &watchdog_nmi, 0, "IPI the boot processor with an NMI to enter the debugger"); static struct callout watchdog_callout; +static void watchdog_change(int wdcpu); + /* * Number of seconds before the watchdog will fire if the callout fails to * reset the timer. @@ -84,6 +87,8 @@ { callout_init(&watchdog_callout, CALLOUT_MPSAFE); + if (watchdog_cpu != -1) + watchdog_change(watchdog_cpu); } /* @@ -108,6 +113,27 @@ } SYSINIT(watchdog_init, SI_SUB_DRIVERS, SI_ORDER_ANY, watchdog_init, NULL); +static void +watchdog_change(int wdcpu) +{ + + if (wdcpu == -1 || wdcpu == 0xffffffff) { + /* + * Disable the watchdog. + */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 1 21:08:42 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67EBA16A4D0; Tue, 1 Mar 2005 21:08:42 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4098916A4CE for ; Tue, 1 Mar 2005 21:08:42 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F263843D2D for ; Tue, 1 Mar 2005 21:08:41 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j21L8fK6095541 for ; Tue, 1 Mar 2005 21:08:41 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j21L8f0h095538 for perforce@freebsd.org; Tue, 1 Mar 2005 21:08:41 GMT (envelope-from jmg@freebsd.org) Date: Tue, 1 Mar 2005 21:08:41 GMT Message-Id: <200503012108.j21L8f0h095538@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Subject: PERFORCE change 72294 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2005 21:08:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=72294 Change 72294 by jmg@jmg_carbon on 2005/03/01 21:08:36 pull in the realmem fix.. Affected files ... .. //depot/projects/arm/src/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/arm/src/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/arm/src/sys/netgraph/ng_eiface.c#2 integrate Differences ... ==== //depot/projects/arm/src/sys/arm/arm/machdep.c#3 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.14 2005/02/26 18:59:01 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.15 2005/03/01 20:12:52 cognet Exp $"); #include #include @@ -93,6 +93,8 @@ int cold = 1; vm_offset_t vector_page; +long realmem = 0; + void sendsig(catcher, sig, mask, code) sig_t catcher; @@ -242,6 +244,7 @@ m = vm_page_alloc(NULL, 0, VM_ALLOC_NOOBJ | VM_ALLOC_ZERO); pmap_kenter_user(ARM_TP_ADDRESS, VM_PAGE_TO_PHYS(m)); #endif + realmem = physmem; } ==== //depot/projects/arm/src/sys/arm/arm/swtch.S#3 (text+ko) ==== @@ -83,7 +83,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.12 2005/02/26 18:59:01 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.13 2005/03/01 20:51:37 cognet Exp $"); /* @@ -202,8 +202,7 @@ str r5, [r6] /* Set the new tp */ - ldr r6, [r5, #(TD_MD)] - add r6, r6, #(MD_TP) + ldr r6, [r5, #(TD_MD + MD_TP)] mov r5, #ARM_TP_ADDRESS str r6, [r5] @@ -300,6 +299,7 @@ ldr r5, [r9, #(PCB_DACR)] /* r5 = new DACR */ mov r2, #DOMAIN_CLIENT cmp r5, r2, lsl #(PMAP_DOMAIN_KERNEL * 2) /* Sw to kernel thread? */ + mcreq p15, 0, r5, c3, c0, 0 /* Update DACR for new context */ beq .Lcs_context_switched /* Yup. Don't flush cache */ mrc p15, 0, r0, c3, c0, 0 /* r0 = old DACR */ /* ==== //depot/projects/arm/src/sys/netgraph/ng_eiface.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.26 2005/02/08 10:31:55 ru Exp $ + * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.27 2005/03/01 19:39:57 ru Exp $ */ #include @@ -613,6 +613,12 @@ return (ENETDOWN); } + if (m->m_len < ETHER_HDR_LEN) { + m = m_pullup(m, ETHER_HDR_LEN); + if (m == NULL) + return (EINVAL); + } + /* Note receiving interface */ m->m_pkthdr.rcvif = ifp; From owner-p4-projects@FreeBSD.ORG Tue Mar 1 21:51:36 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C733816A4D0; Tue, 1 Mar 2005 21:51:35 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A115A16A4CE for ; Tue, 1 Mar 2005 21:51:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 56B5C43D46 for ; Tue, 1 Mar 2005 21:51:35 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j21LpZkC099671 for ; Tue, 1 Mar 2005 21:51:35 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j21LpZbC099654 for perforce@freebsd.org; Tue, 1 Mar 2005 21:51:35 GMT (envelope-from cognet@freebsd.org) Date: Tue, 1 Mar 2005 21:51:35 GMT Message-Id: <200503012151.j21LpZbC099654@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Subject: PERFORCE change 72298 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2005 21:51:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=72298 Change 72298 by cognet@cognet on 2005/03/01 21:50:44 - Define ARM_HAS_ATOMIC_CMPSET_32, and provide a braindead atomic_cmpset_32() implementation. - Use malloc/free instead of _rtld_allocate_tls/_rtld_free_tls, as tls support is not there on arm yet. (Many thanks to David for bringing back arm support) Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/arch/arm/Makefile.inc#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/arm/arm/pthread_md.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/arm/include/pthread_md.h#4 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/arm/Makefile.inc#4 (text+ko) ==== @@ -2,4 +2,6 @@ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} +CFLAGS+= -DARM_HAS_ATOMIC_CMPSET_32 + SRCS+= pthread_md.c ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/arm/arm/pthread_md.c#4 (text+ko) ==== @@ -26,22 +26,22 @@ * $FreeBSD$ */ +#include #include #include #include "pthread_md.h" +struct umtx arm_umtx = { + .u_owner = UMTX_UNOWNED +}; + struct tcb * _tcb_ctor(struct pthread *thread, int initial) { struct tcb *tcb; - void *oldtls; - if (initial) - oldtls = _tcb_get(); - else - oldtls = NULL; - tcb = _rtld_allocate_tls(oldtls, sizeof(struct tcb), 16); + tcb = malloc(sizeof(struct tcb)); if (tcb) tcb->tcb_thread = thread; return (tcb); @@ -50,5 +50,5 @@ void _tcb_dtor(struct tcb *tcb) { - _rtld_free_tls(tcb, sizeof(struct tcb), 16); + free(tcb); } ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/arm/include/pthread_md.h#4 (text+ko) ==== @@ -35,7 +35,12 @@ #include #include #include +#include + +static __inline int atomic_cmpset_32(volatile uint32_t *, uint32_t, uint32_t); +#include + #define DTV_OFFSET offsetof(struct tcb, tcb_dtv) /* @@ -58,7 +63,7 @@ static __inline void _tcb_set(struct tcb *tcb) { - *((struct tcb *)ARM_TP_ADDRESS) = tcb; + *((struct tcb **)ARM_TP_ADDRESS) = tcb; } /* @@ -67,7 +72,7 @@ static __inline struct tcb * _tcb_get(void) { - return (*((struct tcb *)ARM_TP_ADDRESS)); + return (*((struct tcb **)ARM_TP_ADDRESS)); } extern struct pthread *_thr_initial; @@ -80,4 +85,22 @@ return (NULL); } +extern struct umtx arm_umtx; + +static __inline int +atomic_cmpset_32(volatile uint32_t *dst, uint32_t old, uint32_t newval) +{ + int ret; + + _umtx_lock(&arm_umtx); + arm_umtx.u_owner = (void*)((uint32_t)arm_umtx.u_owner | UMTX_CONTESTED); + if (*dst == old) { + *dst = newval; + ret = 1; + } else + ret = 0; + _umtx_unlock(&arm_umtx); + return (ret); +} + #endif /* _PTHREAD_MD_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Mar 2 14:58:48 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 320A216A4D0; Wed, 2 Mar 2005 14:58:48 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0AAF916A4CE for ; Wed, 2 Mar 2005 14:58:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D78B43D1F for ; Wed, 2 Mar 2005 14:58:47 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j22EwlMC078519 for ; Wed, 2 Mar 2005 14:58:47 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j22Ewk3v078516 for perforce@freebsd.org; Wed, 2 Mar 2005 14:58:46 GMT (envelope-from jhb@freebsd.org) Date: Wed, 2 Mar 2005 14:58:46 GMT Message-Id: <200503021458.j22Ewk3v078516@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 72354 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Mar 2005 14:58:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=72354 Change 72354 by jhb@jhb_slimer on 2005/03/02 14:58:20 IFC @72352. Loop back lapic timer changes. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#78 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#11 integrate .. //depot/projects/smpng/sys/arm/arm/swtch.S#9 integrate .. //depot/projects/smpng/sys/conf/files.i386#77 integrate .. //depot/projects/smpng/sys/contrib/dev/hptmv/access601.h#2 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/array.h#2 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/atapi.h#2 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/command.h#2 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/gui_lib.c#2 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/hptproc.c#2 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#3 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/ioctl.c#3 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/mvSata.h#2 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/mvStorageDev.h#2 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/raid5n.h#2 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/readme.txt#2 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/vdevice.h#2 delete .. //depot/projects/smpng/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_sony.c#3 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#80 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_battery.c#11 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_button.c#17 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#18 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#21 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_video.c#8 integrate .. //depot/projects/smpng/sys/dev/acpica/acpiio.h#8 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#53 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#23 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#24 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_pci.c#16 integrate .. //depot/projects/smpng/sys/dev/hptmv/access601.h#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/array.h#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/atapi.h#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/command.h#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/gui_lib.c#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/hptproc.c#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/i386-elf.raid.o.uu#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/mvSata.h#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/mvStorageDev.h#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/raid5n.h#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/readme.txt#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/vdevice.h#2 integrate .. //depot/projects/smpng/sys/dev/uart/uart_core.c#8 integrate .. //depot/projects/smpng/sys/i386/i386/local_apic.c#27 integrate .. //depot/projects/smpng/sys/i386/isa/vesa.c#14 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#91 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#104 integrate .. //depot/projects/smpng/sys/modules/hptmv/Makefile#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.c#18 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#27 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#78 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#22 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#73 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#78 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.232 2005/02/06 01:55:06 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.233 2005/03/01 21:55:26 wes Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -194,6 +194,7 @@ struct msgbuf *msgbufp=0; long Maxmem = 0; +long realmem = 0; long totalphysmem; /* total amount of physical memory in system */ long resvmem; /* amount of memory reserved for PROM */ @@ -250,6 +251,7 @@ #endif printf("real memory = %ld (%ld MB)\n", alpha_ptob(Maxmem), alpha_ptob(Maxmem) / 1048576); + realmem = alpha_ptob(Maxmem); /* * Display any holes after the first chunk of extended memory. ==== //depot/projects/smpng/sys/arm/arm/machdep.c#11 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.14 2005/02/26 18:59:01 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.15 2005/03/01 20:12:52 cognet Exp $"); #include #include @@ -93,6 +93,8 @@ int cold = 1; vm_offset_t vector_page; +long realmem = 0; + void sendsig(catcher, sig, mask, code) sig_t catcher; @@ -242,6 +244,7 @@ m = vm_page_alloc(NULL, 0, VM_ALLOC_NOOBJ | VM_ALLOC_ZERO); pmap_kenter_user(ARM_TP_ADDRESS, VM_PAGE_TO_PHYS(m)); #endif + realmem = physmem; } ==== //depot/projects/smpng/sys/arm/arm/swtch.S#9 (text+ko) ==== @@ -83,7 +83,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.12 2005/02/26 18:59:01 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.13 2005/03/01 20:51:37 cognet Exp $"); /* @@ -202,8 +202,7 @@ str r5, [r6] /* Set the new tp */ - ldr r6, [r5, #(TD_MD)] - add r6, r6, #(MD_TP) + ldr r6, [r5, #(TD_MD + MD_TP)] mov r5, #ARM_TP_ADDRESS str r6, [r5] @@ -300,6 +299,7 @@ ldr r5, [r9, #(PCB_DACR)] /* r5 = new DACR */ mov r2, #DOMAIN_CLIENT cmp r5, r2, lsl #(PMAP_DOMAIN_KERNEL * 2) /* Sw to kernel thread? */ + mcreq p15, 0, r5, c3, c0, 0 /* Update DACR for new context */ beq .Lcs_context_switched /* Yup. Don't flush cache */ mrc p15, 0, r0, c3, c0, 0 /* r0 = old DACR */ /* ==== //depot/projects/smpng/sys/conf/files.i386#77 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.519 2005/02/24 21:49:13 wpaul Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.520 2005/03/02 05:14:28 scottl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -62,8 +62,8 @@ clean "opt_ah.h" # hptmvraid.o optional hptmv \ - dependency "$S/contrib/dev/hptmv/i386-elf.raid.o.uu" \ - compile-with "uudecode < $S/contrib/dev/hptmv/i386-elf.raid.o.uu" \ + dependency "$S/dev/hptmv/i386-elf.raid.o.uu" \ + compile-with "uudecode < $S/dev/hptmv/i386-elf.raid.o.uu" \ no-implicit-rule # # @@ -104,9 +104,6 @@ compat/svr4/svr4_sysvec.c optional compat_svr4 compat/svr4/svr4_termios.c optional compat_svr4 compat/svr4/svr4_ttold.c optional compat_svr4 -contrib/dev/hptmv/gui_lib.c optional hptmv -contrib/dev/hptmv/hptproc.c optional hptmv -contrib/dev/hptmv/ioctl.c optional hptmv contrib/dev/oltr/if_oltr.c optional oltr contrib/dev/oltr/if_oltr_isa.c optional oltr isa contrib/dev/oltr/if_oltr_pci.c optional oltr pci @@ -160,6 +157,9 @@ dev/fe/if_fe_isa.c optional fe isa dev/hptmv/entry.c optional hptmv dev/hptmv/mv.c optional hptmv +dev/hptmv/gui_lib.c optional hptmv +dev/hptmv/hptproc.c optional hptmv +dev/hptmv/ioctl.c optional hptmv dev/ichwd/ichwd.c optional ichwd dev/if_ndis/if_ndis.c optional ndis dev/if_ndis/if_ndis_pccard.c optional ndis pccard ==== //depot/projects/smpng/sys/dev/acpi_support/acpi_ibm.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/dev/acpi_support/acpi_ibm.c,v 1.3 2004/12/13 23:31:45 njl Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_ibm.c,v 1.4 2005/03/02 09:22:34 obrien Exp $"); + #include "opt_acpi.h" #include #include ==== //depot/projects/smpng/sys/dev/acpi_support/acpi_sony.c#3 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/dev/acpi_support/acpi_sony.c,v 1.7 2004/12/13 23:31:46 njl Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_sony.c,v 1.8 2005/03/02 09:22:34 obrien Exp $"); + #include "opt_acpi.h" #include #include ==== //depot/projects/smpng/sys/dev/acpica/acpi.c#80 (text+ko) ==== @@ -25,10 +25,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.204 2005/02/25 22:01:58 njl Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.205 2005/03/02 09:22:34 obrien Exp $"); + #include "opt_acpi.h" #include #include ==== //depot/projects/smpng/sys/dev/acpica/acpi_battery.c#11 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/dev/acpica/acpi_battery.c,v 1.10 2004/08/13 06:21:41 njl Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_battery.c,v 1.11 2005/03/02 09:22:34 obrien Exp $"); + #include "opt_acpi.h" #include #include ==== //depot/projects/smpng/sys/dev/acpica/acpi_button.c#17 (text+ko) ==== @@ -24,10 +24,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/dev/acpica/acpi_button.c,v 1.29 2004/06/30 16:08:03 njl Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_button.c,v 1.30 2005/03/02 09:22:34 obrien Exp $"); + #include "opt_acpi.h" #include #include ==== //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#18 (text+ko) ==== @@ -23,9 +23,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.46 2004/11/23 22:26:44 jhb Exp $ */ + +#include +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.47 2005/03/02 09:22:34 obrien Exp $"); + #include "opt_acpi.h" #include #include ==== //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#21 (text+ko) ==== @@ -23,9 +23,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.37 2004/11/03 09:09:13 phk Exp $ */ + +#include +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.38 2005/03/02 09:22:34 obrien Exp $"); + #include "opt_acpi.h" #include #include ==== //depot/projects/smpng/sys/dev/acpica/acpi_video.c#8 (text+ko) ==== @@ -24,9 +24,11 @@ * SUCH DAMAGE. * * $Id: acpi_vid.c,v 1.4 2003/10/13 10:07:36 taku Exp $ - * $FreeBSD: src/sys/dev/acpica/acpi_video.c,v 1.9 2004/11/09 04:41:30 njl Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_video.c,v 1.10 2005/03/02 09:22:34 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/dev/acpica/acpiio.h#8 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.12 2005/02/28 05:39:34 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.13 2005/03/02 09:22:34 obrien Exp $ */ #ifndef _ACPIIO_H_ ==== //depot/projects/smpng/sys/dev/acpica/acpivar.h#53 (text+ko) ==== @@ -25,12 +25,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.88 2005/02/28 05:39:34 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.90 2005/03/02 09:22:34 obrien Exp $ */ #ifndef _ACPIVAR_H_ #define _ACPIVAR_H_ +#ifdef _KERNEL + #include "acpi_if.h" #include "bus_if.h" #include @@ -410,4 +412,5 @@ /* ACPI task kernel thread initialization. */ int acpi_task_thread_init(void); +#endif /* _KERNEL */ #endif /* !_ACPIVAR_H_ */ ==== //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#23 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.51 2004/12/24 13:38:25 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.53 2005/03/02 03:59:28 mdodd Exp $"); #include "opt_ata.h" #include @@ -297,6 +297,9 @@ /* ATA PIO data transfer and control commands */ default: + /* XXX Doesn't handle the non-PIO case. */ + if (request->flags & ATA_R_TIMEOUT) + return ATA_OP_FINISHED; /* on control commands read back registers to the request struct */ if (request->flags & ATA_R_CONTROL) { @@ -619,8 +622,11 @@ (stat1 == err && lsb == err && msb == err && timeout > 5)) mask &= ~0x02; } + if (mask == 0 && !(stat0 & ATA_S_BUSY) && !(stat1 & ATA_S_BUSY)) + break; + ata_udelay(100000); - } + } if (bootverbose) ata_printf(ch, -1, ==== //depot/projects/smpng/sys/dev/ata/ata-queue.c#24 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.41 2004/12/08 11:16:33 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.42 2005/03/02 04:01:37 mdodd Exp $"); #include "opt_ata.h" #include @@ -249,6 +249,7 @@ && request->device->param){ request->flags &= ~(ATA_R_TIMEOUT | ATA_R_DEBUG); request->flags |= (ATA_R_IMMEDIATE | ATA_R_REQUEUE); + request->donecount = 0; ATA_DEBUG_RQ(request, "completed reinject"); ata_queue_request(request); return; ==== //depot/projects/smpng/sys/dev/hme/if_hme_pci.c#16 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme_pci.c,v 1.18 2005/02/20 01:52:43 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme_pci.c,v 1.19 2005/03/02 00:49:37 marius Exp $"); /* * PCI front-end device driver for the HME ethernet device. @@ -310,9 +310,14 @@ * all-zero "checksum" byte. Sun calls this a "Fresh Choice * Ethernet" VPD... */ - bus_space_read_region_1(romt, romh, - vpdoff + slot * (3 + sizeof(struct pci_vpd) + ETHER_ADDR_LEN), - buf, sizeof(buf)); + /* Look at the end tag to determine whether this is a VPD with 4 NAs. */ + if (bus_space_read_1(romt, romh, + vpdoff + 3 + sizeof(struct pci_vpd) + ETHER_ADDR_LEN) != 0x79 && + bus_space_read_1(romt, romh, + vpdoff + 4 * (3 + sizeof(struct pci_vpd) + ETHER_ADDR_LEN)) == 0x79) + /* Use the Nth NA for the Nth HME on this SUNW,qfe. */ + vpdoff += slot * (3 + sizeof(struct pci_vpd) + ETHER_ADDR_LEN); + bus_space_read_region_1(romt, romh, vpdoff, buf, sizeof(buf)); vpd = (void *)(buf + 3); if (PCI_VPDRES_ISLARGE(buf[0]) == 0 || PCI_VPDRES_LARGE_NAME(buf[0]) != PCI_VPDRES_TYPE_VPD || @@ -324,11 +329,6 @@ error = ENXIO; goto fail_rres; } - if (buf + 3 + sizeof(struct pci_vpd) == NULL) { - device_printf(dev, "could not read network address\n"); - error = ENXIO; - goto fail_rres; - } bcopy(buf + 3 + sizeof(struct pci_vpd), sc->sc_arpcom.ac_enaddr, ETHER_ADDR_LEN); ==== //depot/projects/smpng/sys/dev/hptmv/access601.h#2 (text+ko) ==== @@ -22,6 +22,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD: src/sys/dev/hptmv/access601.h,v 1.2 2005/03/02 05:14:27 scottl Exp $ */ #ifndef _ACCESS601_H_ #define _ACCESS601_H_ ==== //depot/projects/smpng/sys/dev/hptmv/array.h#2 (text+ko) ==== @@ -22,6 +22,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD: src/sys/dev/hptmv/array.h,v 1.2 2005/03/02 05:14:27 scottl Exp $ */ #ifndef _ARRAY_H_ ==== //depot/projects/smpng/sys/dev/hptmv/atapi.h#2 (text+ko) ==== @@ -22,6 +22,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD: src/sys/dev/hptmv/atapi.h,v 1.2 2005/03/02 05:14:27 scottl Exp $ */ #ifndef _ATAPI_H_ ==== //depot/projects/smpng/sys/dev/hptmv/command.h#2 (text+ko) ==== @@ -22,6 +22,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD: src/sys/dev/hptmv/command.h,v 1.2 2005/03/02 05:14:27 scottl Exp $ */ #ifndef _COMMAND_H_ #define _COMMAND_H_ ==== //depot/projects/smpng/sys/dev/hptmv/gui_lib.c#2 (text+ko) ==== @@ -22,6 +22,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD: src/sys/dev/hptmv/gui_lib.c,v 1.2 2005/03/02 05:14:27 scottl Exp $ */ /* * gui_lib.c ==== //depot/projects/smpng/sys/dev/hptmv/hptproc.c#2 (text+ko) ==== @@ -22,6 +22,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD: src/sys/dev/hptmv/hptproc.c,v 1.3 2005/03/02 05:14:27 scottl Exp $ */ /* * hptproc.c sysctl support ==== //depot/projects/smpng/sys/dev/hptmv/i386-elf.raid.o.uu#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/hptmv/i386-elf.raid.o.uu,v 1.3 2005/02/28 00:53:29 obrien Exp $ + * $FreeBSD: src/sys/dev/hptmv/i386-elf.raid.o.uu,v 1.4 2005/03/02 05:14:27 scottl Exp $ */ begin 664 hptmvraid.o M?T5,1@$!`0D```````````$``P`!``````````````#0N````````#0````` ==== //depot/projects/smpng/sys/dev/hptmv/ioctl.c#2 (text+ko) ==== @@ -22,6 +22,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD: src/sys/dev/hptmv/ioctl.c,v 1.3 2005/03/02 05:14:27 scottl Exp $ */ /* * ioctl.c ioctl interface implementation ==== //depot/projects/smpng/sys/dev/hptmv/mvSata.h#2 (text+ko) ==== @@ -22,6 +22,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD: src/sys/dev/hptmv/mvSata.h,v 1.2 2005/03/02 05:14:27 scottl Exp $ */ #ifndef __INCmvSatah #define __INCmvSatah ==== //depot/projects/smpng/sys/dev/hptmv/mvStorageDev.h#2 (text+ko) ==== @@ -22,7 +22,9 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - */ + * + * $FreeBSD: src/sys/dev/hptmv/mvStorageDev.h,v 1.2 2005/03/02 05:14:27 scottl Exp $ + * #ifndef __INCmvStorageDevh #define __INCmvStorageDevh ==== //depot/projects/smpng/sys/dev/hptmv/raid5n.h#2 (text+ko) ==== @@ -22,6 +22,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD: src/sys/dev/hptmv/raid5n.h,v 1.2 2005/03/02 05:14:27 scottl Exp $ */ #ifdef _RAID5N_ ==== //depot/projects/smpng/sys/dev/hptmv/readme.txt#2 (text+ko) ==== @@ -1,5 +1,6 @@ RocketRAID 182x Driver for FreeBSD Copyright (C) 2003-2004 HighPoint Technologies, Inc. All rights reserved. +$FreeBSD: src/sys/dev/hptmv/readme.txt,v 1.2 2005/03/02 05:14:27 scottl Exp $ ############################################################################# Revision History: ==== //depot/projects/smpng/sys/dev/hptmv/vdevice.h#2 (text+ko) ==== @@ -22,6 +22,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD: src/sys/dev/hptmv/vdevice.h,v 1.2 2005/03/02 05:14:27 scottl Exp $ */ #ifndef _VDEVICE_H_ ==== //depot/projects/smpng/sys/dev/uart/uart_core.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.12 2005/01/06 01:43:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.13 2005/03/02 11:30:14 marius Exp $"); #ifndef KLD_MODULE #include "opt_comconsole.h" @@ -321,14 +321,16 @@ */ sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid, 0, ~0, sc->sc_class->uc_range, RF_ACTIVE); - if (sc->sc_rres == NULL) + if (sc->sc_rres == NULL) { + mtx_destroy(&sc->sc_hwmtx); return (ENXIO); + } sc->sc_bas.bsh = rman_get_bushandle(sc->sc_rres); sc->sc_bas.bst = rman_get_bustag(sc->sc_rres); sc->sc_irid = 0; sc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->sc_irid, - RF_ACTIVE); + RF_ACTIVE | RF_SHAREABLE); if (sc->sc_ires != NULL) { error = BUS_SETUP_INTR(device_get_parent(dev), dev, sc->sc_ires, INTR_TYPE_TTY | INTR_FAST, uart_intr, @@ -438,6 +440,8 @@ } bus_release_resource(dev, sc->sc_rtype, sc->sc_rrid, sc->sc_rres); + mtx_destroy(&sc->sc_hwmtx); + return (error); } @@ -467,6 +471,8 @@ } bus_release_resource(dev, sc->sc_rtype, sc->sc_rrid, sc->sc_rres); + mtx_destroy(&sc->sc_hwmtx); + if (sc->sc_class->size > sizeof(*sc)) { device_set_softc(dev, NULL); free(sc, M_UART); ==== //depot/projects/smpng/sys/i386/i386/local_apic.c#27 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.13 2005/02/08 20:25:06 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.14 2005/03/02 14:17:43 jhb Exp $"); #include #include @@ -66,9 +66,9 @@ CTASSERT(APIC_LOCAL_INTS == 240); CTASSERT(IPI_STOP < APIC_SPURIOUS_INT); -#define LAPIC_TIMER_HZ_DIVIDER 3 -#define LAPIC_TIMER_STATHZ_DIVIDER 23 -#define LAPIC_TIMER_PROFHZ_DIVIDER 2 +#define LAPIC_TIMER_HZ_DIVIDER 2 +#define LAPIC_TIMER_STATHZ_DIVIDER 15 +#define LAPIC_TIMER_PROFHZ_DIVIDER 3 /* * Support for local APICs. Local APICs manage interrupts on each @@ -130,8 +130,6 @@ volatile lapic_t *lapic; static u_long lapic_timer_divisor, lapic_timer_period, lapic_timer_hz; -static u_long *lapic_virtual_hardclock, *lapic_virtual_statclock, - *lapic_virtual_profclock; static void lapic_enable(void); static void lapic_timer_enable_intr(void); @@ -372,9 +370,6 @@ stathz = lapic_timer_hz / LAPIC_TIMER_STATHZ_DIVIDER; profhz = lapic_timer_hz / LAPIC_TIMER_PROFHZ_DIVIDER; lapic_timer_period = value / lapic_timer_hz; - intrcnt_add("lapic: hardclock", &lapic_virtual_hardclock); - intrcnt_add("lapic: statclock", &lapic_virtual_statclock); - intrcnt_add("lapic: profclock", &lapic_virtual_profclock); /* * Start up the timer on the BSP. The APs will kick off their @@ -628,10 +623,9 @@ la->la_hard_ticks += hz; if (la->la_hard_ticks >= lapic_timer_hz) { la->la_hard_ticks -= lapic_timer_hz; - if (PCPU_GET(cpuid) == 0) { - (*lapic_virtual_hardclock)++; + if (PCPU_GET(cpuid) == 0) hardclock(&frame); - } else + else hardclock_process(&frame); } @@ -639,8 +633,6 @@ la->la_stat_ticks += stathz; if (la->la_stat_ticks >= lapic_timer_hz) { la->la_stat_ticks -= lapic_timer_hz; - if (PCPU_GET(cpuid) == 0) - (*lapic_virtual_statclock)++; statclock(&frame); } @@ -648,8 +640,6 @@ la->la_prof_ticks += profhz; if (la->la_prof_ticks >= lapic_timer_hz) { la->la_prof_ticks -= lapic_timer_hz; - if (PCPU_GET(cpuid) == 0) - (*lapic_virtual_profclock)++; if (profprocs != 0) profclock(&frame); } ==== //depot/projects/smpng/sys/i386/isa/vesa.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/isa/vesa.c,v 1.48 2005/02/28 20:40:44 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/vesa.c,v 1.49 2005/03/01 23:17:42 iedowse Exp $"); #include "opt_vga.h" #include "opt_vesa.h" @@ -187,7 +187,7 @@ #define STATE_REG (1<<3) #define STATE_MOST (STATE_HW | STATE_DATA | STATE_REG) #define STATE_ALL (STATE_HW | STATE_DATA | STATE_DAC | STATE_REG) -#define STATE_MAXSIZE (2 * PAGE_SIZE) +#define STATE_MAXSIZE PAGE_SIZE static int vesa_bios_state_buf_size(void); static int vesa_bios_save_restore(int code, void *p, size_t size); static int vesa_bios_get_line_length(void); @@ -805,8 +805,6 @@ if (!has_vesa_bios) return (1); - /* Get a second page to support STATE_MAXSIZE. */ - (void)vm86_addpage(&vesa_vmcontext, 2, 0); return (0); } ==== //depot/projects/smpng/sys/ia64/ia64/machdep.c#91 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.196 2005/02/06 01:55:07 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.197 2005/03/01 21:55:26 wes Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -143,6 +143,7 @@ struct msgbuf *msgbufp=0; long Maxmem = 0; +long realmem = 0; vm_offset_t phys_avail[100]; @@ -246,6 +247,7 @@ #endif printf("real memory = %ld (%ld MB)\n", ia64_ptob(Maxmem), ia64_ptob(Maxmem) / 1048576); + realmem = ia64_ptob(Maxmem); /* * Display any holes after the first chunk of extended memory. ==== //depot/projects/smpng/sys/kern/kern_sig.c#104 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.301 2005/02/19 06:05:49 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.302 2005/03/02 13:43:51 davidxu Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -844,7 +844,7 @@ struct timespec *timeout) { struct sigacts *ps; - sigset_t savedmask, sigset; + sigset_t savedmask; struct proc *p; int error, sig, hz, i, timevalid = 0; struct timespec rts, ets, ts; @@ -894,23 +894,12 @@ i = 0; mtx_unlock(&ps->ps_mtx); } - if (sig) { - td->td_sigmask = savedmask; - signotify(td); + if (sig) goto out; - } } if (error) goto out; - td->td_sigmask = savedmask; - signotify(td); - sigset = td->td_siglist; - SIGSETOR(sigset, p->p_siglist); - SIGSETAND(sigset, waitset); - if (!SIGISEMPTY(sigset)) - goto again; - /* * POSIX says this must be checked after looking for pending * signals. @@ -933,6 +922,9 @@ hz = 0; td->td_waitset = &waitset; + td->td_sigmask = savedmask; + SIGSETNAND(td->td_sigmask, waitset); + signotify(td); error = msleep(&ps, &p->p_mtx, PPAUSE|PCATCH, "sigwait", hz); td->td_waitset = NULL; if (timeout) { @@ -947,6 +939,8 @@ goto again; out: + td->td_sigmask = savedmask; + signotify(td); if (sig) { sig_t action; @@ -1600,8 +1594,8 @@ FOREACH_THREAD_IN_PROC(p, td) { if (td->td_waitset != NULL && SIGISMEMBER(*(td->td_waitset), sig)) { - mtx_unlock_spin(&sched_lock); - return (td); + mtx_unlock_spin(&sched_lock); + return (td); } if (!SIGISMEMBER(td->td_sigmask, sig)) { if (td == curthread) @@ -1708,9 +1702,6 @@ } else { if (!SIGISMEMBER(td->td_sigmask, sig)) siglist = &td->td_siglist; - else if (td->td_waitset != NULL && - SIGISMEMBER(*(td->td_waitset), sig)) - siglist = &td->td_siglist; else siglist = &p->p_siglist; } @@ -1736,11 +1727,7 @@ mtx_unlock(&ps->ps_mtx); return; } - if (((td->td_waitset == NULL) && - SIGISMEMBER(td->td_sigmask, sig)) || - ((td->td_waitset != NULL) && - SIGISMEMBER(td->td_sigmask, sig) && - !SIGISMEMBER(*(td->td_waitset), sig))) + if (SIGISMEMBER(td->td_sigmask, sig)) action = SIG_HOLD; else if (SIGISMEMBER(ps->ps_sigcatch, sig)) action = SIG_CATCH; @@ -1782,11 +1769,6 @@ SIGADDSET(*siglist, sig); signotify(td); /* uses schedlock */ - if (siglist == &td->td_siglist && (td->td_waitset != NULL) && - action != SIG_HOLD) { - td->td_waitset = NULL; - } - /* * Defer further processing for signals which are held, * except that stopped processes must be continued by SIGCONT. ==== //depot/projects/smpng/sys/modules/hptmv/Makefile#2 (text+ko) ==== @@ -2,10 +2,10 @@ # Makefile for RR182x FreeBSD driver # Copyright (c) 2003-2004 HighPoint Technologies, Inc. All rights reserved # -# $FreeBSD: src/sys/modules/hptmv/Makefile,v 1.2 2004/10/24 08:38:29 scottl Exp $ +# $FreeBSD: src/sys/modules/hptmv/Makefile,v 1.3 2005/03/02 05:14:28 scottl Exp $ -HPTMV= ${.CURDIR}/../../contrib/dev/hptmv -.PATH: ${.CURDIR}/../../dev/hptmv ${HPTMV} +HPTMV= ${.CURDIR}/../../dev/hptmv +.PATH: ${HPTMV} KMOD= hptmv SRCS= opt_scsi.h opt_cam.h ==== //depot/projects/smpng/sys/netgraph/ng_eiface.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.26 2005/02/08 10:31:55 ru Exp $ + * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.27 2005/03/01 19:39:57 ru Exp $ */ #include @@ -613,6 +613,12 @@ return (ENETDOWN); } + if (m->m_len < ETHER_HDR_LEN) { + m = m_pullup(m, ETHER_HDR_LEN); + if (m == NULL) + return (EINVAL); + } + /* Note receiving interface */ m->m_pkthdr.rcvif = ifp; ==== //depot/projects/smpng/sys/netinet/ip_carp.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet/ip_carp.c,v 1.18 2005/03/01 13:14:33 glebius Exp $ */ +/* $FreeBSD: src/sys/netinet/ip_carp.c,v 1.19 2005/03/02 09:11:18 glebius Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -1614,7 +1614,7 @@ CARP_LOCK(cif); cif->vhif_ifp = ifp; TAILQ_INIT(&cif->vhif_vrs); - callout_init(&cif->cif_tmp, NET_CALLOUT_MPSAFE); + callout_init(&cif->cif_tmo, NET_CALLOUT_MPSAFE); ifp->if_carp = cif; } else { ==== //depot/projects/smpng/sys/netinet6/icmp6.c#27 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/icmp6.c,v 1.59 2005/02/27 18:57:10 ume Exp $ */ +/* $FreeBSD: src/sys/netinet6/icmp6.c,v 1.60 2005/03/02 05:14:15 suz Exp $ */ /* $KAME: icmp6.c,v 1.211 2001/04/04 05:56:20 itojun Exp $ */ /*- @@ -469,8 +469,6 @@ case ICMP6_PACKET_TOO_BIG: icmp6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_pkttoobig); - if (code != 0) - goto badcode; /* validation is made in icmp6_mtudisc_update */ ==== //depot/projects/smpng/sys/pc98/i386/machdep.c#78 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/pc98/i386/machdep.c,v 1.353 2005/02/24 13:15:05 nyan Exp $ + * $FreeBSD: src/sys/pc98/i386/machdep.c,v 1.354 2005/03/01 21:55:26 wes Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 2 18:08:10 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE6A916A4D0; Wed, 2 Mar 2005 18:08:09 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B8AF516A4CE for ; Wed, 2 Mar 2005 18:08:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B0A143D1D for ; Wed, 2 Mar 2005 18:08:09 +0000 (GMT) (envelope-from kelly@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j22I89an094374 for ; Wed, 2 Mar 2005 18:08:09 GMT (envelope-from kelly@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j22I89Kj094371 for perforce@freebsd.org; Wed, 2 Mar 2005 18:08:09 GMT (envelope-from kelly@FreeBSD.org) Date: Wed, 2 Mar 2005 18:08:09 GMT Message-Id: <200503021808.j22I89Kj094371@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kelly@FreeBSD.org using -f From: Kelly Djahandari To: Perforce Change Reviews Subject: PERFORCE change 72377 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Mar 2005 18:08:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=72377 Change 72377 by kelly@kelly_riveroaks2.earthlink.net on 2005/03/02 18:07:57 Added cd9660 as fstype for cdrom on FreeBSD to allow mounting. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/genfs_contexts#6 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/genfs_contexts#6 (text+ko) ==== @@ -40,6 +40,8 @@ # iso9660 genfscon iso9660 / system_u:object_r:iso9660_t genfscon udf / system_u:object_r:iso9660_t +# cd9660 (Freebsd) +genfscon cd9660 / system_u:object_r:iso9660_t # samba genfscon cifs / system_u:object_r:sambafs_t From owner-p4-projects@FreeBSD.ORG Thu Mar 3 21:04:25 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95E9616A4D0; Thu, 3 Mar 2005 21:04:25 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6A91C16A4CE for ; Thu, 3 Mar 2005 21:04:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 549D043D2F for ; Thu, 3 Mar 2005 21:04:25 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j23L4PeP010117 for ; Thu, 3 Mar 2005 21:04:25 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j23L4Pjw010114 for perforce@freebsd.org; Thu, 3 Mar 2005 21:04:25 GMT (envelope-from jhb@freebsd.org) Date: Thu, 3 Mar 2005 21:04:25 GMT Message-Id: <200503032104.j23L4Pjw010114@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 72450 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Mar 2005 21:04:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=72450 Change 72450 by jhb@jhb_slimer on 2005/03/03 21:03:35 Clobber memory for cas{x,}a() inlines. Suggested by: alc Affected files ... .. //depot/projects/smpng/sys/sparc64/include/cpufunc.h#20 edit Differences ... ==== //depot/projects/smpng/sys/sparc64/include/cpufunc.h#20 (text+ko) ==== @@ -63,14 +63,14 @@ #define casa(rs1, rs2, rd, asi) ({ \ u_int __rd = (uint32_t)(rd); \ __asm __volatile("casa [%1] %2, %3, %0" \ - : "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2)); \ + : "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2) : "memory");\ __rd; \ }) #define casxa(rs1, rs2, rd, asi) ({ \ u_long __rd = (uint64_t)(rd); \ __asm __volatile("casxa [%1] %2, %3, %0" \ - : "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2)); \ + : "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2) : "memory");\ __rd; \ }) From owner-p4-projects@FreeBSD.ORG Thu Mar 3 21:26:00 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E222B16A4D0; Thu, 3 Mar 2005 21:25:59 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A190616A4CE; Thu, 3 Mar 2005 21:25:59 +0000 (GMT) Received: from cs.rice.edu (cs.rice.edu [128.42.1.30]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6EA6643D4C; Thu, 3 Mar 2005 21:25:59 +0000 (GMT) (envelope-from alc@cs.rice.edu) Received: from localhost (calypso.cs.rice.edu [128.42.1.127]) by cs.rice.edu (Postfix) with ESMTP id 133BF4A9BB; Thu, 3 Mar 2005 15:25:58 -0600 (CST) Received: from cs.rice.edu ([128.42.1.30]) by localhost (calypso.cs.rice.edu [128.42.1.127]) (amavisd-new, port 10024) with LMTP id 08699-01-81; Thu, 3 Mar 2005 15:25:58 -0600 (CST) Received: by cs.rice.edu (Postfix, from userid 19572) id 732D74A9B1; Thu, 3 Mar 2005 15:25:58 -0600 (CST) Date: Thu, 3 Mar 2005 15:25:58 -0600 From: Alan Cox To: John Baldwin Message-ID: <20050303212558.GA16936@cs.rice.edu> References: <200503032104.j23L4Pjw010114@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200503032104.j23L4Pjw010114@repoman.freebsd.org> User-Agent: Mutt/1.4.2i X-Virus-Scanned: by amavis-2.2.1 at cs.rice.edu cc: Perforce Change Reviews cc: Alan Cox Subject: Re: PERFORCE change 72450 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Mar 2005 21:26:00 -0000 On Thu, Mar 03, 2005 at 09:04:25PM +0000, John Baldwin wrote: > http://perforce.freebsd.org/chv.cgi?CH=72450 > > Change 72450 by jhb@jhb_slimer on 2005/03/03 21:03:35 > > Clobber memory for cas{x,}a() inlines. > > Suggested by: alc > > Affected files ... > > .. //depot/projects/smpng/sys/sparc64/include/cpufunc.h#20 edit > > Differences ... > > ==== //depot/projects/smpng/sys/sparc64/include/cpufunc.h#20 (text+ko) ==== > > @@ -63,14 +63,14 @@ > #define casa(rs1, rs2, rd, asi) ({ \ > u_int __rd = (uint32_t)(rd); \ > __asm __volatile("casa [%1] %2, %3, %0" \ > - : "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2)); \ > + : "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2) : "memory");\ > __rd; \ > }) > > #define casxa(rs1, rs2, rd, asi) ({ \ > u_long __rd = (uint64_t)(rd); \ > __asm __volatile("casxa [%1] %2, %3, %0" \ > - : "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2)); \ > + : "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2) : "memory");\ > __rd; \ > }) > The other, arguably "more correct", option is to declare the memory location referenced by rs1 as an input and output operand, like so from i386: (I say "more correct" because the true operand here is the memory location referenced by rs1 not rs1 the register.) static __inline pt_entry_t pte_load_store(pt_entry_t *ptep, pt_entry_t pte) { pt_entry_t r; __asm __volatile( "xchgl %0,%1" : "=m" (*ptep), "=r" (r) : "1" (pte), "m" (*ptep)); return (r); } (Note: this example does not use "+m" as an output constraint because Tor convinced me a few months ago that the gcc docs prohibit that: "+" is only to be used with registers.) Returning to the sparc, I'm not sure what the right constraint is for cas{x,}a's rs1. I don't believe that "m" is appropriate because this particular instruction doesn't allow the destination to be a register plus an constant offset. Perhaps, "V"? That said, we should add a "memory" clobber to the sparc64 atomic ops that include a memory barrier, particularly, the acquires. Regards, Alan From owner-p4-projects@FreeBSD.ORG Thu Mar 3 22:08:44 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8130A16A4D1; Thu, 3 Mar 2005 22:08:44 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D74116A4CE for ; Thu, 3 Mar 2005 22:08:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 053B343D49 for ; Thu, 3 Mar 2005 22:08:44 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j23M8hbh012852 for ; Thu, 3 Mar 2005 22:08:43 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j23M8h86012849 for perforce@freebsd.org; Thu, 3 Mar 2005 22:08:43 GMT (envelope-from jhb@freebsd.org) Date: Thu, 3 Mar 2005 22:08:43 GMT Message-Id: <200503032208.j23M8h86012849@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 72453 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Mar 2005 22:08:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=72453 Change 72453 by jhb@jhb_slimer on 2005/03/03 22:07:55 Ok, use a more constrained clobber here. Suggested by: alc Affected files ... .. //depot/projects/smpng/sys/sparc64/include/cpufunc.h#21 edit Differences ... ==== //depot/projects/smpng/sys/sparc64/include/cpufunc.h#21 (text+ko) ==== @@ -63,14 +63,14 @@ #define casa(rs1, rs2, rd, asi) ({ \ u_int __rd = (uint32_t)(rd); \ __asm __volatile("casa [%1] %2, %3, %0" \ - : "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2) : "memory");\ + : "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2), "m" (*rs1));\ __rd; \ }) #define casxa(rs1, rs2, rd, asi) ({ \ u_long __rd = (uint64_t)(rd); \ __asm __volatile("casxa [%1] %2, %3, %0" \ - : "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2) : "memory");\ + : "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2), "m" (*rs1));\ __rd; \ }) From owner-p4-projects@FreeBSD.ORG Thu Mar 3 22:11:48 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 678C716A4D0; Thu, 3 Mar 2005 22:11:48 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 43D4716A4CE for ; Thu, 3 Mar 2005 22:11:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E71743D49 for ; Thu, 3 Mar 2005 22:11:48 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j23MBmJJ013013 for ; Thu, 3 Mar 2005 22:11:48 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j23MBlia013010 for perforce@freebsd.org; Thu, 3 Mar 2005 22:11:47 GMT (envelope-from jhb@freebsd.org) Date: Thu, 3 Mar 2005 22:11:47 GMT Message-Id: <200503032211.j23MBlia013010@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 72454 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Mar 2005 22:11:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=72454 Change 72454 by jhb@jhb_slimer on 2005/03/03 22:11:16 Clobber all memory for atomic ops with an acquire barrier. Suggested by: alc Affected files ... .. //depot/projects/smpng/sys/sparc64/include/atomic.h#7 edit Differences ... ==== //depot/projects/smpng/sys/sparc64/include/atomic.h#7 (text+ko) ==== @@ -90,6 +90,7 @@ itype(sz) v; \ v = atomic_cas(p, e, s, sz); \ membar(LoadLoad | LoadStore); \ + __asm __volatile("" : : : "memory"); \ v; \ }) @@ -115,6 +116,7 @@ itype(sz) t; \ t = atomic_op(p, op, v, sz); \ membar(LoadLoad | LoadStore); \ + __asm __volatile("" : : : "memory"); \ t; \ }) @@ -132,6 +134,7 @@ itype(sz) v; \ v = atomic_load(p, sz); \ membar(LoadLoad | LoadStore); \ + __asm __volatile("" : : : "memory"); \ v; \ }) From owner-p4-projects@FreeBSD.ORG Thu Mar 3 22:15:21 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6481416A4F4; Thu, 3 Mar 2005 22:15:20 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1579B16A4EC for ; Thu, 3 Mar 2005 22:15:20 +0000 (GMT) Received: from mail28.sea5.speakeasy.net (mail28.sea5.speakeasy.net [69.17.117.30]) by mx1.FreeBSD.org (Postfix) with ESMTP id C266843D58 for ; Thu, 3 Mar 2005 22:15:19 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: (qmail 24151 invoked from network); 3 Mar 2005 22:15:19 -0000 Received: from server.baldwin.cx ([216.27.160.63]) (envelope-sender )AES256-SHA encrypted SMTP for ; 3 Mar 2005 22:15:19 -0000 Received: from [10.50.40.202] (gw1.twc.weather.com [216.133.140.1]) (authenticated bits=0) by server.baldwin.cx (8.13.1/8.13.1) with ESMTP id j23MEqDx092866; Thu, 3 Mar 2005 17:15:13 -0500 (EST) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: Alan Cox Date: Thu, 3 Mar 2005 16:52:47 -0500 User-Agent: KMail/1.6.2 References: <200503032104.j23L4Pjw010114@repoman.freebsd.org> <20050303212558.GA16936@cs.rice.edu> In-Reply-To: <20050303212558.GA16936@cs.rice.edu> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200503031652.47596.jhb@FreeBSD.org> X-Spam-Status: No, score=-102.8 required=4.2 tests=ALL_TRUSTED, USER_IN_WHITELIST autolearn=failed version=3.0.2 X-Spam-Checker-Version: SpamAssassin 3.0.2 (2004-11-16) on server.baldwin.cx cc: Perforce Change Reviews Subject: Re: PERFORCE change 72450 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Mar 2005 22:15:21 -0000 On Thursday 03 March 2005 04:25 pm, Alan Cox wrote: > On Thu, Mar 03, 2005 at 09:04:25PM +0000, John Baldwin wrote: > > http://perforce.freebsd.org/chv.cgi?CH=72450 > > > > Change 72450 by jhb@jhb_slimer on 2005/03/03 21:03:35 > > > > Clobber memory for cas{x,}a() inlines. > > > > Suggested by: alc > > > > Affected files ... > > > > .. //depot/projects/smpng/sys/sparc64/include/cpufunc.h#20 edit > > > > Differences ... > > > > ==== //depot/projects/smpng/sys/sparc64/include/cpufunc.h#20 (text+ko) > > ==== > > > > @@ -63,14 +63,14 @@ > > #define casa(rs1, rs2, rd, asi) ({ \ > > u_int __rd = (uint32_t)(rd); \ > > __asm __volatile("casa [%1] %2, %3, %0" \ > > - : "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2)); \ > > + : "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2) : "memory");\ > > __rd; \ > > }) > > > > #define casxa(rs1, rs2, rd, asi) ({ \ > > u_long __rd = (uint64_t)(rd); \ > > __asm __volatile("casxa [%1] %2, %3, %0" \ > > - : "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2)); \ > > + : "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2) : "memory");\ > > __rd; \ > > }) > > The other, arguably "more correct", option is to declare the memory > location referenced by rs1 as an input and output operand, like so > from i386: (I say "more correct" because the true operand here is the > memory location referenced by rs1 not rs1 the register.) Ah, yes, I can try that. > static __inline pt_entry_t > pte_load_store(pt_entry_t *ptep, pt_entry_t pte) > { > pt_entry_t r; > > __asm __volatile( > "xchgl %0,%1" > > : "=m" (*ptep), > > "=r" (r) > > : "1" (pte), > > "m" (*ptep)); > return (r); > } > > (Note: this example does not use "+m" as an output constraint because > Tor convinced me a few months ago that the gcc docs prohibit that: "+" > is only to be used with registers.) Hmm, this is what gcc info page says: `+' Means that this operand is both read and written by the instruction. When the compiler fixes up the operands to satisfy the constraints, it needs to know which operands are inputs to the instruction and which are outputs from it. `=' identifies an output; `+' identifies an operand that is both input and output; all other operands are assumed to be input only. If you specify `=' or `+' in a constraint, you put it in the first character of the constraint string. It does say that '&' can't be used with a memory address it seems: `&' Means (in a particular alternative) that this operand is an "earlyclobber" operand, which is modified before the instruction is finished using the input operands. Therefore, this operand may not lie in a register that is used as an input operand or as part of any memory address. This is important to sort out as the i386 atomic ops use '+m' rather extensively. > Returning to the sparc, I'm not sure what the right constraint is for > cas{x,}a's rs1. I don't believe that "m" is appropriate because this > particular instruction doesn't allow the destination to be a register > plus an constant offset. Perhaps, "V"? > > That said, we should add a "memory" clobber to the sparc64 atomic ops > that include a memory barrier, particularly, the acquires. Agreed. > Regards, > Alan -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Fri Mar 4 20:50:47 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4BE816A4D1; Fri, 4 Mar 2005 20:50:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 877EB16A4CE for ; Fri, 4 Mar 2005 20:50:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E46343D39 for ; Fri, 4 Mar 2005 20:50:46 +0000 (GMT) (envelope-from kelly@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j24KokVu009905 for ; Fri, 4 Mar 2005 20:50:46 GMT (envelope-from kelly@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j24KojEc009902 for perforce@freebsd.org; Fri, 4 Mar 2005 20:50:45 GMT (envelope-from kelly@FreeBSD.org) Date: Fri, 4 Mar 2005 20:50:45 GMT Message-Id: <200503042050.j24KojEc009902@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kelly@FreeBSD.org using -f From: Kelly Djahandari To: Perforce Change Reviews Subject: PERFORCE change 72504 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Mar 2005 20:50:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=72504 Change 72504 by kelly@kelly_riveroaks2.earthlink.net on 2005/03/04 20:49:57 Added capability to allow apache httpd to start on boot. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/apache.te#4 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/apache.te#4 (symlink) ==== From owner-p4-projects@FreeBSD.ORG Fri Mar 4 23:26:47 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A2EC716A4D1; Fri, 4 Mar 2005 23:26:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C9B516A4CF for ; Fri, 4 Mar 2005 23:26:46 +0000 (GMT) Received: from duchess.speedfactory.net (duchess.speedfactory.net [66.23.201.84]) by mx1.FreeBSD.org (Postfix) with SMTP id 5616F43D41 for ; Fri, 4 Mar 2005 23:26:45 +0000 (GMT) (envelope-from ups@tree.com) Received: (qmail 31166 invoked by uid 89); 4 Mar 2005 23:26:43 -0000 Received: from duchess.speedfactory.net (66.23.201.84) by duchess.speedfactory.net with SMTP; 4 Mar 2005 23:26:43 -0000 Received: (qmail 31151 invoked by uid 89); 4 Mar 2005 23:26:43 -0000 Received: from unknown (HELO ?66.23.216.52?) (66.23.216.52) by duchess.speedfactory.net with SMTP; 4 Mar 2005 23:26:43 -0000 From: Stephan Uphoff To: John Baldwin In-Reply-To: <200503031652.47596.jhb@FreeBSD.org> References: <200503032104.j23L4Pjw010114@repoman.freebsd.org> <200503031652.47596.jhb@FreeBSD.org> Content-Type: text/plain Message-Id: <1109978713.645.626.camel@beach> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.6 Date: Fri, 04 Mar 2005 18:25:16 -0500 Content-Transfer-Encoding: 7bit cc: Perforce Change Reviews cc: Alan Cox Subject: Re: PERFORCE change 72450 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Mar 2005 23:26:47 -0000 On Thu, 2005-03-03 at 16:52, John Baldwin wrote: > On Thursday 03 March 2005 04:25 pm, Alan Cox wrote: > > On Thu, Mar 03, 2005 at 09:04:25PM +0000, John Baldwin wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=72450 > > > > > > Change 72450 by jhb@jhb_slimer on 2005/03/03 21:03:35 > > > > > > Clobber memory for cas{x,}a() inlines. > > > > > > Suggested by: alc > > > > > > Affected files ... > > > > > > .. //depot/projects/smpng/sys/sparc64/include/cpufunc.h#20 edit > > > > > > Differences ... > > > > > > ==== //depot/projects/smpng/sys/sparc64/include/cpufunc.h#20 (text+ko) > > > ==== > > > > > > @@ -63,14 +63,14 @@ > > > #define casa(rs1, rs2, rd, asi) ({ \ > > > u_int __rd = (uint32_t)(rd); \ > > > __asm __volatile("casa [%1] %2, %3, %0" \ > > > - : "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2)); \ > > > + : "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2) : "memory");\ > > > __rd; \ > > > }) > > > > > > #define casxa(rs1, rs2, rd, asi) ({ \ > > > u_long __rd = (uint64_t)(rd); \ > > > __asm __volatile("casxa [%1] %2, %3, %0" \ > > > - : "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2)); \ > > > + : "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2) : "memory");\ > > > __rd; \ > > > }) > > > > The other, arguably "more correct", option is to declare the memory > > location referenced by rs1 as an input and output operand, like so > > from i386: (I say "more correct" because the true operand here is the > > memory location referenced by rs1 not rs1 the register.) > > Ah, yes, I can try that. > > > static __inline pt_entry_t > > pte_load_store(pt_entry_t *ptep, pt_entry_t pte) > > { > > pt_entry_t r; > > > > __asm __volatile( > > "xchgl %0,%1" > > > > : "=m" (*ptep), > > > > "=r" (r) > > > > : "1" (pte), > > > > "m" (*ptep)); > > return (r); > > } > > > > (Note: this example does not use "+m" as an output constraint because > > Tor convinced me a few months ago that the gcc docs prohibit that: "+" > > is only to be used with registers.) > > Hmm, this is what gcc info page says: > > `+' > Means that this operand is both read and written by the > instruction. > > When the compiler fixes up the operands to satisfy the constraints, > it needs to know which operands are inputs to the instruction and > which are outputs from it. `=' identifies an output; `+' > identifies an operand that is both input and output; all other > operands are assumed to be input only. > > If you specify `=' or `+' in a constraint, you put it in the first > character of the constraint string. > > It does say that '&' can't be used with a memory address it seems: > > `&' > Means (in a particular alternative) that this operand is an > "earlyclobber" operand, which is modified before the instruction is > finished using the input operands. Therefore, this operand may > not lie in a register that is used as an input operand or as part > of any memory address. > > This is important to sort out as the i386 atomic ops use '+m' rather > extensively. The linux code wraps the target of the atomic operations in structures to avoid aliasing problems. I really, really would like to know exactly why the developers thought that this is necessary. So far I have had no luck finding a reference. > > Returning to the sparc, I'm not sure what the right constraint is for > > cas{x,}a's rs1. I don't believe that "m" is appropriate because this > > particular instruction doesn't allow the destination to be a register > > plus an constant offset. Perhaps, "V"? > > > > That said, we should add a "memory" clobber to the sparc64 atomic ops > > that include a memory barrier, particularly, the acquires. > > Agreed. > > > Regards, > > Alan