From owner-p4-projects@FreeBSD.ORG Sun Jan 13 00:03:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D99016A41B; Sun, 13 Jan 2008 00:03:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D712516A419 for ; Sun, 13 Jan 2008 00:03:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 834F913C461 for ; Sun, 13 Jan 2008 00:03:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D032Mq053729 for ; Sun, 13 Jan 2008 00:03:02 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D032L3053611 for perforce@freebsd.org; Sun, 13 Jan 2008 00:03:02 GMT (envelope-from jb@freebsd.org) Date: Sun, 13 Jan 2008 00:03:02 GMT Message-Id: <200801130003.m0D032L3053611@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133144 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 00:03:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=133144 Change 133144 by jb@jb_freebsd1 on 2008/01/13 00:02:57 Build the DTrace runtime initialisation object which gets linked to the object generated by "dtrace -G". Affected files ... .. //depot/projects/dtrace/src/cddl/lib/Makefile#11 edit .. //depot/projects/dtrace/src/cddl/lib/drti/Makefile#1 add .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/drti.c#7 edit Differences ... ==== //depot/projects/dtrace/src/cddl/lib/Makefile#11 (text+ko) ==== @@ -2,7 +2,8 @@ .include -SUBDIR= libavl \ +SUBDIR= drti \ + libavl \ libctf \ libdtrace \ libnvpair \ ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/drti.c#7 (text) ==== @@ -85,7 +85,11 @@ va_end(ap); } +#if defined(sun) #pragma init(dtrace_dof_init) +#else +static void dtrace_dof_init(void) __attribute__ ((constructor)); +#endif static void dtrace_dof_init(void) @@ -97,8 +101,13 @@ Elf32_Ehdr *elf; #endif dof_helper_t dh; +#if defined(sun) Link_map *lmp; Lmid_t lmid; +#else + struct link_map *lmp; + u_long lmid = 0; +#endif int fd; const char *p; @@ -110,10 +119,12 @@ return; } +#if defined(sun) if (dlinfo(RTLD_SELF, RTLD_DI_LMID, &lmid) == -1) { dprintf(1, "couldn't discover link map ID\n"); return; } +#endif if ((modname = strrchr(lmp->l_name, '/')) == NULL) modname = lmp->l_name; @@ -131,7 +142,7 @@ elf = (void *)lmp->l_addr; dh.dofhp_dof = (uintptr_t)dof; - dh.dofhp_addr = elf->e_type == ET_DYN ? lmp->l_addr : 0; + dh.dofhp_addr = elf->e_type == ET_DYN ? (uintptr_t) lmp->l_addr : 0; if (lmid == 0) { (void) snprintf(dh.dofhp_mod, sizeof (dh.dofhp_mod), @@ -170,7 +181,12 @@ (void) close(fd); } +#if defined(sun) #pragma fini(dtrace_dof_fini) +#else +static void dtrace_dof_fini(void) __attribute__ ((destructor)); +#endif + static void dtrace_dof_fini(void) { From owner-p4-projects@FreeBSD.ORG Sun Jan 13 00:39:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39EAB16A41B; Sun, 13 Jan 2008 00:39:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF96316A417 for ; Sun, 13 Jan 2008 00:39:40 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CCF1A13C461 for ; Sun, 13 Jan 2008 00:39:40 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D0de8X059327 for ; Sun, 13 Jan 2008 00:39:40 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D0dem3059324 for perforce@freebsd.org; Sun, 13 Jan 2008 00:39:40 GMT (envelope-from jb@freebsd.org) Date: Sun, 13 Jan 2008 00:39:40 GMT Message-Id: <200801130039.m0D0dem3059324@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133145 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 00:39:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=133145 Change 133145 by jb@jb_freebsd1 on 2008/01/13 00:39:15 We need /usr/lib32/dtrace to to put the 32-bit DTrace runtime initialisation object in. Install the 32-bit CDDL libs too. Affected files ... .. //depot/projects/dtrace/src/Makefile.inc1#35 edit Differences ... ==== //depot/projects/dtrace/src/Makefile.inc1#35 (text+ko) ==== @@ -482,10 +482,15 @@ distribute32 install32: .if make(distribute32) mkdir -p ${DISTDIR}/${DISTRIBUTION}/usr/lib32 # XXX add to mtree + mkdir -p ${DISTDIR}/${DISTRIBUTION}/usr/lib32/dtrace # XXX add to mtree .else mkdir -p ${DESTDIR}/usr/lib32 # XXX add to mtree + mkdir -p ${DESTDIR}/usr/lib32/dtrace # XXX add to mtree .endif cd ${.CURDIR}/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} +.if ${MK_CDDL} != "no" + cd ${.CURDIR}/cddl/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} +.endif cd ${.CURDIR}/gnu/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} .if ${MK_CRYPT} != "no" cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} From owner-p4-projects@FreeBSD.ORG Sun Jan 13 00:44:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 820E916A41B; Sun, 13 Jan 2008 00:44:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 47BAB16A417 for ; Sun, 13 Jan 2008 00:44:46 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1D69D13C44B for ; Sun, 13 Jan 2008 00:44:46 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D0ikOM060633 for ; Sun, 13 Jan 2008 00:44:46 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D0ijXj060630 for perforce@freebsd.org; Sun, 13 Jan 2008 00:44:45 GMT (envelope-from jb@freebsd.org) Date: Sun, 13 Jan 2008 00:44:45 GMT Message-Id: <200801130044.m0D0ijXj060630@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133147 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 00:44:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=133147 Change 133147 by jb@jb_freebsd1 on 2008/01/13 00:44:25 Change the shell for FreeBSD. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#5 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#5 (text+kox) ==== @@ -44,7 +44,7 @@ $dtrace_path = '/usr/sbin/dtrace'; @dtrace_argv = (); -$ksh_path = '/usr/bin/ksh'; +$ksh_path = '/bin/sh'; @files = (); %exceptions = (); From owner-p4-projects@FreeBSD.ORG Sun Jan 13 02:39:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5524E16A41B; Sun, 13 Jan 2008 02:39:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0291316A417 for ; Sun, 13 Jan 2008 02:39:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E567D13C458 for ; Sun, 13 Jan 2008 02:39:44 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D2dioR092584 for ; Sun, 13 Jan 2008 02:39:44 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D2diSc092575 for perforce@freebsd.org; Sun, 13 Jan 2008 02:39:44 GMT (envelope-from jb@freebsd.org) Date: Sun, 13 Jan 2008 02:39:44 GMT Message-Id: <200801130239.m0D2diSc092575@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133150 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 02:39:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=133150 Change 133150 by jb@jb_freebsd1 on 2008/01/13 02:39:23 Add in the tests that are coded as shell scripts. 648 tests pass now. Only 417 to go. Only! Affected files ... .. //depot/projects/dtrace/src/tools/test/dtrace/Makefile#10 edit Differences ... ==== //depot/projects/dtrace/src/tools/test/dtrace/Makefile#10 (text+ko) ==== @@ -4,270 +4,303 @@ DTEST= ${TESTSRCDIR}/cmd/scripts/dtest.pl IGNORE= \ - ${TESTSRCDIR}/tst/common/aggs/err.D_KEY_TYPE.badkey4.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.allquant.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.avg.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.clear.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.clearavg.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.clearavg2.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.cleardenormalize.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.clearlquantize.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.clearnormalize.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.count.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.count2.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.denormalize.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.denormalizeonly.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.fmtnormalize.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.forms.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.keysort.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.lquantize.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.lquantnormal.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.lquantrange.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.lquantround.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.lquantzero.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.max.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.min.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.multiaggs2.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.multiaggs3.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.multinormalize.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.neglquant.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.negorder.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.negquant.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.negtrunc.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.negtruncquant.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.normalize.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.order.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.quantize.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.quantmany.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.quantround.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.quantzero.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.signedkeys.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.signedkeyspos.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.subr.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.sum.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.trunc.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.trunc0.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.truncquant.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.valsortkeypos.d \ - ${TESTSRCDIR}/tst/common/arrays/tst.uregsarray.d \ - ${TESTSRCDIR}/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d \ - ${TESTSRCDIR}/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d \ - ${TESTSRCDIR}/tst/common/assocs/tst.orthogonality.d \ - ${TESTSRCDIR}/tst/common/buffering/err.end.d \ - ${TESTSRCDIR}/tst/common/buffering/err.resize1.d \ - ${TESTSRCDIR}/tst/common/buffering/err.resize2.d \ - ${TESTSRCDIR}/tst/common/buffering/err.resize3.d \ - ${TESTSRCDIR}/tst/common/buffering/err.zerobuf.d \ - ${TESTSRCDIR}/tst/common/buffering/tst.alignring.d \ - ${TESTSRCDIR}/tst/common/buffering/tst.dynvarsize.d \ - ${TESTSRCDIR}/tst/common/buffering/tst.fill1.d \ - ${TESTSRCDIR}/tst/common/buffering/tst.resize1.d \ - ${TESTSRCDIR}/tst/common/buffering/tst.resize2.d \ - ${TESTSRCDIR}/tst/common/buffering/tst.resize3.d \ - ${TESTSRCDIR}/tst/common/buffering/tst.ring1.d \ - ${TESTSRCDIR}/tst/common/buffering/tst.ring2.d \ - ${TESTSRCDIR}/tst/common/buffering/tst.ring3.d \ - ${TESTSRCDIR}/tst/common/buffering/tst.smallring.d \ - ${TESTSRCDIR}/tst/common/buffering/tst.switch1.d \ + ${TESTSRCDIR}/tst/common/aggs/err.D_KEY_TYPE.badkey4.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.allquant.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.avg.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.clear.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.clearavg.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.clearavg2.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.cleardenormalize.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.clearlquantize.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.clearnormalize.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.count.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.count2.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.denormalize.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.denormalizeonly.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.fmtnormalize.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.forms.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.keysort.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.lquantize.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.lquantnormal.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.lquantrange.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.lquantround.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.lquantzero.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.max.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.min.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.multiaggs2.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.multiaggs3.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.multinormalize.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.neglquant.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.negorder.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.negquant.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.negtrunc.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.negtruncquant.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.normalize.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.order.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.quantize.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.quantmany.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.quantround.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.quantzero.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.signedkeys.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.signedkeyspos.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.subr.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.sum.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.trunc.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.trunc0.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.truncquant.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.valsortkeypos.d \ + ${TESTSRCDIR}/tst/common/arrays/tst.uregsarray.d \ + ${TESTSRCDIR}/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d \ + ${TESTSRCDIR}/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d \ + ${TESTSRCDIR}/tst/common/assocs/tst.orthogonality.d \ + ${TESTSRCDIR}/tst/common/buffering/err.end.d \ + ${TESTSRCDIR}/tst/common/buffering/err.resize1.d \ + ${TESTSRCDIR}/tst/common/buffering/err.resize2.d \ + ${TESTSRCDIR}/tst/common/buffering/err.resize3.d \ + ${TESTSRCDIR}/tst/common/buffering/err.zerobuf.d \ + ${TESTSRCDIR}/tst/common/buffering/tst.alignring.d \ + ${TESTSRCDIR}/tst/common/buffering/tst.cputime.ksh \ + ${TESTSRCDIR}/tst/common/buffering/tst.dynvarsize.d \ + ${TESTSRCDIR}/tst/common/buffering/tst.fill1.d \ + ${TESTSRCDIR}/tst/common/buffering/tst.resize1.d \ + ${TESTSRCDIR}/tst/common/buffering/tst.resize2.d \ + ${TESTSRCDIR}/tst/common/buffering/tst.resize3.d \ + ${TESTSRCDIR}/tst/common/buffering/tst.ring1.d \ + ${TESTSRCDIR}/tst/common/buffering/tst.ring2.d \ + ${TESTSRCDIR}/tst/common/buffering/tst.ring3.d \ + ${TESTSRCDIR}/tst/common/buffering/tst.smallring.d \ + ${TESTSRCDIR}/tst/common/buffering/tst.switch1.d \ ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d \ - ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d \ + ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d \ ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d \ - ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d \ - ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.hpriority.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.lwpsinfo.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.lwpsinfo1.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.psinfo.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.psinfo1.d \ - ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d \ - ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_DBLERROR.d \ - ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d \ - ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d \ - ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d \ - ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_SPEC.d \ - ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d \ - ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d \ + ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d \ + ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.arg0clause.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.arg1to8clause.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.hpriority.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.lwpsinfo.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.lwpsinfo1.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.psinfo.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.psinfo1.d \ + ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d \ + ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_DBLERROR.d \ + ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d \ + ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d \ + ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d \ + ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_SPEC.d \ + ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d \ + ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d \ ${TESTSRCDIR}/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.motoofew.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.motoomany.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d \ - ${TESTSRCDIR}/tst/common/funcs/err.inet_ntoa6badaddr.d \ - ${TESTSRCDIR}/tst/common/funcs/err.inet_ntoabadaddr.d \ - ${TESTSRCDIR}/tst/common/funcs/err.inet_ntopbadaddr.d \ - ${TESTSRCDIR}/tst/common/funcs/err.inet_ntopbadarg.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.bcopy.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.copyin.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.copyinto.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.ddi_pathname.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.hton.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.inet_ntoa.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.inet_ntoa6.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.inet_ntop.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.mutex_owned.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.mutex_owner.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.mutex_type_adaptive.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.progenyof.d \ - ${TESTSRCDIR}/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d \ - ${TESTSRCDIR}/tst/common/inline/tst.InlineDataAssign.d \ - ${TESTSRCDIR}/tst/common/inline/tst.InlineExpression.d \ - ${TESTSRCDIR}/tst/common/inline/tst.InlineTypedef.d \ - ${TESTSRCDIR}/tst/common/io/tst.fds.d \ - ${TESTSRCDIR}/tst/common/java_api/manifest/test.jar-manifest \ - ${TESTSRCDIR}/tst/common/java_api/src/TestAbort.java \ - ${TESTSRCDIR}/tst/common/java_api/src/TestBean.java \ - ${TESTSRCDIR}/tst/common/java_api/src/TestClose.java \ - ${TESTSRCDIR}/tst/common/java_api/src/TestDrop.java \ - ${TESTSRCDIR}/tst/common/java_api/src/TestEnable.java \ - ${TESTSRCDIR}/tst/common/java_api/src/TestFunctionLookup.java \ - ${TESTSRCDIR}/tst/common/java_api/src/TestMaxConsumers.java \ - ${TESTSRCDIR}/tst/common/java_api/src/TestMultiAggPrinta.java \ - ${TESTSRCDIR}/tst/common/java_api/src/TestProbeData.java \ - ${TESTSRCDIR}/tst/common/java_api/src/TestProbeDescription.java \ - ${TESTSRCDIR}/tst/common/java_api/src/TestStateMachine.java \ - ${TESTSRCDIR}/tst/common/java_api/src/TestStopLock.java \ - ${TESTSRCDIR}/tst/common/java_api/tst.printa.d \ - ${TESTSRCDIR}/tst/common/lexer/err.D_CHR_NL.char.d \ - ${TESTSRCDIR}/tst/common/lexer/err.D_STR_NL.string.d \ - ${TESTSRCDIR}/tst/common/misc/tst.dynopt.d \ - ${TESTSRCDIR}/tst/common/misc/tst.roch.d \ - ${TESTSRCDIR}/tst/common/multiaggs/tst.many.d \ - ${TESTSRCDIR}/tst/common/multiaggs/tst.same.d \ - ${TESTSRCDIR}/tst/common/multiaggs/tst.sort.d \ - ${TESTSRCDIR}/tst/common/multiaggs/tst.sortpos.d \ - ${TESTSRCDIR}/tst/common/multiaggs/tst.tuplecompat.d \ - ${TESTSRCDIR}/tst/common/multiaggs/tst.zero.d \ - ${TESTSRCDIR}/tst/common/multiaggs/tst.zero2.d \ + ${TESTSRCDIR}/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh \ + ${TESTSRCDIR}/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh \ + ${TESTSRCDIR}/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh \ + ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d \ + ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.motoofew.d \ + ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.motoomany.d \ + ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d \ + ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d \ + ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d \ + ${TESTSRCDIR}/tst/common/funcs/err.inet_ntoa6badaddr.d \ + ${TESTSRCDIR}/tst/common/funcs/err.inet_ntoabadaddr.d \ + ${TESTSRCDIR}/tst/common/funcs/err.inet_ntopbadaddr.d \ + ${TESTSRCDIR}/tst/common/funcs/err.inet_ntopbadarg.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.bcopy.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.chill.ksh \ + ${TESTSRCDIR}/tst/common/funcs/tst.copyin.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.copyinto.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.ddi_pathname.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.hton.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.inet_ntoa.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.inet_ntoa6.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.inet_ntop.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.mutex_owned.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.mutex_owner.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.mutex_type_adaptive.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.progenyof.d \ + ${TESTSRCDIR}/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d \ + ${TESTSRCDIR}/tst/common/inline/tst.InlineDataAssign.d \ + ${TESTSRCDIR}/tst/common/inline/tst.InlineExpression.d \ + ${TESTSRCDIR}/tst/common/inline/tst.InlineTypedef.d \ + ${TESTSRCDIR}/tst/common/io/tst.fds.d \ + ${TESTSRCDIR}/tst/common/java_api/tst.Abort.ksh \ + ${TESTSRCDIR}/tst/common/java_api/tst.Bean.ksh \ + ${TESTSRCDIR}/tst/common/java_api/tst.Close.ksh \ + ${TESTSRCDIR}/tst/common/java_api/tst.Drop.ksh \ + ${TESTSRCDIR}/tst/common/java_api/tst.Enable.ksh \ + ${TESTSRCDIR}/tst/common/java_api/tst.FunctionLookup.ksh \ + ${TESTSRCDIR}/tst/common/java_api/tst.MaxConsumers.ksh \ + ${TESTSRCDIR}/tst/common/java_api/tst.MultiAggPrinta.ksh \ + ${TESTSRCDIR}/tst/common/java_api/tst.ProbeData.ksh \ + ${TESTSRCDIR}/tst/common/java_api/tst.ProbeDescription.ksh \ + ${TESTSRCDIR}/tst/common/java_api/tst.StateMachine.ksh \ + ${TESTSRCDIR}/tst/common/java_api/tst.StopLock.ksh \ + ${TESTSRCDIR}/tst/common/java_api/tst.printa.d \ + ${TESTSRCDIR}/tst/common/lexer/err.D_CHR_NL.char.d \ + ${TESTSRCDIR}/tst/common/lexer/err.D_STR_NL.string.d \ + ${TESTSRCDIR}/tst/common/mdb/tst.dtracedcmd.ksh \ + ${TESTSRCDIR}/tst/common/mib/tst.icmp.ksh \ + ${TESTSRCDIR}/tst/common/mib/tst.tcp.ksh \ + ${TESTSRCDIR}/tst/common/mib/tst.udp.ksh \ + ${TESTSRCDIR}/tst/common/misc/tst.dynopt.d \ + ${TESTSRCDIR}/tst/common/misc/tst.include.ksh \ + ${TESTSRCDIR}/tst/common/misc/tst.roch.d \ + ${TESTSRCDIR}/tst/common/misc/tst.schrock.ksh \ + ${TESTSRCDIR}/tst/common/multiaggs/tst.many.d \ + ${TESTSRCDIR}/tst/common/multiaggs/tst.same.d \ + ${TESTSRCDIR}/tst/common/multiaggs/tst.sort.d \ + ${TESTSRCDIR}/tst/common/multiaggs/tst.sortpos.d \ + ${TESTSRCDIR}/tst/common/multiaggs/tst.tuplecompat.d \ + ${TESTSRCDIR}/tst/common/multiaggs/tst.zero.d \ + ${TESTSRCDIR}/tst/common/multiaggs/tst.zero2.d \ ${TESTSRCDIR}/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d \ - ${TESTSRCDIR}/tst/common/pid/err.D_PDESC_ZERO.badlib.d \ - ${TESTSRCDIR}/tst/common/pid/err.D_PDESC_ZERO.badlib.exe \ - ${TESTSRCDIR}/tst/common/pid/err.D_PDESC_ZERO.badproc1.d \ - ${TESTSRCDIR}/tst/common/pid/err.D_PROC_BADPID.badproc2.d \ - ${TESTSRCDIR}/tst/common/pid/err.D_PROC_CREATEFAIL.many.d \ - ${TESTSRCDIR}/tst/common/pid/err.D_PROC_CREATEFAIL.many.exe \ - ${TESTSRCDIR}/tst/common/pid/err.D_PROC_FUNC.badfunc.d \ - ${TESTSRCDIR}/tst/common/pid/err.D_PROC_FUNC.badfunc.exe \ - ${TESTSRCDIR}/tst/common/pid/err.D_PROC_LIB.libdash.d \ - ${TESTSRCDIR}/tst/common/pid/err.D_PROC_LIB.libdash.exe \ - ${TESTSRCDIR}/tst/common/pid/err.D_PROC_NAME.alldash.d \ - ${TESTSRCDIR}/tst/common/pid/err.D_PROC_NAME.alldash.exe \ - ${TESTSRCDIR}/tst/common/pid/err.D_PROC_NAME.badname.d \ - ${TESTSRCDIR}/tst/common/pid/err.D_PROC_NAME.badname.exe \ - ${TESTSRCDIR}/tst/common/pid/err.D_PROC_NAME.globdash.d \ - ${TESTSRCDIR}/tst/common/pid/err.D_PROC_NAME.globdash.exe \ - ${TESTSRCDIR}/tst/common/pid/err.D_PROC_OFF.toobig.d \ - ${TESTSRCDIR}/tst/common/pid/err.D_PROC_OFF.toobig.exe \ - ${TESTSRCDIR}/tst/common/pid/tst.args1.d \ - ${TESTSRCDIR}/tst/common/pid/tst.coverage.d \ - ${TESTSRCDIR}/tst/common/pid/tst.coverage.exe \ - ${TESTSRCDIR}/tst/common/pid/tst.emptystack.d \ - ${TESTSRCDIR}/tst/common/pid/tst.emptystack.exe \ - ${TESTSRCDIR}/tst/common/pid/tst.float.d \ - ${TESTSRCDIR}/tst/common/pid/tst.fork.d \ - ${TESTSRCDIR}/tst/common/pid/tst.gcc.d \ - ${TESTSRCDIR}/tst/common/pid/tst.ret1.d \ - ${TESTSRCDIR}/tst/common/pid/tst.ret2.d \ - ${TESTSRCDIR}/tst/common/pid/tst.vfork.d \ - ${TESTSRCDIR}/tst/common/pid/tst.weak1.d \ - ${TESTSRCDIR}/tst/common/pid/tst.weak2.d \ - ${TESTSRCDIR}/tst/common/plockstat/tst.available.d \ - ${TESTSRCDIR}/tst/common/plockstat/tst.available.exe \ - ${TESTSRCDIR}/tst/common/plockstat/tst.libmap.d \ - ${TESTSRCDIR}/tst/common/plockstat/tst.libmap.exe \ - ${TESTSRCDIR}/tst/common/pointers/err.D_OP_LVAL.AddressChange.d \ - ${TESTSRCDIR}/tst/common/pointers/tst.GlobalVar.d \ - ${TESTSRCDIR}/tst/common/pointers/tst.basic1.d \ - ${TESTSRCDIR}/tst/common/pointers/tst.basic2.d \ - ${TESTSRCDIR}/tst/common/predicates/tst.argsnotcached.d \ - ${TESTSRCDIR}/tst/common/printa/tst.basics.d \ - ${TESTSRCDIR}/tst/common/printa/tst.def.d \ - ${TESTSRCDIR}/tst/common/printa/tst.dynwidth.d \ - ${TESTSRCDIR}/tst/common/printa/tst.fmt.d \ - ${TESTSRCDIR}/tst/common/printa/tst.many.d \ - ${TESTSRCDIR}/tst/common/printa/tst.manyval.d \ - ${TESTSRCDIR}/tst/common/printa/tst.stack.d \ - ${TESTSRCDIR}/tst/common/printa/tst.tuple.d \ - ${TESTSRCDIR}/tst/common/printf/tst.basics.d \ - ${TESTSRCDIR}/tst/common/printf/tst.str.d \ - ${TESTSRCDIR}/tst/common/printf/tst.sym.d \ - ${TESTSRCDIR}/tst/common/proc/tst.sigwait.d \ - ${TESTSRCDIR}/tst/common/raise/tst.raise1.d \ - ${TESTSRCDIR}/tst/common/raise/tst.raise2.d \ - ${TESTSRCDIR}/tst/common/raise/tst.raise3.d \ - ${TESTSRCDIR}/tst/common/rates/tst.aggrate.d \ - ${TESTSRCDIR}/tst/common/rates/tst.statusrate.d \ - ${TESTSRCDIR}/tst/common/rates/tst.switchrate.d \ - ${TESTSRCDIR}/tst/common/safety/tst.basename.d \ - ${TESTSRCDIR}/tst/common/safety/tst.caller.d \ - ${TESTSRCDIR}/tst/common/safety/tst.cleanpath.d \ - ${TESTSRCDIR}/tst/common/safety/tst.copyin.d \ - ${TESTSRCDIR}/tst/common/safety/tst.copyin2.d \ - ${TESTSRCDIR}/tst/common/safety/tst.ddi_pathname.d \ - ${TESTSRCDIR}/tst/common/safety/tst.dirname.d \ - ${TESTSRCDIR}/tst/common/safety/tst.errno.d \ - ${TESTSRCDIR}/tst/common/safety/tst.execname.d \ - ${TESTSRCDIR}/tst/common/safety/tst.gid.d \ - ${TESTSRCDIR}/tst/common/safety/tst.hton.d \ - ${TESTSRCDIR}/tst/common/safety/tst.index.d \ - ${TESTSRCDIR}/tst/common/safety/tst.msgdsize.d \ - ${TESTSRCDIR}/tst/common/safety/tst.msgsize.d \ - ${TESTSRCDIR}/tst/common/safety/tst.null.d \ - ${TESTSRCDIR}/tst/common/safety/tst.pid.d \ - ${TESTSRCDIR}/tst/common/safety/tst.ppid.d \ - ${TESTSRCDIR}/tst/common/safety/tst.progenyof.d \ - ${TESTSRCDIR}/tst/common/safety/tst.random.d \ - ${TESTSRCDIR}/tst/common/safety/tst.rw.d \ - ${TESTSRCDIR}/tst/common/safety/tst.shortstr.d \ - ${TESTSRCDIR}/tst/common/safety/tst.stack.d \ - ${TESTSRCDIR}/tst/common/safety/tst.stackdepth.d \ - ${TESTSRCDIR}/tst/common/safety/tst.strchr.d \ - ${TESTSRCDIR}/tst/common/safety/tst.strjoin.d \ - ${TESTSRCDIR}/tst/common/safety/tst.strstr.d \ - ${TESTSRCDIR}/tst/common/safety/tst.strtok.d \ - ${TESTSRCDIR}/tst/common/safety/tst.substr.d \ - ${TESTSRCDIR}/tst/common/safety/tst.ucaller.d \ - ${TESTSRCDIR}/tst/common/safety/tst.uid.d \ - ${TESTSRCDIR}/tst/common/safety/tst.unalign.d \ - ${TESTSRCDIR}/tst/common/safety/tst.uregs.d \ - ${TESTSRCDIR}/tst/common/safety/tst.ustack.d \ - ${TESTSRCDIR}/tst/common/safety/tst.ustackdepth.d \ - ${TESTSRCDIR}/tst/common/safety/tst.vahole.d \ - ${TESTSRCDIR}/tst/common/safety/tst.zonename.d \ - ${TESTSRCDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupgtype.d \ - ${TESTSRCDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupltype.d \ - ${TESTSRCDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupttype.d \ - ${TESTSRCDIR}/tst/common/scalars/tst.misc.d \ - ${TESTSRCDIR}/tst/common/scalars/tst.selfarray2.d \ - ${TESTSRCDIR}/tst/common/sched/tst.enqueue.d \ - ${TESTSRCDIR}/tst/common/sched/tst.oncpu.d \ - ${TESTSRCDIR}/tst/common/sched/tst.stackdepth.d \ + ${TESTSRCDIR}/tst/common/pid/err.D_PDESC_ZERO.badlib.d \ + ${TESTSRCDIR}/tst/common/pid/err.D_PDESC_ZERO.badproc1.d \ + ${TESTSRCDIR}/tst/common/pid/err.D_PROC_BADPID.badproc2.d \ + ${TESTSRCDIR}/tst/common/pid/err.D_PROC_CREATEFAIL.many.d \ + ${TESTSRCDIR}/tst/common/pid/err.D_PROC_FUNC.badfunc.d \ + ${TESTSRCDIR}/tst/common/pid/err.D_PROC_LIB.libdash.d \ + ${TESTSRCDIR}/tst/common/pid/err.D_PROC_NAME.alldash.d \ + ${TESTSRCDIR}/tst/common/pid/err.D_PROC_NAME.badname.d \ + ${TESTSRCDIR}/tst/common/pid/err.D_PROC_NAME.globdash.d \ + ${TESTSRCDIR}/tst/common/pid/err.D_PROC_OFF.toobig.d \ + ${TESTSRCDIR}/tst/common/pid/tst.addprobes.ksh \ + ${TESTSRCDIR}/tst/common/pid/tst.args1.d \ + ${TESTSRCDIR}/tst/common/pid/tst.coverage.d \ + ${TESTSRCDIR}/tst/common/pid/tst.emptystack.d \ + ${TESTSRCDIR}/tst/common/pid/tst.float.d \ + ${TESTSRCDIR}/tst/common/pid/tst.fork.d \ + ${TESTSRCDIR}/tst/common/pid/tst.gcc.d \ + ${TESTSRCDIR}/tst/common/pid/tst.main.ksh \ + ${TESTSRCDIR}/tst/common/pid/tst.manypids.ksh \ + ${TESTSRCDIR}/tst/common/pid/tst.probemod.ksh \ + ${TESTSRCDIR}/tst/common/pid/tst.ret1.d \ + ${TESTSRCDIR}/tst/common/pid/tst.ret2.d \ + ${TESTSRCDIR}/tst/common/pid/tst.vfork.d \ + ${TESTSRCDIR}/tst/common/pid/tst.weak1.d \ + ${TESTSRCDIR}/tst/common/pid/tst.weak2.d \ + ${TESTSRCDIR}/tst/common/plockstat/tst.available.d \ + ${TESTSRCDIR}/tst/common/plockstat/tst.libmap.d \ + ${TESTSRCDIR}/tst/common/pointers/err.D_OP_LVAL.AddressChange.d \ + ${TESTSRCDIR}/tst/common/pointers/tst.GlobalVar.d \ + ${TESTSRCDIR}/tst/common/pointers/tst.basic1.d \ + ${TESTSRCDIR}/tst/common/pointers/tst.basic2.d \ + ${TESTSRCDIR}/tst/common/predicates/tst.argsnotcached.d \ + ${TESTSRCDIR}/tst/common/predicates/tst.predcache.ksh \ + ${TESTSRCDIR}/tst/common/printa/tst.basics.d \ + ${TESTSRCDIR}/tst/common/printa/tst.def.d \ + ${TESTSRCDIR}/tst/common/printa/tst.dynwidth.d \ + ${TESTSRCDIR}/tst/common/printa/tst.fmt.d \ + ${TESTSRCDIR}/tst/common/printa/tst.many.d \ + ${TESTSRCDIR}/tst/common/printa/tst.manyval.d \ + ${TESTSRCDIR}/tst/common/printa/tst.stack.d \ + ${TESTSRCDIR}/tst/common/printa/tst.tuple.d \ + ${TESTSRCDIR}/tst/common/printa/tst.walltimestamp.ksh \ + ${TESTSRCDIR}/tst/common/printf/tst.basics.d \ + ${TESTSRCDIR}/tst/common/printf/tst.printT.ksh \ + ${TESTSRCDIR}/tst/common/printf/tst.printY.ksh \ + ${TESTSRCDIR}/tst/common/printf/tst.str.d \ + ${TESTSRCDIR}/tst/common/printf/tst.sym.d \ + ${TESTSRCDIR}/tst/common/privs/tst.func_access.ksh \ + ${TESTSRCDIR}/tst/common/privs/tst.op_access.ksh \ + ${TESTSRCDIR}/tst/common/proc/tst.create.ksh \ + ${TESTSRCDIR}/tst/common/proc/tst.discard.ksh \ + ${TESTSRCDIR}/tst/common/proc/tst.exec.ksh \ + ${TESTSRCDIR}/tst/common/proc/tst.execfail.ENOENT.ksh \ + ${TESTSRCDIR}/tst/common/proc/tst.execfail.ksh \ + ${TESTSRCDIR}/tst/common/proc/tst.exitcore.ksh \ + ${TESTSRCDIR}/tst/common/proc/tst.exitexit.ksh \ + ${TESTSRCDIR}/tst/common/proc/tst.exitkilled.ksh \ + ${TESTSRCDIR}/tst/common/proc/tst.signal.ksh \ + ${TESTSRCDIR}/tst/common/proc/tst.sigwait.d \ + ${TESTSRCDIR}/tst/common/proc/tst.startexit.ksh \ + ${TESTSRCDIR}/tst/common/profile-n/tst.func.ksh \ + ${TESTSRCDIR}/tst/common/profile-n/tst.mod.ksh \ + ${TESTSRCDIR}/tst/common/profile-n/tst.sym.ksh \ + ${TESTSRCDIR}/tst/common/profile-n/tst.ufunc.ksh \ + ${TESTSRCDIR}/tst/common/profile-n/tst.ufuncsort.ksh \ + ${TESTSRCDIR}/tst/common/profile-n/tst.umod.ksh \ + ${TESTSRCDIR}/tst/common/profile-n/tst.usym.ksh \ + ${TESTSRCDIR}/tst/common/raise/tst.raise1.d \ + ${TESTSRCDIR}/tst/common/raise/tst.raise2.d \ + ${TESTSRCDIR}/tst/common/raise/tst.raise3.d \ + ${TESTSRCDIR}/tst/common/rates/tst.aggrate.d \ + ${TESTSRCDIR}/tst/common/rates/tst.statusrate.d \ + ${TESTSRCDIR}/tst/common/rates/tst.switchrate.d \ + ${TESTSRCDIR}/tst/common/safety/tst.basename.d \ + ${TESTSRCDIR}/tst/common/safety/tst.caller.d \ + ${TESTSRCDIR}/tst/common/safety/tst.cleanpath.d \ + ${TESTSRCDIR}/tst/common/safety/tst.copyin.d \ + ${TESTSRCDIR}/tst/common/safety/tst.copyin2.d \ + ${TESTSRCDIR}/tst/common/safety/tst.ddi_pathname.d \ + ${TESTSRCDIR}/tst/common/safety/tst.dirname.d \ + ${TESTSRCDIR}/tst/common/safety/tst.errno.d \ + ${TESTSRCDIR}/tst/common/safety/tst.execname.d \ + ${TESTSRCDIR}/tst/common/safety/tst.gid.d \ + ${TESTSRCDIR}/tst/common/safety/tst.hton.d \ + ${TESTSRCDIR}/tst/common/safety/tst.index.d \ + ${TESTSRCDIR}/tst/common/safety/tst.msgdsize.d \ + ${TESTSRCDIR}/tst/common/safety/tst.msgsize.d \ + ${TESTSRCDIR}/tst/common/safety/tst.null.d \ + ${TESTSRCDIR}/tst/common/safety/tst.pid.d \ + ${TESTSRCDIR}/tst/common/safety/tst.ppid.d \ + ${TESTSRCDIR}/tst/common/safety/tst.progenyof.d \ + ${TESTSRCDIR}/tst/common/safety/tst.random.d \ + ${TESTSRCDIR}/tst/common/safety/tst.rw.d \ + ${TESTSRCDIR}/tst/common/safety/tst.shortstr.d \ + ${TESTSRCDIR}/tst/common/safety/tst.stack.d \ + ${TESTSRCDIR}/tst/common/safety/tst.stackdepth.d \ + ${TESTSRCDIR}/tst/common/safety/tst.strchr.d \ + ${TESTSRCDIR}/tst/common/safety/tst.strjoin.d \ + ${TESTSRCDIR}/tst/common/safety/tst.strstr.d \ + ${TESTSRCDIR}/tst/common/safety/tst.strtok.d \ + ${TESTSRCDIR}/tst/common/safety/tst.substr.d \ + ${TESTSRCDIR}/tst/common/safety/tst.ucaller.d \ + ${TESTSRCDIR}/tst/common/safety/tst.uid.d \ + ${TESTSRCDIR}/tst/common/safety/tst.unalign.d \ + ${TESTSRCDIR}/tst/common/safety/tst.uregs.d \ + ${TESTSRCDIR}/tst/common/safety/tst.ustack.d \ + ${TESTSRCDIR}/tst/common/safety/tst.ustackdepth.d \ + ${TESTSRCDIR}/tst/common/safety/tst.vahole.d \ + ${TESTSRCDIR}/tst/common/safety/tst.violentdeath.ksh \ + ${TESTSRCDIR}/tst/common/safety/tst.zonename.d \ + ${TESTSRCDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupgtype.d \ + ${TESTSRCDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupltype.d \ + ${TESTSRCDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupttype.d \ + ${TESTSRCDIR}/tst/common/scalars/tst.misc.d \ + ${TESTSRCDIR}/tst/common/scalars/tst.selfarray2.d \ + ${TESTSRCDIR}/tst/common/sched/tst.enqueue.d \ + ${TESTSRCDIR}/tst/common/sched/tst.oncpu.d \ + ${TESTSRCDIR}/tst/common/sched/tst.stackdepth.d \ ${TESTSRCDIR}/tst/common/scripting/err.D_MACRO_UNDEF.invalidargs.d \ - ${TESTSRCDIR}/tst/common/scripting/err.D_OP_LVAL.rdonly.d \ - ${TESTSRCDIR}/tst/common/scripting/err.D_OP_WRITE.usepidmacro.d \ - ${TESTSRCDIR}/tst/common/scripting/err.D_SYNTAX.concat.d \ - ${TESTSRCDIR}/tst/common/scripting/err.D_SYNTAX.desc.d \ - ${TESTSRCDIR}/tst/common/scripting/err.D_SYNTAX.inval.d \ - ${TESTSRCDIR}/tst/common/scripting/err.D_SYNTAX.pid.d \ - ${TESTSRCDIR}/tst/common/scripting/tst.arg0.d \ - ${TESTSRCDIR}/tst/common/scripting/tst.assign.d \ - ${TESTSRCDIR}/tst/common/scripting/tst.basic.d \ - ${TESTSRCDIR}/tst/common/scripting/tst.egid.d \ - ${TESTSRCDIR}/tst/common/scripting/tst.euid.d \ - ${TESTSRCDIR}/tst/common/scripting/tst.gid.d \ - ${TESTSRCDIR}/tst/common/scripting/tst.pgid.d \ - ${TESTSRCDIR}/tst/common/scripting/tst.pid.d \ - ${TESTSRCDIR}/tst/common/scripting/tst.ppid.d \ - ${TESTSRCDIR}/tst/common/scripting/tst.projid.d \ - ${TESTSRCDIR}/tst/common/scripting/tst.quite.d \ - ${TESTSRCDIR}/tst/common/scripting/tst.sid.d \ - ${TESTSRCDIR}/tst/common/scripting/tst.taskid.d \ - ${TESTSRCDIR}/tst/common/scripting/tst.trace.d \ - ${TESTSRCDIR}/tst/common/scripting/tst.uid.d \ + ${TESTSRCDIR}/tst/common/scripting/err.D_OP_LVAL.rdonly.d \ + ${TESTSRCDIR}/tst/common/scripting/err.D_OP_WRITE.usepidmacro.d \ + ${TESTSRCDIR}/tst/common/scripting/err.D_SYNTAX.concat.d \ + ${TESTSRCDIR}/tst/common/scripting/err.D_SYNTAX.desc.d \ + ${TESTSRCDIR}/tst/common/scripting/err.D_SYNTAX.inval.d \ + ${TESTSRCDIR}/tst/common/scripting/err.D_SYNTAX.pid.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.arg0.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.arguments.ksh \ + ${TESTSRCDIR}/tst/common/scripting/tst.assign.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.basic.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.egid.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.egid.ksh \ + ${TESTSRCDIR}/tst/common/scripting/tst.euid.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.gid.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.gid.ksh \ + ${TESTSRCDIR}/tst/common/scripting/tst.pgid.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.pid.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.ppid.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.projid.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.projid.ksh \ + ${TESTSRCDIR}/tst/common/scripting/tst.quite.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.sid.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.taskid.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.taskid.ksh \ + ${TESTSRCDIR}/tst/common/scripting/tst.trace.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.uid.d \ ${TESTSRCDIR}/tst/common/speculation/bug.1001148.SpecSizeVariations.d \ - ${TESTSRCDIR}/tst/common/speculation/err.BufSizeVariations1.d \ - ${TESTSRCDIR}/tst/common/speculation/err.BufSizeVariations2.d \ + ${TESTSRCDIR}/tst/common/speculation/err.BufSizeVariations1.d \ + ${TESTSRCDIR}/tst/common/speculation/err.BufSizeVariations2.d \ ${TESTSRCDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithBreakPoint.d \ ${TESTSRCDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithChill.d \ ${TESTSRCDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithCopyOut.d \ @@ -293,73 +326,101 @@ ${TESTSRCDIR}/tst/common/speculation/err.D_PRAGMA_OPTSET.HugeNspecValue.d \ ${TESTSRCDIR}/tst/common/speculation/err.D_PRAGMA_OPTSET.InvalidSpecSize.d \ ${TESTSRCDIR}/tst/common/speculation/err.D_PRAGMA_OPTSET.NegSpecSize.d \ - ${TESTSRCDIR}/tst/common/speculation/err.D_PROTO_LEN.SpecNoId.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_PROTO_LEN.SpecNoId.d \ ${TESTSRCDIR}/tst/common/speculation/err.D_SPEC_COMM.SpecAftCommit.d \ ${TESTSRCDIR}/tst/common/speculation/err.D_SPEC_DREC.SpecAftDataRec.d \ ${TESTSRCDIR}/tst/common/speculation/err.D_SPEC_SPEC.SpecAftSpec.d \ - ${TESTSRCDIR}/tst/common/speculation/err.NegativeBufSize.d \ - ${TESTSRCDIR}/tst/common/speculation/err.NegativeNspec.d \ - ${TESTSRCDIR}/tst/common/speculation/err.NegativeSpecSize.d \ - ${TESTSRCDIR}/tst/common/speculation/err.SpecSizeVariations1.d \ - ${TESTSRCDIR}/tst/common/speculation/err.SpecSizeVariations2.d \ - ${TESTSRCDIR}/tst/common/speculation/tst.CommitAfterDiscard.d \ - ${TESTSRCDIR}/tst/common/speculation/tst.CommitWithZero.d \ - ${TESTSRCDIR}/tst/common/speculation/tst.DataRecAftDiscard.d \ - ${TESTSRCDIR}/tst/common/speculation/tst.DiscardAftCommit.d \ - ${TESTSRCDIR}/tst/common/speculation/tst.DiscardAftDataRec.d \ - ${TESTSRCDIR}/tst/common/speculation/tst.DiscardAftDiscard.d \ - ${TESTSRCDIR}/tst/common/speculation/tst.DiscardWithZero.d \ - ${TESTSRCDIR}/tst/common/speculation/tst.ExitAftDiscard.d \ - ${TESTSRCDIR}/tst/common/speculation/tst.NoSpecBuffer.d \ - ${TESTSRCDIR}/tst/common/speculation/tst.SpecSizeVariations1.d \ - ${TESTSRCDIR}/tst/common/speculation/tst.SpecSizeVariations2.d \ - ${TESTSRCDIR}/tst/common/speculation/tst.SpecSizeVariations3.d \ - ${TESTSRCDIR}/tst/common/speculation/tst.SpeculateWithRandom.d \ - ${TESTSRCDIR}/tst/common/speculation/tst.SpeculationCommit.d \ - ${TESTSRCDIR}/tst/common/speculation/tst.SpeculationDiscard.d \ - ${TESTSRCDIR}/tst/common/speculation/tst.SpeculationID.d \ - ${TESTSRCDIR}/tst/common/speculation/tst.SpeculationWithZero.d \ - ${TESTSRCDIR}/tst/common/speculation/tst.TwoSpecBuffers.d \ - ${TESTSRCDIR}/tst/common/speculation/tst.negcommit.d \ - ${TESTSRCDIR}/tst/common/speculation/tst.negspec.d \ - ${TESTSRCDIR}/tst/common/speculation/tst.zerosize.d \ + ${TESTSRCDIR}/tst/common/speculation/err.NegativeBufSize.d \ + ${TESTSRCDIR}/tst/common/speculation/err.NegativeNspec.d \ + ${TESTSRCDIR}/tst/common/speculation/err.NegativeSpecSize.d \ + ${TESTSRCDIR}/tst/common/speculation/err.SpecSizeVariations1.d \ + ${TESTSRCDIR}/tst/common/speculation/err.SpecSizeVariations2.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.CommitAfterDiscard.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.CommitWithZero.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.DataRecAftDiscard.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.DiscardAftCommit.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.DiscardAftDataRec.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.DiscardAftDiscard.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.DiscardWithZero.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.ExitAftDiscard.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.NoSpecBuffer.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.SpecSizeVariations1.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.SpecSizeVariations2.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.SpecSizeVariations3.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.SpeculateWithRandom.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.SpeculationCommit.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.SpeculationDiscard.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.SpeculationID.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.SpeculationWithZero.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.TwoSpecBuffers.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.negcommit.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.negspec.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.zerosize.d \ ${TESTSRCDIR}/tst/common/stability/err.D_ATTR_MIN.MinAttributes.d \ - ${TESTSRCDIR}/tst/common/stack/err.D_STACK_PROTO.bad.d \ - ${TESTSRCDIR}/tst/common/stack/err.D_STACK_SIZE.d \ - ${TESTSRCDIR}/tst/common/stack/err.D_USTACK_FRAMES.bad.d \ - ${TESTSRCDIR}/tst/common/stack/err.D_USTACK_PROTO.bad.d \ - ${TESTSRCDIR}/tst/common/stack/err.D_USTACK_STRSIZE.bad.d \ - ${TESTSRCDIR}/tst/common/stack/tst.default.d \ - ${TESTSRCDIR}/tst/common/stackdepth/tst.default.d \ - ${TESTSRCDIR}/tst/common/stop/tst.stop1.d \ - ${TESTSRCDIR}/tst/common/stop/tst.stop2.d \ - ${TESTSRCDIR}/tst/common/syscall/tst.args.d \ - ${TESTSRCDIR}/tst/common/sysevent/tst.post.d \ - ${TESTSRCDIR}/tst/common/sysevent/tst.post_chan.d \ - ${TESTSRCDIR}/tst/common/tracemem/err.D_PROTO_ARG.badsize.d \ - ${TESTSRCDIR}/tst/common/tracemem/err.D_PROTO_LEN.toofew.d \ - ${TESTSRCDIR}/tst/common/tracemem/err.D_PROTO_LEN.toomany.d \ - ${TESTSRCDIR}/tst/common/tracemem/err.D_TRACEMEM_ADDR.badaddr.d \ - ${TESTSRCDIR}/tst/common/tracemem/err.D_TRACEMEM_SIZE.negsize.d \ + ${TESTSRCDIR}/tst/common/stack/err.D_STACK_PROTO.bad.d \ + ${TESTSRCDIR}/tst/common/stack/err.D_STACK_SIZE.d \ + ${TESTSRCDIR}/tst/common/stack/err.D_USTACK_FRAMES.bad.d \ + ${TESTSRCDIR}/tst/common/stack/err.D_USTACK_PROTO.bad.d \ + ${TESTSRCDIR}/tst/common/stack/err.D_USTACK_STRSIZE.bad.d \ + ${TESTSRCDIR}/tst/common/stack/tst.default.d \ + ${TESTSRCDIR}/tst/common/stackdepth/tst.default.d \ + ${TESTSRCDIR}/tst/common/stop/tst.stop1.d \ + ${TESTSRCDIR}/tst/common/stop/tst.stop2.d \ + ${TESTSRCDIR}/tst/common/syscall/tst.args.d \ + ${TESTSRCDIR}/tst/common/syscall/tst.openret.ksh \ + ${TESTSRCDIR}/tst/common/sysevent/tst.post.d \ + ${TESTSRCDIR}/tst/common/sysevent/tst.post_chan.d \ + ${TESTSRCDIR}/tst/common/trace/tst.misc.d \ + ${TESTSRCDIR}/tst/common/tracemem/err.D_PROTO_ARG.badsize.d \ + ${TESTSRCDIR}/tst/common/tracemem/err.D_PROTO_LEN.toofew.d \ + ${TESTSRCDIR}/tst/common/tracemem/err.D_PROTO_LEN.toomany.d \ + ${TESTSRCDIR}/tst/common/tracemem/err.D_TRACEMEM_ADDR.badaddr.d \ + ${TESTSRCDIR}/tst/common/tracemem/err.D_TRACEMEM_SIZE.negsize.d \ ${TESTSRCDIR}/tst/common/tracemem/err.D_TRACEMEM_SIZE.zerosize.d \ - ${TESTSRCDIR}/tst/common/tracemem/tst.rootvp.d \ - ${TESTSRCDIR}/tst/common/translators/tst.ProcModelTrans.d \ - ${TESTSRCDIR}/tst/common/types/err.D_CG_DYN.ResultDynType.d \ + ${TESTSRCDIR}/tst/common/tracemem/tst.rootvp.d \ + ${TESTSRCDIR}/tst/common/translators/tst.ProcModelTrans.d \ + ${TESTSRCDIR}/tst/common/types/err.D_CG_DYN.ResultDynType.d \ ${TESTSRCDIR}/tst/common/types/err.D_XLATE_REDECL.ResultDynType.d \ - ${TESTSRCDIR}/tst/common/types/tst.complex.d \ - ${TESTSRCDIR}/tst/common/types/tst.ptrops.d \ - ${TESTSRCDIR}/tst/common/types/tst.struct.d \ - ${TESTSRCDIR}/tst/common/types/tst.typedef.d \ - ${TESTSRCDIR}/tst/common/usdt/argmap.d \ - ${TESTSRCDIR}/tst/common/usdt/args.d \ - ${TESTSRCDIR}/tst/common/usdt/forker.d \ - ${TESTSRCDIR}/tst/common/usdt/tst.argmap.d \ - ${TESTSRCDIR}/tst/common/usdt/tst.args.d \ - ${TESTSRCDIR}/tst/common/ustack/tst.bigstack.d \ - ${TESTSRCDIR}/tst/common/vars/tst.gid.d \ - ${TESTSRCDIR}/tst/common/vars/tst.ppid.d \ - ${TESTSRCDIR}/tst/common/vars/tst.uid.d \ - ${TESTSRCDIR}/tst/common/vars/tst.walltimestamp.d \ + ${TESTSRCDIR}/tst/common/types/tst.complex.d \ + ${TESTSRCDIR}/tst/common/types/tst.ptrops.d \ + ${TESTSRCDIR}/tst/common/types/tst.struct.d \ + ${TESTSRCDIR}/tst/common/types/tst.typedef.d \ + ${TESTSRCDIR}/tst/common/usdt/argmap.d \ + ${TESTSRCDIR}/tst/common/usdt/args.d \ + ${TESTSRCDIR}/tst/common/usdt/forker.d \ + ${TESTSRCDIR}/tst/common/usdt/tst.andpid.ksh \ + ${TESTSRCDIR}/tst/common/usdt/tst.argmap.d \ + ${TESTSRCDIR}/tst/common/usdt/tst.args.d \ + ${TESTSRCDIR}/tst/common/usdt/tst.badguess.ksh \ + ${TESTSRCDIR}/tst/common/usdt/tst.dlclose1.ksh \ + ${TESTSRCDIR}/tst/common/usdt/tst.dlclose2.ksh \ + ${TESTSRCDIR}/tst/common/usdt/tst.dlclose3.ksh \ + ${TESTSRCDIR}/tst/common/usdt/tst.eliminate.ksh \ + ${TESTSRCDIR}/tst/common/usdt/tst.enabled.ksh \ + ${TESTSRCDIR}/tst/common/usdt/tst.entryreturn.ksh \ + ${TESTSRCDIR}/tst/common/usdt/tst.fork.ksh \ + ${TESTSRCDIR}/tst/common/usdt/tst.forker.ksh \ + ${TESTSRCDIR}/tst/common/usdt/tst.guess32.ksh \ + ${TESTSRCDIR}/tst/common/usdt/tst.guess64.ksh \ + ${TESTSRCDIR}/tst/common/usdt/tst.header.ksh \ + ${TESTSRCDIR}/tst/common/usdt/tst.include.ksh \ + ${TESTSRCDIR}/tst/common/usdt/tst.linkpriv.ksh \ + ${TESTSRCDIR}/tst/common/usdt/tst.linkunpriv.ksh \ + ${TESTSRCDIR}/tst/common/usdt/tst.multiple.ksh \ + ${TESTSRCDIR}/tst/common/usdt/tst.nodtrace.ksh \ + ${TESTSRCDIR}/tst/common/usdt/tst.onlyenabled.ksh \ + ${TESTSRCDIR}/tst/common/usdt/tst.reeval.ksh \ + ${TESTSRCDIR}/tst/common/usdt/tst.static.ksh \ + ${TESTSRCDIR}/tst/common/usdt/tst.static2.ksh \ + ${TESTSRCDIR}/tst/common/usdt/tst.user.ksh \ + ${TESTSRCDIR}/tst/common/ustack/tst.bigstack.d \ + ${TESTSRCDIR}/tst/common/ustack/tst.depth.ksh \ + ${TESTSRCDIR}/tst/common/ustack/tst.spin.ksh \ + ${TESTSRCDIR}/tst/common/vars/tst.gid.d \ + ${TESTSRCDIR}/tst/common/vars/tst.ppid.d \ + ${TESTSRCDIR}/tst/common/vars/tst.ucaller.ksh \ + ${TESTSRCDIR}/tst/common/vars/tst.uid.d \ + ${TESTSRCDIR}/tst/common/vars/tst.walltimestamp.d \ # -------------------------------------------------------------------------------- # Tests that currently hang the system: @@ -368,6 +429,7 @@ ${TESTSRCDIR}/tst/common/fbtprovider/tst.basic.d \ ${TESTSRCDIR}/tst/common/fbtprovider/tst.return.d \ ${TESTSRCDIR}/tst/common/grammar/tst.stmts.d \ + ${TESTSRCDIR}/tst/common/misc/tst.enablerace.ksh \ # -------------------------------------------------------------------------------- @@ -419,7 +481,9 @@ # Get a list of test files in the test directory: ${_d}_ERR!= find ${TESTSRCDIR}/tst/common/${_d} -name "err.*.d" ${_d}_TST!= find ${TESTSRCDIR}/tst/common/${_d} -name "tst.*.d" -${_d}_TF= ${${_d}_ERR} ${${_d}_TST} +${_d}_SHERR!= find ${TESTSRCDIR}/tst/common/${_d} -name "err.*.ksh" +${_d}_SHTST!= find ${TESTSRCDIR}/tst/common/${_d} -name "tst.*.ksh" +${_d}_TF= ${${_d}_ERR} ${${_d}_TST} ${${_d}_SHERR} ${${_d}_SHTST} # Go through the list of test files and prepare another list that contains # none of the test files listed in the IGNORE list: From owner-p4-projects@FreeBSD.ORG Sun Jan 13 03:05:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A15D16A41A; Sun, 13 Jan 2008 03:05:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E3FDE16A419 for ; Sun, 13 Jan 2008 03:05:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E490013C43E for ; Sun, 13 Jan 2008 03:05:22 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D35MV6034271 for ; Sun, 13 Jan 2008 03:05:22 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D35M5O034268 for perforce@freebsd.org; Sun, 13 Jan 2008 03:05:22 GMT (envelope-from jb@freebsd.org) Date: Sun, 13 Jan 2008 03:05:22 GMT Message-Id: <200801130305.m0D35M5O034268@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133153 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 03:05:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=133153 Change 133153 by jb@jb_freebsd1 on 2008/01/13 03:05:07 Remove the kvm references. kevent replaced what I was going to use kvm for, so that left just opening and closing kvm. Affected files ... .. //depot/projects/dtrace/src/lib/libproc/Makefile#2 edit .. //depot/projects/dtrace/src/lib/libproc/_libproc.h#2 edit .. //depot/projects/dtrace/src/lib/libproc/proc_create.c#2 edit .. //depot/projects/dtrace/src/lib/libproc/proc_free.c#2 edit Differences ... ==== //depot/projects/dtrace/src/lib/libproc/Makefile#2 (text+ko) ==== @@ -13,8 +13,6 @@ SHLIB_MAJOR= 1 -LDADD= -lkvm - WARNS?= 6 WITHOUT_MAN= yes ==== //depot/projects/dtrace/src/lib/libproc/_libproc.h#2 (text+ko) ==== @@ -31,13 +31,11 @@ #include #include #include -#include #include "libproc.h" struct proc_handle { pid_t pid; /* Process ID. */ - kvm_t *kd; /* KVM descriptor. */ int kq; /* Kernel event queue ID. */ int status; /* Process status (PS_*). */ }; ==== //depot/projects/dtrace/src/lib/libproc/proc_create.c#2 (text+ko) ==== @@ -90,10 +90,6 @@ err(4, "ERROR: child process %d status 0x%x", pid, status); else phdl->status = PS_STOP; - - if ((phdl->kd = kvm_openfiles(NULL, NULL, NULL, - O_RDWR, errbuf)) == NULL) - errx(5, "%s", errbuf); } if (error) ==== //depot/projects/dtrace/src/lib/libproc/proc_free.c#2 (text+ko) ==== @@ -32,8 +32,5 @@ void proc_free(struct proc_handle *phdl) { - if (phdl->kd != NULL) - kvm_close(phdl->kd); - free(phdl); } From owner-p4-projects@FreeBSD.ORG Sun Jan 13 03:29:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77CCF16A419; Sun, 13 Jan 2008 03:29:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 24B8C16A417 for ; Sun, 13 Jan 2008 03:29:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 276D313C4F5 for ; Sun, 13 Jan 2008 03:29:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D3TlGu037326 for ; Sun, 13 Jan 2008 03:29:47 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D3Tlus037323 for perforce@freebsd.org; Sun, 13 Jan 2008 03:29:47 GMT (envelope-from jb@freebsd.org) Date: Sun, 13 Jan 2008 03:29:47 GMT Message-Id: <200801130329.m0D3Tlus037323@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133154 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 03:29:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=133154 Change 133154 by jb@jb_freebsd1 on 2008/01/13 03:29:46 Implement proc_attach to allocate a handle like proc_create does. Add clear, get and set flags. Move proc_free() into the same file as create/attach. Affected files ... .. //depot/projects/dtrace/src/lib/libproc/Makefile#3 edit .. //depot/projects/dtrace/src/lib/libproc/_libproc.h#3 edit .. //depot/projects/dtrace/src/lib/libproc/libproc.h#2 edit .. //depot/projects/dtrace/src/lib/libproc/proc_create.c#3 edit .. //depot/projects/dtrace/src/lib/libproc/proc_free.c#3 delete .. //depot/projects/dtrace/src/lib/libproc/proc_util.c#2 edit Differences ... ==== //depot/projects/dtrace/src/lib/libproc/Makefile#3 (text+ko) ==== @@ -4,7 +4,6 @@ SRCS= \ proc_create.c \ - proc_free.c \ proc_util.c INCS= libproc.h ==== //depot/projects/dtrace/src/lib/libproc/_libproc.h#3 (text+ko) ==== @@ -37,6 +37,7 @@ struct proc_handle { pid_t pid; /* Process ID. */ int kq; /* Kernel event queue ID. */ + int flags; /* Process flags. */ int status; /* Process status (PS_*). */ }; ==== //depot/projects/dtrace/src/lib/libproc/libproc.h#2 (text+ko) ==== @@ -42,10 +42,13 @@ /* Function prototype definitions. */ __BEGIN_DECLS -int proc_attach(struct proc_handle *); +int proc_attach(pid_t pid, int flags, struct proc_handle **pphdl); int proc_continue(struct proc_handle *); +int proc_clearflags(struct proc_handle *, int); +int proc_create(const char *, char * const *, struct proc_handle **); int proc_detach(struct proc_handle *); -int proc_create(const char *, char * const *, struct proc_handle **); +int proc_getflags(struct proc_handle *); +int proc_setflags(struct proc_handle *, int); int proc_state(struct proc_handle *); int proc_wait(struct proc_handle *); pid_t proc_getpid(struct proc_handle *); ==== //depot/projects/dtrace/src/lib/libproc/proc_create.c#3 (text+ko) ==== @@ -37,11 +37,63 @@ #include int +proc_attach(pid_t pid, int flags, struct proc_handle **pphdl) +{ + struct proc_handle *phdl; + struct kevent kev; + int error = 0; + int status; + + if (pid == 0 || pphdl == NULL) + return (EINVAL); + + /* + * Allocate memory for the process handle, a structure containing + * all things related to the process. + */ + if ((phdl = malloc(sizeof(struct proc_handle))) == NULL) + return (ENOMEM); + + memset(phdl, 0, sizeof(struct proc_handle)); + phdl->pid = pid; + phdl->flags = flags; + phdl->status = PS_RUN; + + EV_SET(&kev, pid, EVFILT_PROC, EV_ADD | EV_ONESHOT, NOTE_EXIT, + 0, NULL); + + if ((phdl->kq = kqueue()) == -1) + err(1, "ERROR: cannot create kernel evet queue"); + + if (kevent(phdl->kq, &kev, 1, NULL, 0, NULL) < 0) + err(2, "ERROR: cannot monitor child process %d", pid); + + if (ptrace(PT_ATTACH, phdl->pid, NULL, 0) != 0) + error = errno; + + /* Wait for the child process to stop. */ + else if (waitpid(pid, &status, WUNTRACED) == -1) + err(3, "ERROR: child process %d didn't stop as expected", pid); + + /* Check for an unexpected status. */ + else if (WIFSTOPPED(status) == 0) + err(4, "ERROR: child process %d status 0x%x", pid, status); + else + phdl->status = PS_STOP; + + if (error) + proc_free(phdl); + else + *pphdl = phdl; + + return (error); +} + +int proc_create(const char *file, char * const *argv, struct proc_handle **pphdl) { struct proc_handle *phdl; struct kevent kev; - char errbuf[_POSIX2_LINE_MAX]; int error = 0; int status; pid_t pid; @@ -99,3 +151,9 @@ return (error); } + +void +proc_free(struct proc_handle *phdl) +{ + free(phdl); +} ==== //depot/projects/dtrace/src/lib/libproc/proc_util.c#2 (text+ko) ==== @@ -34,13 +34,12 @@ #include int -proc_attach(struct proc_handle *phdl) +proc_clearflags(struct proc_handle *phdl, int mask) { if (phdl == NULL) return (EINVAL); - if (ptrace(PT_ATTACH, phdl->pid, NULL, 0) != 0) - return (errno); + phdl->flags &= ~mask; return (0); } @@ -72,6 +71,26 @@ } int +proc_getflags(struct proc_handle *phdl) +{ + if (phdl == NULL) + return (-1); + + return(phdl->flags); +} + +int +proc_setflags(struct proc_handle *phdl, int mask) +{ + if (phdl == NULL) + return (EINVAL); + + phdl->flags |= mask; + + return (0); +} + +int proc_state(struct proc_handle *phdl) { if (phdl == NULL) From owner-p4-projects@FreeBSD.ORG Sun Jan 13 04:13:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED4E016A468; Sun, 13 Jan 2008 04:13:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8AFC816A418 for ; Sun, 13 Jan 2008 04:13:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 79EFD13C45A for ; Sun, 13 Jan 2008 04:13:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D4DXQe045963 for ; Sun, 13 Jan 2008 04:13:33 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D4DXwP045960 for perforce@freebsd.org; Sun, 13 Jan 2008 04:13:33 GMT (envelope-from jb@freebsd.org) Date: Sun, 13 Jan 2008 04:13:33 GMT Message-Id: <200801130413.m0D4DXwP045960@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133155 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 04:13:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=133155 Change 133155 by jb@jb_freebsd1 on 2008/01/13 04:12:39 Remove an obsolete include path. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#20 edit Differences ... ==== //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#20 (text+ko) ==== @@ -57,8 +57,7 @@ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ - -I${OPENSOLARIS_SYS_DISTDIR}/compat + -I${OPENSOLARIS_SYS_DISTDIR}/uts/common #CFLAGS+= -DYYDEBUG From owner-p4-projects@FreeBSD.ORG Sun Jan 13 04:14:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8902A16A421; Sun, 13 Jan 2008 04:14:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D7CB016A418 for ; Sun, 13 Jan 2008 04:14:38 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DF40313C44B for ; Sun, 13 Jan 2008 04:14:38 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D4EcHV046140 for ; Sun, 13 Jan 2008 04:14:38 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D4Ec4O046137 for perforce@freebsd.org; Sun, 13 Jan 2008 04:14:38 GMT (envelope-from jb@freebsd.org) Date: Sun, 13 Jan 2008 04:14:38 GMT Message-Id: <200801130414.m0D4Ec4O046137@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133156 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 04:14:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=133156 Change 133156 by jb@jb_freebsd1 on 2008/01/13 04:14:09 Add another sigaction for SIGUSR1 which we use instead of SIGCANCEL (which seems to be defined and used privately in libthr ??????) Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.c#14 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.c#14 (text) ==== @@ -1829,6 +1829,11 @@ if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN) (void) sigaction(SIGTERM, &act, NULL); +#if !defined(sun) + if (sigaction(SIGUSR1, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN) + (void) sigaction(SIGUSR1, &act, NULL); +#endif + /* * Now that tracing is active and we are ready to consume trace data, * continue any grabbed or created processes, setting them running From owner-p4-projects@FreeBSD.ORG Sun Jan 13 04:18:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E901C16A421; Sun, 13 Jan 2008 04:18:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6063A16A418 for ; Sun, 13 Jan 2008 04:18:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4989413C457 for ; Sun, 13 Jan 2008 04:18:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D4Ih3b046313 for ; Sun, 13 Jan 2008 04:18:43 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D4IhDL046310 for perforce@freebsd.org; Sun, 13 Jan 2008 04:18:43 GMT (envelope-from jb@freebsd.org) Date: Sun, 13 Jan 2008 04:18:43 GMT Message-Id: <200801130418.m0D4IhDL046310@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133157 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 04:18:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=133157 Change 133157 by jb@jb_freebsd1 on 2008/01/13 04:17:47 Add some definitions that we don't need in our libproc. Affected files ... .. //depot/projects/dtrace/src/compat/opensolaris/include/libproc.h#3 edit Differences ... ==== //depot/projects/dtrace/src/compat/opensolaris/include/libproc.h#3 (text+ko) ==== @@ -30,8 +30,15 @@ #ifndef _COMPAT_OPENSOLARIS_LIBPROC_H_ #define _COMPAT_OPENSOLARIS_LIBPROC_H_ +#include + #define ps_prochandle proc_handle +#define PR_RLC 0x0001 +#define PR_KLC 0x0002 + +#define PGRAB_RDONLY O_RDONLY + #include_next #endif From owner-p4-projects@FreeBSD.ORG Sun Jan 13 04:19:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D961416A421; Sun, 13 Jan 2008 04:19:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 85BC016A41B for ; Sun, 13 Jan 2008 04:19:44 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8CF2C13C459 for ; Sun, 13 Jan 2008 04:19:44 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D4JidG046344 for ; Sun, 13 Jan 2008 04:19:44 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D4JiVD046341 for perforce@freebsd.org; Sun, 13 Jan 2008 04:19:44 GMT (envelope-from jb@freebsd.org) Date: Sun, 13 Jan 2008 04:19:44 GMT Message-Id: <200801130419.m0D4JiVD046341@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133158 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 04:19:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=133158 Change 133158 by jb@jb_freebsd1 on 2008/01/13 04:19:21 Update to allow DTrace to attach to a process which is already running. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#8 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#8 (text) ==== @@ -178,41 +178,41 @@ static void dt_proc_bpenable(dt_proc_t *dpr) { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD dt_bkpt_t *dbp; assert(DT_MUTEX_HELD(&dpr->dpr_lock)); for (dbp = dt_list_next(&dpr->dpr_bps); dbp != NULL; dbp = dt_list_next(dbp)) { +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD if (!dbp->dbp_active && Psetbkpt(dpr->dpr_proc, dbp->dbp_addr, &dbp->dbp_instr) == 0) dbp->dbp_active = B_TRUE; +#endif } dt_dprintf("breakpoints enabled\n"); -#endif } static void dt_proc_bpdisable(dt_proc_t *dpr) { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD dt_bkpt_t *dbp; assert(DT_MUTEX_HELD(&dpr->dpr_lock)); for (dbp = dt_list_next(&dpr->dpr_bps); dbp != NULL; dbp = dt_list_next(dbp)) { +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD if (dbp->dbp_active && Pdelbkpt(dpr->dpr_proc, dbp->dbp_addr, dbp->dbp_instr) == 0) dbp->dbp_active = B_FALSE; +#endif } dt_dprintf("breakpoints disabled\n"); -#endif } static void @@ -282,7 +282,7 @@ dt_proc_stop(dpr, DT_PROC_STOP_MAIN); } -#ifdef DOODAD +#if defined(sun) static void dt_proc_rdevent(dtrace_hdl_t *dtp, dt_proc_t *dpr, const char *evname) { @@ -557,7 +557,14 @@ (int)dpr->dpr_pid, strerror(errno)); } #else - dt_proc_stop(dpr, DT_PROC_STOP_CREATE); + /* + * If PR_KLC is set, we created the process; otherwise we grabbed it. + * Check for an appropriate stop request and wait for dt_proc_continue. + */ + if (proc_getflags(P) & PR_KLC) + dt_proc_stop(dpr, DT_PROC_STOP_CREATE); + else + dt_proc_stop(dpr, DT_PROC_STOP_GRAB); if (proc_continue(P) != 0) dt_dprintf("pid %d: failed to set running: %s\n", @@ -602,7 +609,6 @@ switch (proc_state(P)) { #endif case PS_STOP: -printf("Process has stopped!\n"); #ifdef DOODAD psp = &Pstatus(P)->pr_lwp; @@ -650,7 +656,6 @@ break; case PS_LOST: -printf("Process has been lost!\n"); #if defined(sun) if (Preopen(P) == 0) goto pwait_locked; @@ -664,7 +669,6 @@ break; case PS_UNDEAD: -printf("Process is undead!\n"); dt_dprintf("pid %d: proc died\n", pid); dpr->dpr_quit = B_TRUE; notify = B_TRUE; @@ -757,8 +761,6 @@ static void dt_proc_destroy(dtrace_hdl_t *dtp, struct ps_prochandle *P) { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD dt_proc_t *dpr = dt_proc_lookup(dtp, P, B_FALSE); dt_proc_hash_t *dph = dtp->dt_procs; dt_proc_notify_t *npr, **npp; @@ -771,9 +773,17 @@ * an external debugger and we were waiting in dt_proc_waitrun(). * Leave the process in this condition using PRELEASE_HANG. */ +#if defined(sun) if (!(Pstatus(dpr->dpr_proc)->pr_flags & (PR_KLC | PR_RLC))) { +#else + if (!(proc_getflags(dpr->dpr_proc) & (PR_KLC | PR_RLC))) { +#endif dt_dprintf("abandoning pid %d\n", (int)dpr->dpr_pid); +#if defined(sun) rflag = PRELEASE_HANG; +#else + rflag = 0 /* XXX */; +#endif } else { dt_dprintf("releasing pid %d\n", (int)dpr->dpr_pid); rflag = 0; /* apply kill or run-on-last-close */ @@ -796,7 +806,11 @@ */ (void) pthread_mutex_lock(&dpr->dpr_lock); dpr->dpr_quit = B_TRUE; +#if defined(sun) (void) _lwp_kill(dpr->dpr_tid, SIGCANCEL); +#else + (void) pthread_kill(dpr->dpr_tid, SIGUSR1); +#endif /* * If the process is currently idling in dt_proc_stop(), re- @@ -844,9 +858,12 @@ } dt_list_delete(&dph->dph_lrulist, dpr); +#if defined(sun) Prelease(dpr->dpr_proc, rflag); +#else + proc_detach(dpr->dpr_proc); +#endif dt_free(dtp, dpr); -#endif } static int @@ -962,6 +979,8 @@ (void) Punsetflags(dpr->dpr_proc, PR_RLC); (void) Psetflags(dpr->dpr_proc, PR_KLC); #else + (void) proc_clearflags(dpr->dpr_proc, PR_RLC); + (void) proc_setflags(dpr->dpr_proc, PR_KLC); if ((err = proc_create(file, argv, &dpr->dpr_proc)) != 0) return (dt_proc_error(dtp, dpr, "failed to execute %s: %s\n", file, strerror(err))); @@ -989,8 +1008,6 @@ struct ps_prochandle * dt_proc_grab(dtrace_hdl_t *dtp, pid_t pid, int flags, int nomonitor) { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD dt_proc_hash_t *dph = dtp->dt_procs; uint_t h = pid & (dph->dph_hashlen - 1); dt_proc_t *dpr, *opr; @@ -1031,16 +1048,27 @@ (void) pthread_mutex_init(&dpr->dpr_lock, NULL); (void) pthread_cond_init(&dpr->dpr_cv, NULL); +#if defined(sun) if ((dpr->dpr_proc = Pgrab(pid, flags, &err)) == NULL) { return (dt_proc_error(dtp, dpr, "failed to grab pid %d: %s\n", (int)pid, Pgrab_error(err))); } +#else + if ((err = proc_attach(pid, flags, &dpr->dpr_proc)) != 0) + return (dt_proc_error(dtp, dpr, + "failed to grab pid %d: %s\n", (int) pid, strerror(err))); +#endif dpr->dpr_hdl = dtp; dpr->dpr_pid = pid; +#if defined(sun) (void) Punsetflags(dpr->dpr_proc, PR_KLC); (void) Psetflags(dpr->dpr_proc, PR_RLC); +#else + (void) proc_clearflags(dpr->dpr_proc, PR_KLC); + (void) proc_setflags(dpr->dpr_proc, PR_RLC); +#endif /* * If we are attempting to grab the process without a monitor @@ -1080,9 +1108,6 @@ dpr->dpr_refs++; return (dpr->dpr_proc); -#else -return NULL; -#endif } void From owner-p4-projects@FreeBSD.ORG Sun Jan 13 04:20:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A02416A419; Sun, 13 Jan 2008 04:20:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CE69916A417 for ; Sun, 13 Jan 2008 04:20:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D612313C45B for ; Sun, 13 Jan 2008 04:20:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D4KjvW046663 for ; Sun, 13 Jan 2008 04:20:45 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D4KjFN046660 for perforce@freebsd.org; Sun, 13 Jan 2008 04:20:45 GMT (envelope-from jb@freebsd.org) Date: Sun, 13 Jan 2008 04:20:45 GMT Message-Id: <200801130420.m0D4KjFN046660@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133159 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 04:20:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=133159 Change 133159 by jb@jb_freebsd1 on 2008/01/13 04:19:46 Port to FreeBSD. (dtrace -G) Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_link.c#13 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_link.c#13 (text) ==== @@ -518,19 +518,18 @@ #else elf_file.ehdr.e_ident[EI_DATA] = ELFDATA2LSB; #endif +#if defined(__FreeBSD__) + elf_file.ehdr.e_ident[EI_OSABI] = ELFOSABI_FREEBSD; +#endif elf_file.ehdr.e_type = ET_REL; #if defined(__arm__) -/* XXX */ -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); + elf_file.ehdr.e_machine = EM_ARM; #elif defined(__ia64__) -/* XXX */ -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); + elf_file.ehdr.e_machine = EM_IA_64; #elif defined(__mips__) -/* XXX */ -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); + elf_file.ehdr.e_machine = EM_MIPS; #elif defined(__powerpc__) -/* XXX */ -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); + elf_file.ehdr.e_machine = EM_PPC; #elif defined(__sparc) elf_file.ehdr.e_machine = EM_SPARC; #elif defined(__i386) || defined(__amd64) @@ -667,19 +666,18 @@ #else elf_file.ehdr.e_ident[EI_DATA] = ELFDATA2LSB; #endif +#if defined(__FreeBSD__) + elf_file.ehdr.e_ident[EI_OSABI] = ELFOSABI_FREEBSD; +#endif elf_file.ehdr.e_type = ET_REL; #if defined(__arm__) -/* XXX */ -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); + elf_file.ehdr.e_machine = EM_ARM; #elif defined(__ia64__) -/* XXX */ -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); + elf_file.ehdr.e_machine = EM_IA_64; #elif defined(__mips__) -/* XXX */ -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); + elf_file.ehdr.e_machine = EM_MIPS; #elif defined(__powerpc__) -/* XXX */ -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); + elf_file.ehdr.e_machine = EM_PPC; #elif defined(__sparc) elf_file.ehdr.e_machine = EM_SPARCV9; #elif defined(__i386) || defined(__amd64) @@ -1127,18 +1125,12 @@ if (dtp->dt_oflags & DTRACE_O_LP64) { eclass = ELFCLASS64; -#if defined(__arm__) -/* XXX */ -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#elif defined(__ia64__) -/* XXX */ -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#if defined(__ia64__) + emachine1 = emachine2 = EM_IA_64; #elif defined(__mips__) -/* XXX */ -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); + emachine1 = emachine2 = EM_MIPS; #elif defined(__powerpc__) -/* XXX */ -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); + emachine1 = emachine2 = EM_PPC64; #elif defined(__sparc) emachine1 = emachine2 = EM_SPARCV9; #elif defined(__i386) || defined(__amd64) @@ -1148,21 +1140,15 @@ } else { eclass = ELFCLASS32; #if defined(__arm__) -/* XXX */ -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#elif defined(__ia64__) -/* XXX */ -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); + emachine1 = emachine2 = EM_ARM; #elif defined(__mips__) -/* XXX */ -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); + emachine1 = emachine2 = EM_MIPS; #elif defined(__powerpc__) -/* XXX */ -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); + emachine1 = emachine2 = EM_PPC; #elif defined(__sparc) emachine1 = EM_SPARC; emachine2 = EM_SPARC32PLUS; -#elif defined(__i386) || defined(__amd64) +#elif defined(__i386) || defined(__amd64) || defined(__ia64__) emachine1 = emachine2 = EM_386; #endif symsize = sizeof (Elf32_Sym); @@ -1492,7 +1478,6 @@ s++; } -printf("%s:%s(%d) call dt_provider_lookup\n",__FUNCTION__,__FILE__,__LINE__); if ((pvp = dt_provider_lookup(dtp, pname)) == NULL) { return (dt_link_error(dtp, elf, fd, bufs, "no such provider %s", pname)); @@ -1560,6 +1545,9 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags, const char *file, int objc, char *const objv[]) { +#if !defined(sun) + char tfile[PATH_MAX]; +#endif char drti[PATH_MAX]; dof_hdr_t *dof; int fd, status, i, cur; @@ -1567,6 +1555,11 @@ size_t len; int eprobes = 0, ret = 0; +#if !defined(sun) + /* XXX Should get a temp file name here. */ + snprintf(tfile, sizeof(tfile), "%s.tmp", file); +#endif + /* * A NULL program indicates a special use in which we just link * together a bunch of object files specified in objv and then @@ -1628,6 +1621,7 @@ if ((dof = dtrace_dof_create(dtp, pgp, dflags)) == NULL) return (-1); /* errno is set for us */ +#if defined(sun) /* * Create a temporary file and then unlink it if we're going to * combine it with drti.o later. We can still refer to it in child @@ -1637,6 +1631,11 @@ return (dt_link_error(dtp, NULL, -1, NULL, "failed to open %s: %s", file, strerror(errno))); } +#else + if ((fd = open(tfile, O_RDWR | O_CREAT | O_TRUNC, 0666)) == -1) + return (dt_link_error(dtp, NULL, -1, NULL, + "failed to open %s: %s", tfile, strerror(errno))); +#endif /* * If -xlinktype=DOF has been selected, just write out the DOF. @@ -1666,8 +1665,10 @@ } +#if defined(sun) if (!dtp->dt_lazyload) (void) unlink(file); +#endif if (dtp->dt_oflags & DTRACE_O_LP64) status = dump_elf64(dtp, dof, fd); @@ -1680,6 +1681,7 @@ } if (!dtp->dt_lazyload) { +#if defined(sun) const char *fmt = "%s -o %s -r -Blocal -Breduce /dev/fd/%d %s"; if (dtp->dt_oflags & DTRACE_O_LP64) { @@ -1696,7 +1698,34 @@ cmd = alloca(len); (void) snprintf(cmd, len, fmt, dtp->dt_ld_path, file, fd, drti); +#else + const char *fmt = "%s -o %s -r %s %s"; +#if defined(__amd64__) + /* + * Arches which default to 64-bit need to explicitly use + * the 32-bit library path. + */ + int use_32 = !(dtp->dt_oflags & DTRACE_O_LP64); +#else + /* + * Arches which are 32-bit only just use the normal + * library path. + */ + int use_32 = 0; +#endif + + (void) snprintf(drti, sizeof (drti), "/usr/lib%s/dtrace/drti.o", + use_32 ? "":"32"); + + len = snprintf(&tmp, 1, fmt, dtp->dt_ld_path, file, tfile, + drti) + 1; + + cmd = alloca(len); + + (void) snprintf(cmd, len, fmt, dtp->dt_ld_path, file, tfile, drti); +#endif + if ((status = system(cmd)) == -1) { ret = dt_link_error(dtp, NULL, -1, NULL, "failed to run %s: %s", dtp->dt_ld_path, @@ -1725,5 +1754,9 @@ done: dtrace_dof_destroy(dtp, dof); + +#if !defined(sun) + unlink(tfile); +#endif return (ret); } From owner-p4-projects@FreeBSD.ORG Sun Jan 13 04:43:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA27516A41B; Sun, 13 Jan 2008 04:43:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6908016A418 for ; Sun, 13 Jan 2008 04:43:09 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7298913C442 for ; Sun, 13 Jan 2008 04:43:09 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D4h9ed050207 for ; Sun, 13 Jan 2008 04:43:09 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D4h935050203 for perforce@freebsd.org; Sun, 13 Jan 2008 04:43:09 GMT (envelope-from imp@freebsd.org) Date: Sun, 13 Jan 2008 04:43:09 GMT Message-Id: <200801130443.m0D4h935050203@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133160 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 04:43:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=133160 Change 133160 by imp@imp_mbp on 2008/01/13 04:42:45 Remove redindant declaration of WEAK_REFERENCE. Other #defines don't need to be defined only when compiling elf. Assume __STDC__ since we don't support any compilers that don't set it. This is semi-lame at this stage of the game, but I was on the plane and couldn't resist. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/asm.h#7 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/asm.h#7 (text+ko) ==== @@ -121,25 +121,11 @@ #define AENT(x) #endif -#ifdef __ELF__ -#define WEAK_ALIAS(alias,sym) \ - .weak alias; \ - alias = sym -#endif - /* * WARN_REFERENCES: create a warning if the specified symbol is referenced - * (ELF only, and thus, no leading underscores). */ -#ifdef __ELF__ -#ifdef __STDC__ #define WARN_REFERENCES(_sym,_msg) \ .section .gnu.warning. ## _sym ; .ascii _msg ; .text -#else -#define WARN_REFERENCES(_sym,_msg) \ - .section .gnu.warning./**/_sym ; .ascii _msg ; .text -#endif /* __STDC__ */ -#endif /* __ELF__ */ /* * These are temp registers whose names can be used in either the old @@ -164,11 +150,7 @@ #ifdef __ELF__ # define _C_LABEL(x) x #else -# ifdef __STDC__ # define _C_LABEL(x) _ ## x -# else -# define _C_LABEL(x) _/**/x -# endif #endif /* @@ -287,15 +269,9 @@ .ent _C_LABEL(x),0; \ EXPORT(x); \ -#ifdef __STDC__ #define VECTOR_END(x) \ EXPORT(x ## End); \ END(x) -#else -#define VECTOR_END(x) \ - EXPORT(x/**/End); \ - END(x) -#endif #define KSEG0TEXT_START #define KSEG0TEXT_END From owner-p4-projects@FreeBSD.ORG Sun Jan 13 04:51:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2080516A420; Sun, 13 Jan 2008 04:51:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0E8BF16A419 for ; Sun, 13 Jan 2008 04:51:20 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 187B113C448 for ; Sun, 13 Jan 2008 04:51:20 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D4pHHw060282 for ; Sun, 13 Jan 2008 04:51:17 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D4pHfa060279 for perforce@freebsd.org; Sun, 13 Jan 2008 04:51:17 GMT (envelope-from imp@freebsd.org) Date: Sun, 13 Jan 2008 04:51:17 GMT Message-Id: <200801130451.m0D4pHfa060279@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133161 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 04:51:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=133161 Change 133161 by imp@imp_mbp on 2008/01/13 04:51:00 Make the juniper locore.S match the mips2 world better. Adopt some code from the mips2 branch and try harder to preserve a0..a3 for platform_init... The juniper code supports SMP, and some of that code uses a0..a2. That needs to be resolved in a future commit. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#7 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#7 (text+ko) ==== @@ -91,12 +91,53 @@ _C_LABEL(_start): _C_LABEL(btext): VECTOR(_locore, unknown) + /* UNSAFE TO USE a0..a3, since some bootloaders pass that to us */ + # Keep firmware exception handlers until the kernel sets up its own # exception handlers. li v0, SR_BOOT_EXC_VEC mtc0 v0, COP_0_STATUS_REG # Disable interrupts. mtc0 zero, COP_0_CAUSE_REG # Clear soft interrupts + /* + * t0: Bits to preserve if set: + * Soft reset + * Boot exception vectors (firmware-provided) + */ + li t0, (MIPS_SR_BEV | MIPS_SR_SOFT_RESET) + + /* + * t1: Bits to set explicitly: + * Enable FPU + */ + li t1, MIPS_SR_COP_1_BIT + + /* + * Read coprocessor 0 status register, clear bits not + * preserved (namely, clearing interrupt bits), and set + * bits we want to explicitly set. + */ + mfc0 t2, MIPS_COP_0_STATUS + and t2, t0 + or t2, t1 + mtc0 t2, MIPS_COP_0_STATUS + COP0_SYNC + /* Extra nops for the FPU to spin up. */ + + /* Read and store the PrID FPU ID for CPU identification. */ + mfc0 t0, MIPS_COP_0_PRID +#ifndef CPU_NOFPU + cfc1 t1, MIPS_FPU_ID +#else + /* + * This platform has no FPU, and attempting to detect one + * using the official method causes an exception. + */ + li t1, 0x0 +#endif + sw t0, cpu_id + sw t1, fpu_id + /* * Initialize stack and call machine startup. */ @@ -118,10 +159,7 @@ sw a2, cfe_vector /* Firmware entry vector */ no_cfe: #endif - /* reset count register to 1 on each CPU */ - li a0, 1 - mtc0 a0, COP_0_COUNT - nop + /* * Block all the slave CPUs */ @@ -152,24 +190,14 @@ bne a2, zero, start_secondary nop -/*XXXimp: should call platform_start here and also port over the - platform specific code. */ - jal _C_LABEL(mips_init) # mips_init(argc, argv, envp) + /* Call the platform-specific startup code. */ + jal platform_start sw zero, START_FRAME - 8(sp) # Zero out old fp for debugger nop - mfc0 t0, COP_0_STATUS_REG - or t0, SR_COP_1_BIT - mtc0 t0, COP_0_STATUS_REG # enable the fp coprocessor + la sp, _C_LABEL(thread0) lw a0, TD_PCB(sp) subu sp, a0, START_FRAME - nop - nop # wait for new status to - nop - nop - nop # wait for new status to - nop # to be effective - nop mfc0 t1, COP_0_CONFIG, 1 # Check FPU present or not andi t1, 0x1 beqz t1, no_fpu From owner-p4-projects@FreeBSD.ORG Sun Jan 13 05:16:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8633E16A468; Sun, 13 Jan 2008 05:16:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 41F2116A419 for ; Sun, 13 Jan 2008 05:16:44 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 36EC113C465 for ; Sun, 13 Jan 2008 05:16:44 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D5Gh2b065202 for ; Sun, 13 Jan 2008 05:16:44 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D5Ghid065199 for perforce@freebsd.org; Sun, 13 Jan 2008 05:16:43 GMT (envelope-from imp@freebsd.org) Date: Sun, 13 Jan 2008 05:16:43 GMT Message-Id: <200801130516.m0D5Ghid065199@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133162 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 05:16:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=133162 Change 133162 by imp@imp_lighthouse on 2008/01/13 05:16:43 Missing include Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#8 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#8 (text+ko) ==== @@ -67,6 +67,7 @@ #include #include +#include #include #include "assym.s" From owner-p4-projects@FreeBSD.ORG Sun Jan 13 05:24:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AE6916A420; Sun, 13 Jan 2008 05:24:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C4DE116A41A for ; Sun, 13 Jan 2008 05:24:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BA33F13C459 for ; Sun, 13 Jan 2008 05:24:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D5OqO4066571 for ; Sun, 13 Jan 2008 05:24:52 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D5OqQN066568 for perforce@freebsd.org; Sun, 13 Jan 2008 05:24:52 GMT (envelope-from jb@freebsd.org) Date: Sun, 13 Jan 2008 05:24:52 GMT Message-Id: <200801130524.m0D5OqQN066568@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133163 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 05:24:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=133163 Change 133163 by jb@jb_freebsd1 on 2008/01/13 05:24:48 Add kern_sdt.c for the Statically Defined Tracing backend. Affected files ... .. //depot/projects/dtrace/src/sys/conf/files#63 edit Differences ... ==== //depot/projects/dtrace/src/sys/conf/files#63 (text+ko) ==== @@ -1455,6 +1455,7 @@ kern/kern_resource.c standard kern/kern_rmlock.c standard kern/kern_rwlock.c standard +kern/kern_sdt.c optional kdtrace_hooks kern/kern_sema.c standard kern/kern_shutdown.c standard kern/kern_sig.c standard From owner-p4-projects@FreeBSD.ORG Sun Jan 13 06:21:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5854616A469; Sun, 13 Jan 2008 06:21:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1DD5316A421 for ; Sun, 13 Jan 2008 06:21:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 17AA413C4DD for ; Sun, 13 Jan 2008 06:21:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D6Lpbx089450 for ; Sun, 13 Jan 2008 06:21:51 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D6Lpcw089447 for perforce@freebsd.org; Sun, 13 Jan 2008 06:21:51 GMT (envelope-from jb@freebsd.org) Date: Sun, 13 Jan 2008 06:21:51 GMT Message-Id: <200801130621.m0D6Lpcw089447@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133164 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 06:21:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=133164 Change 133164 by jb@jb_freebsd1 on 2008/01/13 06:21:27 Add the Statically Define Trace (sdt) provider to the build. Affected files ... .. //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#23 edit Differences ... ==== //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#23 (text+ko) ==== @@ -8,6 +8,7 @@ dtraceall \ profile \ prototype \ + sdt \ systrace .if ${MACHINE_ARCH} == "amd64" From owner-p4-projects@FreeBSD.ORG Sun Jan 13 06:23:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E54816A41A; Sun, 13 Jan 2008 06:23:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 43F6016A418 for ; Sun, 13 Jan 2008 06:23:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5676313C448 for ; Sun, 13 Jan 2008 06:23:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D6NsUI090051 for ; Sun, 13 Jan 2008 06:23:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D6NsnA090048 for perforce@freebsd.org; Sun, 13 Jan 2008 06:23:54 GMT (envelope-from jb@freebsd.org) Date: Sun, 13 Jan 2008 06:23:54 GMT Message-Id: <200801130623.m0D6NsnA090048@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133165 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 06:23:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=133165 Change 133165 by jb@jb_freebsd1 on 2008/01/13 06:22:57 Include the Statically Define Trace (sdt) module in the list of dependencies so that it is part of the set of DTrace modules that are loaded and unloaded together. Affected files ... .. //depot/projects/dtrace/src/sys/modules/dtrace/dtraceall/dtraceall.c#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/modules/dtrace/dtraceall/dtraceall.c#3 (text+ko) ==== @@ -67,5 +67,6 @@ #if defined(__amd64__) || defined(__i386__) MODULE_DEPEND(dtraceall, fbt, 1, 1, 1); #endif +MODULE_DEPEND(dtraceall, sdt, 1, 1, 1); MODULE_DEPEND(dtraceall, systrace, 1, 1, 1); MODULE_DEPEND(dtraceall, profile, 1, 1, 1); From owner-p4-projects@FreeBSD.ORG Sun Jan 13 06:24:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4D3016A41A; Sun, 13 Jan 2008 06:24:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8962A16A417 for ; Sun, 13 Jan 2008 06:24:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8384B13C442 for ; Sun, 13 Jan 2008 06:24:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D6OtZW090228 for ; Sun, 13 Jan 2008 06:24:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D6OtKK090225 for perforce@freebsd.org; Sun, 13 Jan 2008 06:24:55 GMT (envelope-from jb@freebsd.org) Date: Sun, 13 Jan 2008 06:24:55 GMT Message-Id: <200801130624.m0D6OtKK090225@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133166 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 06:24:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=133166 Change 133166 by jb@jb_freebsd1 on 2008/01/13 06:24:27 Remove some obsolete code. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/prototype.c#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/prototype.c#7 (text+ko) ==== @@ -103,8 +103,6 @@ static void prototype_provide(void *arg, dtrace_probedesc_t *desc) { - DTRACE_PROBE(entry); - DTRACE_PROBE(ret); } /* ARGSUSED */ From owner-p4-projects@FreeBSD.ORG Sun Jan 13 06:58:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1BFA16A420; Sun, 13 Jan 2008 06:58:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6765616A417 for ; Sun, 13 Jan 2008 06:58:38 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6405B13C442 for ; Sun, 13 Jan 2008 06:58:38 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D6wclk002264 for ; Sun, 13 Jan 2008 06:58:38 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D6wcsR002261 for perforce@freebsd.org; Sun, 13 Jan 2008 06:58:38 GMT (envelope-from imp@freebsd.org) Date: Sun, 13 Jan 2008 06:58:38 GMT Message-Id: <200801130658.m0D6wcsR002261@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133168 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 06:58:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=133168 Change 133168 by imp@imp_mbp on 2008/01/13 06:57:58 Simple todo list. Should be a lot longer than it is. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/TODO#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jan 13 07:49:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6596E16A498; Sun, 13 Jan 2008 07:49:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 28E5E16A480 for ; Sun, 13 Jan 2008 07:49:36 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4066513C44B for ; Sun, 13 Jan 2008 07:49:36 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D7naql010711 for ; Sun, 13 Jan 2008 07:49:36 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D7nZF4010707 for perforce@freebsd.org; Sun, 13 Jan 2008 07:49:35 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 Jan 2008 07:49:35 GMT Message-Id: <200801130749.m0D7nZF4010707@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 133171 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 07:49:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=133171 Change 133171 by sephe@sephe_zealot:sam_wifi on 2008/01/13 07:48:46 Brief: - Make LED work - Correct channel TX power - Set TX_BUSY after TX desc is fully setup - Rework TX/TX_DMA interrupt processing (*) - Correct value of TX desc flags (*) - TXRX_CSR5 stores ack rates instead of basic rates (*) should make 2661D parts work as expected Obtained-from: DragonFly Affected files ... .. //depot/projects/wifi/sys/dev/ral/rt2661.c#19 edit .. //depot/projects/wifi/sys/dev/ral/rt2661reg.h#4 edit .. //depot/projects/wifi/sys/dev/ral/rt2661var.h#7 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#64 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#42 edit Differences ... ==== //depot/projects/wifi/sys/dev/ral/rt2661.c#19 (text) ==== @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -69,13 +70,15 @@ #ifdef RAL_DEBUG #define DPRINTF(x) do { if (ral_debug > 0) printf x; } while (0) #define DPRINTFN(n, x) do { if (ral_debug >= (n)) printf x; } while (0) -int ral_debug = 0; +int ral_debug = 1; SYSCTL_INT(_debug, OID_AUTO, ral, CTLFLAG_RW, &ral_debug, 0, "ral debug level"); #else #define DPRINTF(x) #define DPRINTFN(n, x) #endif +MALLOC_DEFINE(M_RT2661, "rt2661_ratectl", "rt2661 rate control data"); + static void rt2661_dma_map_addr(void *, bus_dma_segment_t *, int, int); static int rt2661_alloc_tx_ring(struct rt2661_softc *, @@ -112,7 +115,7 @@ static uint8_t rt2661_plcp_signal(int); static void rt2661_setup_tx_desc(struct rt2661_softc *, struct rt2661_tx_desc *, uint32_t, uint16_t, int, - int, const bus_dma_segment_t *, int, int); + int, const bus_dma_segment_t *, int, int, int); static struct mbuf * rt2661_get_rts(struct rt2661_softc *, struct ieee80211_frame *, uint16_t); static int rt2661_tx_data(struct rt2661_softc *, struct mbuf *, @@ -133,7 +136,7 @@ static void rt2661_select_antenna(struct rt2661_softc *); static void rt2661_enable_mrr(struct rt2661_softc *); static void rt2661_set_txpreamble(struct rt2661_softc *); -static void rt2661_set_basicrates(struct rt2661_softc *, +static void rt2661_set_ackrates(struct rt2661_softc *, const struct ieee80211_rateset *); static void rt2661_select_band(struct rt2661_softc *, struct ieee80211_channel *); @@ -147,7 +150,7 @@ static int rt2661_wme_update(struct ieee80211com *) __unused; static void rt2661_update_slot(struct ifnet *); static const char *rt2661_get_rf(int); -static void rt2661_read_eeprom(struct rt2661_softc *); +static void rt2661_read_config(struct rt2661_softc *); static int rt2661_bbp_init(struct rt2661_softc *); static void rt2661_init(void *); static void rt2661_stop(void *); @@ -162,6 +165,10 @@ static int rt2661_prepare_beacon(struct rt2661_softc *); static void rt2661_enable_tsf_sync(struct rt2661_softc *); static int rt2661_get_rssi(struct rt2661_softc *, uint8_t); +static void rt2661_led_newstate(struct rt2661_softc *, + enum ieee80211_state); +static void rt2661_read_txpower_config(struct rt2661_softc *, + uint8_t, int, int *); static const struct { uint32_t reg; @@ -186,6 +193,25 @@ RT2661_RF5225_2 }; +#define LED_EE2MCU(bit) { \ + .ee_bit = RT2661_EE_LED_##bit, \ + .mcu_bit = RT2661_MCU_LED_##bit \ +} +static const struct { + uint16_t ee_bit; + uint16_t mcu_bit; +} led_ee2mcu[] = { + LED_EE2MCU(RDYG), + LED_EE2MCU(RDYA), + LED_EE2MCU(ACT), + LED_EE2MCU(GPIO0), + LED_EE2MCU(GPIO1), + LED_EE2MCU(GPIO2), + LED_EE2MCU(GPIO3), + LED_EE2MCU(GPIO4) +}; +#undef LED_EE2MCU + int rt2661_attach(device_t dev, int id) { @@ -200,6 +226,7 @@ mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); + STAILQ_INIT(&sc->tx_ratectl); callout_init_mtx(&sc->watchdog_ch, &sc->sc_mtx, 0); callout_init(&sc->rssadapt_ch, CALLOUT_MPSAFE); @@ -218,7 +245,7 @@ } /* retrieve RF rev. no and various other things from EEPROM */ - rt2661_read_eeprom(sc); + rt2661_read_config(sc); device_printf(dev, "MAC/BBP RT%X, RF %s\n", val, rt2661_get_rf(sc->rf_rev)); @@ -293,6 +320,7 @@ ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ ic->ic_opmode = IEEE80211_M_STA; /* default to BSS mode */ ic->ic_state = IEEE80211_S_INIT; + rt2661_led_newstate(sc, IEEE80211_S_INIT); /* set device capabilities */ ic->ic_caps = @@ -443,7 +471,7 @@ ring->count = count; ring->queued = 0; - ring->cur = ring->next = ring->stat = 0; + ring->cur = ring->next = 0; error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 4, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, @@ -469,7 +497,7 @@ goto fail; } - ring->data = malloc(count * sizeof (struct rt2661_tx_data), M_DEVBUF, + ring->data = malloc(count * sizeof(struct rt2661_data), M_DEVBUF, M_NOWAIT | M_ZERO); if (ring->data == NULL) { device_printf(sc->sc_dev, "could not allocate soft data\n"); @@ -504,7 +532,7 @@ rt2661_reset_tx_ring(struct rt2661_softc *sc, struct rt2661_tx_ring *ring) { struct rt2661_tx_desc *desc; - struct rt2661_tx_data *data; + struct rt2661_data *data; int i; for (i = 0; i < ring->count; i++) { @@ -519,24 +547,19 @@ data->m = NULL; } - if (data->ni != NULL) { - ieee80211_free_node(data->ni); - data->ni = NULL; - } - desc->flags = 0; } bus_dmamap_sync(ring->desc_dmat, ring->desc_map, BUS_DMASYNC_PREWRITE); ring->queued = 0; - ring->cur = ring->next = ring->stat = 0; + ring->cur = ring->next = 0; } static void rt2661_free_tx_ring(struct rt2661_softc *sc, struct rt2661_tx_ring *ring) { - struct rt2661_tx_data *data; + struct rt2661_data *data; int i; if (ring->desc != NULL) { @@ -560,9 +583,6 @@ m_freem(data->m); } - if (data->ni != NULL) - ieee80211_free_node(data->ni); - if (data->map != NULL) bus_dmamap_destroy(ring->data_dmat, data->map); } @@ -579,7 +599,7 @@ int count) { struct rt2661_rx_desc *desc; - struct rt2661_rx_data *data; + struct rt2661_data *data; bus_addr_t physaddr; int i, error; @@ -610,7 +630,7 @@ goto fail; } - ring->data = malloc(count * sizeof (struct rt2661_rx_data), M_DEVBUF, + ring->data = malloc(count * sizeof(struct rt2661_data), M_DEVBUF, M_NOWAIT | M_ZERO); if (ring->data == NULL) { device_printf(sc->sc_dev, "could not allocate soft data\n"); @@ -684,7 +704,7 @@ static void rt2661_free_rx_ring(struct rt2661_softc *sc, struct rt2661_rx_ring *ring) { - struct rt2661_rx_data *data; + struct rt2661_data *data; int i; if (ring->desc != NULL) { @@ -786,6 +806,9 @@ ostate = ic->ic_state; + if (ostate != nstate) + rt2661_led_newstate(sc, nstate); + switch (nstate) { case IEEE80211_S_INIT: callout_stop(&sc->rssadapt_ch); @@ -802,7 +825,7 @@ if (ic->ic_opmode != IEEE80211_M_MONITOR) { rt2661_enable_mrr(sc); rt2661_set_txpreamble(sc); - rt2661_set_basicrates(sc, &ni->ni_rates); + rt2661_set_ackrates(sc, &ni->ni_rates); rt2661_set_bssid(sc, ni->ni_bssid); } @@ -891,90 +914,86 @@ { struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = ic->ic_ifp; - struct rt2661_tx_ring *txq; - struct rt2661_tx_data *data; + struct rt2661_tx_ratectl *rctl; struct rt2661_node *rn; - uint32_t val; - int qid, retrycnt; + uint32_t val, result; + int retrycnt; for (;;) { - struct ieee80211_node *ni; - struct mbuf *m; - val = RAL_READ(sc, RT2661_STA_CSR4); if (!(val & RT2661_TX_STAT_VALID)) break; - /* retrieve the queue in which this frame was sent */ - qid = RT2661_TX_QID(val); - txq = (qid <= 3) ? &sc->txq[qid] : &sc->mgtq; + /* Gather statistics */ + result = RT2661_TX_RESULT(val); + if (result == RT2661_TX_SUCCESS) + ifp->if_opackets++; + else + ifp->if_oerrors++; + + /* No rate control */ + if (RT2661_TX_QID(val) == 0) + continue; /* retrieve rate control algorithm context */ - data = &txq->data[txq->stat]; - m = data->m; - data->m = NULL; - ni = data->ni; - data->ni = NULL; - - /* if no frame has been sent, ignore */ - if (ni == NULL) + rctl = STAILQ_FIRST(&sc->tx_ratectl); + if (rctl == NULL) { + /* + * XXX + * This really should not happen. Maybe we should + * use assertion here? But why should we rely on + * hardware to do the correct things? Even the + * reference driver (RT61?) provided by Ralink does + * not provide enough clue that this kind of interrupt + * is promised to be generated for each packet. So + * just print a message and keep going ... + */ + if_printf(ifp, "WARNING: no rate control information\n"); continue; + } + STAILQ_REMOVE_HEAD(&sc->tx_ratectl, link); - rn = (struct rt2661_node *)ni; + rn = (struct rt2661_node *)rctl->ni; - switch (RT2661_TX_RESULT(val)) { + switch (result) { case RT2661_TX_SUCCESS: retrycnt = RT2661_TX_RETRYCNT(val); DPRINTFN(10, ("data frame sent successfully after " "%d retries\n", retrycnt)); - if (retrycnt == 0 && data->id.id_node != NULL) { + if (retrycnt == 0 && rctl->id.id_node != NULL) { ral_rssadapt_raise_rate(ic, &rn->rssadapt, - &data->id); + &rctl->id); } - ifp->if_opackets++; break; case RT2661_TX_RETRY_FAIL: DPRINTFN(9, ("sending data frame failed (too much " "retries)\n")); - if (data->id.id_node != NULL) { - ral_rssadapt_lower_rate(ic, ni, - &rn->rssadapt, &data->id); - } - ifp->if_oerrors++; + if (rctl->id.id_node != NULL) { + ral_rssadapt_lower_rate(ic, rctl->ni, + &rn->rssadapt, &rctl->id); + } break; default: /* other failure */ device_printf(sc->sc_dev, "sending data frame failed 0x%08x\n", val); - ifp->if_oerrors++; + break; } - DPRINTFN(15, ("tx done q=%d idx=%u\n", qid, txq->stat)); - - txq->queued--; - if (++txq->stat >= txq->count) /* faster than % count */ - txq->stat = 0; - - if (m->m_flags & M_TXCB) - ieee80211_process_callback(ni, m, - RT2661_TX_RESULT(val) != RT2661_TX_SUCCESS); - m_freem(m); - ieee80211_free_node(ni); + ieee80211_free_node(rctl->ni); + rctl->ni = NULL; + free(rctl, M_RT2661); } - - sc->sc_tx_timer = 0; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - rt2661_start(ifp); } static void rt2661_tx_dma_intr(struct rt2661_softc *sc, struct rt2661_tx_ring *txq) { struct rt2661_tx_desc *desc; - struct rt2661_tx_data *data; + struct rt2661_data *data; bus_dmamap_sync(txq->desc_dmat, txq->desc_map, BUS_DMASYNC_POSTREAD); @@ -989,17 +1008,28 @@ bus_dmamap_sync(txq->data_dmat, data->map, BUS_DMASYNC_POSTWRITE); bus_dmamap_unload(txq->data_dmat, data->map); + m_freem(data->m); + data->m = NULL; /* descriptor is no longer valid */ desc->flags &= ~htole32(RT2661_TX_VALID); DPRINTFN(15, ("tx dma done q=%p idx=%u\n", txq, txq->next)); + txq->queued--; if (++txq->next >= txq->count) /* faster than % count */ txq->next = 0; } bus_dmamap_sync(txq->desc_dmat, txq->desc_map, BUS_DMASYNC_PREWRITE); + + if (txq->queued < txq->count) { + struct ifnet *ifp = sc->sc_ic.ic_ifp; + + sc->sc_tx_timer = 0; + ifp->if_flags &= ~IFF_DRV_OACTIVE; + rt2661_start(ifp); + } } static void @@ -1008,7 +1038,7 @@ struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = ic->ic_ifp; struct rt2661_rx_desc *desc; - struct rt2661_rx_data *data; + struct rt2661_data *data; bus_addr_t physaddr; struct ieee80211_frame *wh; struct ieee80211_node *ni; @@ -1020,27 +1050,27 @@ BUS_DMASYNC_POSTREAD); for (;;) { + uint32_t flags; int rssi; desc = &sc->rxq.desc[sc->rxq.cur]; data = &sc->rxq.data[sc->rxq.cur]; + flags = le32toh(desc->flags); - if (le32toh(desc->flags) & RT2661_RX_BUSY) + if (flags & RT2661_RX_BUSY) break; - if ((le32toh(desc->flags) & RT2661_RX_PHY_ERROR) || - (le32toh(desc->flags) & RT2661_RX_CRC_ERROR)) { + if (flags & RT2661_RX_CRC_ERROR) { /* * This should not happen since we did not request * to receive those frames when we filled TXRX_CSR0. */ - DPRINTFN(5, ("PHY or CRC error flags 0x%08x\n", - le32toh(desc->flags))); + DPRINTFN(5, ("CRC error flags 0x%08x\n", flags)); ifp->if_ierrors++; goto skip; } - if ((le32toh(desc->flags) & RT2661_RX_CIPHER_MASK) != 0) { + if (flags & RT2661_RX_CIPHER_MASK) { ifp->if_ierrors++; goto skip; } @@ -1091,8 +1121,7 @@ /* finalize mbuf */ m->m_pkthdr.rcvif = ifp; - m->m_pkthdr.len = m->m_len = - (le32toh(desc->flags) >> 16) & 0xfff; + m->m_pkthdr.len = m->m_len = (flags >> 16) & 0xfff; rssi = rt2661_get_rssi(sc, desc->rssi); @@ -1364,7 +1393,7 @@ static void rt2661_setup_tx_desc(struct rt2661_softc *sc, struct rt2661_tx_desc *desc, uint32_t flags, uint16_t xflags, int len, int rate, - const bus_dma_segment_t *segs, int nsegs, int ac) + const bus_dma_segment_t *segs, int nsegs, int ac, int ratectl) { struct ieee80211com *ic = &sc->sc_ic; uint16_t plcp_length; @@ -1372,7 +1401,7 @@ desc->flags = htole32(flags); desc->flags |= htole32(len << 16); - desc->flags |= htole32(RT2661_TX_BUSY | RT2661_TX_VALID); + desc->flags |= htole32(RT2661_TX_VALID); desc->xflags = htole16(xflags); desc->xflags |= htole16(nsegs << 13); @@ -1384,11 +1413,11 @@ RT2661_LOGCWMAX(10)); /* - * Remember in which queue this frame was sent. This field is driver - * private data only. It will be made available by the NIC in STA_CSR4 - * on Tx interrupts. + * Remember whether TX rate control information should be gathered. + * This field is driver private data only. It will be made available + * by the NIC in STA_CSR4 on Tx done interrupts. */ - desc->qid = ac; + desc->qid = ratectl; /* setup PLCP fields */ desc->plcp_signal = rt2661_plcp_signal(rate); @@ -1420,6 +1449,8 @@ desc->addr[i] = htole32(segs[i].ds_addr); desc->len [i] = htole16(segs[i].ds_len); } + + desc->flags |= htole32(RT2661_TX_BUSY); } static int @@ -1428,7 +1459,7 @@ { struct ieee80211com *ic = &sc->sc_ic; struct rt2661_tx_desc *desc; - struct rt2661_tx_data *data; + struct rt2661_data *data; struct ieee80211_frame *wh; struct ieee80211_key *k; bus_dma_segment_t segs[RT2661_MAX_SCATTER]; @@ -1473,7 +1504,6 @@ } data->m = m0; - data->ni = ni; wh = mtod(m0, struct ieee80211_frame *); @@ -1492,7 +1522,7 @@ } rt2661_setup_tx_desc(sc, desc, flags, 0 /* XXX HWSEQ */, - m0->m_pkthdr.len, rate, segs, nsegs, RT2661_QID_MGT); + m0->m_pkthdr.len, rate, segs, nsegs, RT2661_QID_MGT, 0); bus_dmamap_sync(sc->mgtq.data_dmat, data->map, BUS_DMASYNC_PREWRITE); bus_dmamap_sync(sc->mgtq.desc_dmat, sc->mgtq.desc_map, @@ -1506,6 +1536,8 @@ sc->mgtq.cur = (sc->mgtq.cur + 1) % RT2661_MGT_RING_COUNT; RAL_WRITE(sc, RT2661_TX_CNTL_CSR, RT2661_KICK_MGT); + ieee80211_free_node(ni); + return 0; } @@ -1547,7 +1579,8 @@ struct ieee80211com *ic = &sc->sc_ic; struct rt2661_tx_ring *txq = &sc->txq[ac]; struct rt2661_tx_desc *desc; - struct rt2661_tx_data *data; + struct rt2661_data *data; + struct rt2661_tx_ratectl *rctl; struct rt2661_node *rn; struct ieee80211_frame *wh; struct ieee80211_key *k; @@ -1624,18 +1657,11 @@ return error; } - /* avoid multiple free() of the same node for each fragment */ - ieee80211_ref_node(ni); - data->m = m; - data->ni = ni; - - /* RTS frames are not taken into account for rssadapt */ - data->id.id_node = NULL; rt2661_setup_tx_desc(sc, desc, RT2661_TX_NEED_ACK | RT2661_TX_MORE_FRAG, 0, m->m_pkthdr.len, rtsrate, segs, - nsegs, ac); + nsegs, ac, 0); bus_dmamap_sync(txq->data_dmat, data->map, BUS_DMASYNC_PREWRITE); @@ -1697,16 +1723,22 @@ } data->m = m0; - data->ni = ni; + + rctl = malloc(sizeof(*rctl), M_RT2661, M_NOWAIT); + if (rctl != NULL) { + rctl->ni = ni; - /* remember link conditions for rate adaptation algorithm */ - if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE) { - data->id.id_len = m0->m_pkthdr.len; - data->id.id_rateidx = ni->ni_txrate; - data->id.id_node = ni; - data->id.id_rssi = ni->ni_rssi; - } else - data->id.id_node = NULL; + /* remember link conditions for rate adaptation algorithm */ + if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE) { + rctl->id.id_len = m0->m_pkthdr.len; + rctl->id.id_rateidx = ni->ni_txrate; + rctl->id.id_node = ni; + rctl->id.id_rssi = ni->ni_rssi; + } else { + rctl->id.id_node = NULL; + } + STAILQ_INSERT_TAIL(&sc->tx_ratectl, rctl, link); + } if (!noack && !IEEE80211_IS_MULTICAST(wh->i_addr1)) { flags |= RT2661_TX_NEED_ACK; @@ -1717,7 +1749,7 @@ } rt2661_setup_tx_desc(sc, desc, flags, 0, m0->m_pkthdr.len, rate, segs, - nsegs, ac); + nsegs, ac, rctl != NULL); bus_dmamap_sync(txq->data_dmat, data->map, BUS_DMASYNC_PREWRITE); bus_dmamap_sync(txq->desc_dmat, txq->desc_map, BUS_DMASYNC_PREWRITE); @@ -1730,6 +1762,9 @@ txq->cur = (txq->cur + 1) % RT2661_TX_RING_COUNT; RAL_WRITE(sc, RT2661_TX_CNTL_CSR, 1 << ac); + if (rctl == NULL) + ieee80211_free_node(ni); + return 0; } @@ -2067,7 +2102,7 @@ { 12, { 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108 } }; static void -rt2661_set_basicrates(struct rt2661_softc *sc, +rt2661_set_ackrates(struct rt2661_softc *sc, const struct ieee80211_rateset *rs) { #define RV(r) ((r) & IEEE80211_RATE_VAL) @@ -2091,9 +2126,22 @@ mask |= 1 << j; } + if (IEEE80211_IS_CHAN_ANYG(ic->ic_curchan) && + ieee80211_iserp_rateset(ic, rs)) { + /* + * Always set following rates as ACK rates to conform + * IEEE Std 802.11g-2003 clause 9.6 + * + * 24Mbits/s 0x100 + * 12Mbits/s 0x040 + * 6Mbits/s 0x010 + */ + mask |= 0x150; + } + RAL_WRITE(sc, RT2661_TXRX_CSR5, mask); - DPRINTF(("Setting basic rate mask to 0x%x\n", mask)); + DPRINTF(("Setting ack rate mask to 0x%x\n", mask)); #undef RV } @@ -2333,11 +2381,11 @@ } static void -rt2661_read_eeprom(struct rt2661_softc *sc) +rt2661_read_config(struct rt2661_softc *sc) { struct ieee80211com *ic = &sc->sc_ic; uint16_t val; - int i; + int i, start_chan; /* read MAC address */ val = rt2661_eeprom_read(sc, RT2661_EEPROM_MAC01); @@ -2402,16 +2450,18 @@ DPRINTF(("RF prog=%d\nRF freq=%d\n", sc->rfprog, sc->rffreq)); - /* read Tx power for all a/b/g channels */ - for (i = 0; i < 19; i++) { - val = rt2661_eeprom_read(sc, RT2661_EEPROM_TXPOWER + i); - sc->txpow[i * 2] = (int8_t)(val >> 8); /* signed */ - DPRINTF(("Channel=%d Tx power=%d\n", - rt2661_rf5225_1[i * 2].chan, sc->txpow[i * 2])); - sc->txpow[i * 2 + 1] = (int8_t)(val & 0xff); /* signed */ - DPRINTF(("Channel=%d Tx power=%d\n", - rt2661_rf5225_1[i * 2 + 1].chan, sc->txpow[i * 2 + 1])); - } +#define NCHAN_2GHZ 14 +#define NCHAN_5GHZ 24 + /* + * Read channel TX power + */ + start_chan = 0; + rt2661_read_txpower_config(sc, RT2661_EEPROM_TXPOWER_2GHZ, + NCHAN_2GHZ, &start_chan); + rt2661_read_txpower_config(sc, RT2661_EEPROM_TXPOWER_5GHZ, + NCHAN_5GHZ, &start_chan); +#undef NCHAN_2GHZ +#undef NCHAN_5GHZ /* read vendor-specific BBP values */ for (i = 0; i < 16; i++) { @@ -2423,6 +2473,24 @@ DPRINTF(("BBP R%d=%02x\n", sc->bbp_prom[i].reg, sc->bbp_prom[i].val)); } + + val = rt2661_eeprom_read(sc, RT2661_EEPROM_LED_OFFSET); + DPRINTF(("LED %02x\n", val)); + if (val == 0xffff) { + sc->mcu_led = RT2661_MCU_LED_DEFAULT; + } else { +#define N(arr) (int)(sizeof(arr) / sizeof(arr[0])) + + for (i = 0; i < N(led_ee2mcu); ++i) { + if (val & led_ee2mcu[i].ee_bit) + sc->mcu_led |= led_ee2mcu[i].mcu_bit; + } + +#undef N + + sc->mcu_led |= ((val >> RT2661_EE_LED_MODE_SHIFT) & + RT2661_EE_LED_MODE_MASK); + } } static int @@ -2610,6 +2678,7 @@ { struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = ic->ic_ifp; + struct rt2661_tx_ratectl *rctl; uint32_t tmp; volatile int *flags = &sc->sc_flags; @@ -2641,7 +2710,14 @@ /* clear any pending interrupt */ RAL_WRITE(sc, RT2661_INT_SOURCE_CSR, 0xffffffff); RAL_WRITE(sc, RT2661_MCU_INT_SOURCE_CSR, 0xffffffff); - + + while ((rctl = STAILQ_FIRST(&sc->tx_ratectl)) != NULL) { + STAILQ_REMOVE_HEAD(&sc->tx_ratectl, link); + ieee80211_free_node(rctl->ni); + rctl->ni = NULL; + free(rctl, M_RT2661); + } + /* reset Tx and Rx rings */ rt2661_reset_tx_ring(sc, &sc->txq[0]); rt2661_reset_tx_ring(sc, &sc->txq[1]); @@ -2824,7 +2900,7 @@ rate = IEEE80211_IS_CHAN_5GHZ(ic->ic_bss->ni_chan) ? 12 : 2; rt2661_setup_tx_desc(sc, &desc, RT2661_TX_TIMESTAMP, RT2661_TX_HWSEQ, - m0->m_pkthdr.len, rate, NULL, 0, RT2661_QID_MGT); + m0->m_pkthdr.len, rate, NULL, 0, RT2661_QID_MGT, 0); /* copy the first 24 bytes of Tx descriptor into NIC memory */ RAL_WRITE_REGION_1(sc, RT2661_HW_BEACON_BASE0, (uint8_t *)&desc, 24); @@ -2952,3 +3028,77 @@ RAL_UNLOCK(sc); } + +static void +rt2661_led_newstate(struct rt2661_softc *sc, enum ieee80211_state nstate) +{ + struct ieee80211com *ic = &sc->sc_ic; + uint32_t off, on; + uint32_t mail = sc->mcu_led; + + if (RAL_READ(sc, RT2661_H2M_MAILBOX_CSR) & RT2661_H2M_BUSY) { + DPRINTF(("%s failed\n", __func__)); + return; + } + + switch (nstate) { + case IEEE80211_S_INIT: + mail &= ~(RT2661_MCU_LED_LINKA | RT2661_MCU_LED_LINKG | + RT2661_MCU_LED_RF); + break; + default: + if (ic->ic_curchan == NULL) + return; + + on = RT2661_MCU_LED_LINKG; + off = RT2661_MCU_LED_LINKA; + if (IEEE80211_IS_CHAN_5GHZ(ic->ic_curchan)) { + on = RT2661_MCU_LED_LINKA; + off = RT2661_MCU_LED_LINKG; + } + + mail |= RT2661_MCU_LED_RF | on; + mail &= ~off; + break; + } + + RAL_WRITE(sc, RT2661_H2M_MAILBOX_CSR, + RT2661_H2M_BUSY | RT2661_TOKEN_NO_INTR << 16 | mail); + RAL_WRITE(sc, RT2661_HOST_CMD_CSR, RT2661_KICK_CMD | RT2661_MCU_SET_LED); +} + +static void +rt2661_read_txpower_config(struct rt2661_softc *sc, uint8_t txpwr_ofs, + int nchan, int *start_chan0) +{ + int i, loop_max; + int start_chan = *start_chan0; + + KASSERT(nchan % 2 == 0, ("number of channels %d is not even\n", nchan)); + KASSERT(start_chan + nchan <= RT2661_NCHAN_MAX, ("too many channels")); + + loop_max = nchan / 2; + + for (i = 0; i < loop_max; i++) { + int chan_idx, j; + uint16_t val; + + val = rt2661_eeprom_read(sc, txpwr_ofs + i); + chan_idx = i * 2 + start_chan; + + for (j = 0; j < 2; ++j) { + int8_t tx_power; /* signed */ + + tx_power = (int8_t)((val >> (8 * j)) & 0xff); + if (tx_power > RT2661_TXPOWER_MAX) + tx_power = RT2661_TXPOWER_DEFAULT; + + sc->txpow[chan_idx] = tx_power; + DPRINTF(("Channel=%d Tx power=%d\n", + rt2661_rf5225_1[chan_idx].chan, sc->txpow[chan_idx])); + + ++chan_idx; + } + } + *start_chan0 += nchan; +} ==== //depot/projects/wifi/sys/dev/ral/rt2661reg.h#4 (text) ==== @@ -161,9 +161,9 @@ #define RT2661_DROP_ACKCTS (1 << 25) /* possible flags for register TXRX_CSR4 */ -#define RT2661_SHORT_PREAMBLE (1 << 19) -#define RT2661_MRR_ENABLED (1 << 20) -#define RT2661_MRR_CCK_FALLBACK (1 << 23) +#define RT2661_SHORT_PREAMBLE (1 << 18) +#define RT2661_MRR_ENABLED (1 << 19) +#define RT2661_MRR_CCK_FALLBACK (1 << 22) /* possible flags for register TXRX_CSR9 */ #define RT2661_TSF_TICKING (1 << 16) @@ -265,8 +265,7 @@ #define RT2661_RX_DROP (1 << 1) #define RT2661_RX_CRC_ERROR (1 << 6) #define RT2661_RX_OFDM (1 << 7) -#define RT2661_RX_PHY_ERROR (1 << 8) -#define RT2661_RX_CIPHER_MASK 0x00000600 +#define RT2661_RX_CIPHER_MASK 0x00000300 uint8_t rate; uint8_t rssi; @@ -306,13 +305,46 @@ #define RT2661_EEPROM_ANTENNA 0x10 #define RT2661_EEPROM_CONFIG2 0x11 #define RT2661_EEPROM_BBP_BASE 0x13 -#define RT2661_EEPROM_TXPOWER 0x23 +#define RT2661_EEPROM_TXPOWER_2GHZ 0x23 #define RT2661_EEPROM_FREQ_OFFSET 0x2f +#define RT2661_EEPROM_LED_OFFSET 0x30 +#define RT2661_EEPROM_TXPOWER_5GHZ 0x31 #define RT2661_EEPROM_RSSI_2GHZ_OFFSET 0x4d #define RT2661_EEPROM_RSSI_5GHZ_OFFSET 0x4e +#define RT2661_EE_LED_RDYG 0x01 +#define RT2661_EE_LED_RDYA 0x02 +#define RT2661_EE_LED_ACT 0x04 +#define RT2661_EE_LED_GPIO0 0x08 +#define RT2661_EE_LED_GPIO1 0x10 +#define RT2661_EE_LED_GPIO2 0x20 +#define RT2661_EE_LED_GPIO3 0x40 +#define RT2661_EE_LED_GPIO4 0x80 +#define RT2661_EE_LED_MODE_SHIFT 8 +#define RT2661_EE_LED_MODE_MASK 0x1f + #define RT2661_EEPROM_DELAY 1 /* minimum hold time (microsecond) */ +#define RT2661_MCU_LED_RF (1 << 5) +#define RT2661_MCU_LED_LINKG (1 << 6) +#define RT2661_MCU_LED_LINKA (1 << 7) +#define RT2661_MCU_LED_GPIO0 (1 << 8) +#define RT2661_MCU_LED_GPIO1 (1 << 9) +#define RT2661_MCU_LED_GPIO2 (1 << 10) +#define RT2661_MCU_LED_GPIO3 (1 << 11) +#define RT2661_MCU_LED_GPIO4 (1 << 12) +#define RT2661_MCU_LED_ACT (1 << 13) +#define RT2661_MCU_LED_RDYG (1 << 14) +#define RT2661_MCU_LED_RDYA (1 << 15) + +#define RT2661_MCU_LED_DEFAULT \ + (RT2661_MCU_LED_GPIO0 | RT2661_MCU_LED_GPIO1 | RT2661_MCU_LED_GPIO2 | \ + RT2661_MCU_LED_GPIO3 | RT2661_MCU_LED_GPIO4 | RT2661_MCU_LED_ACT | \ + RT2661_MCU_LED_RDYG | RT2661_MCU_LED_RDYA) + +#define RT2661_TXPOWER_DEFAULT 5 +#define RT2661_TXPOWER_MAX 36 + /* * control and status registers access macros */ ==== //depot/projects/wifi/sys/dev/ral/rt2661var.h#7 (text) ==== @@ -17,6 +17,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#define RT2661_NCHAN_MAX 38 + struct rt2661_rx_radiotap_header { struct ieee80211_radiotap_header wr_ihdr; uint64_t wr_tsf; @@ -47,39 +49,37 @@ (1 << IEEE80211_RADIOTAP_RATE) | \ (1 << IEEE80211_RADIOTAP_CHANNEL)) -struct rt2661_tx_data { - bus_dmamap_t map; - struct mbuf *m; +struct rt2661_tx_ratectl { struct ieee80211_node *ni; struct ral_rssdesc id; + STAILQ_ENTRY(rt2661_tx_ratectl) link; }; +struct rt2661_data { + bus_dmamap_t map; + struct mbuf *m; +}; + struct rt2661_tx_ring { bus_dma_tag_t desc_dmat; bus_dma_tag_t data_dmat; bus_dmamap_t desc_map; bus_addr_t physaddr; struct rt2661_tx_desc *desc; - struct rt2661_tx_data *data; + struct rt2661_data *data; int count; int queued; int cur; int next; - int stat; }; -struct rt2661_rx_data { - bus_dmamap_t map; - struct mbuf *m; -}; - struct rt2661_rx_ring { bus_dma_tag_t desc_dmat; bus_dma_tag_t data_dmat; bus_dmamap_t desc_map; bus_addr_t physaddr; struct rt2661_rx_desc *desc; - struct rt2661_rx_data *data; + struct rt2661_data *data; int count; int cur; int next; @@ -123,7 +123,7 @@ struct rt2661_rx_ring rxq; uint32_t rf_regs[4]; - int8_t txpow[38]; + int8_t txpow[RT2661_NCHAN_MAX]; struct { uint8_t reg; @@ -145,6 +145,9 @@ uint8_t bbp16; uint8_t bbp17; uint8_t bbp64; + uint16_t mcu_led; + + STAILQ_HEAD(, rt2661_tx_ratectl) tx_ratectl; int dwelltime; ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#64 (text+ko) ==== @@ -491,7 +491,8 @@ * NB: the rate set is assumed to be sorted. */ int -ieee80211_iserp_rateset(struct ieee80211com *ic, struct ieee80211_rateset *rs) +ieee80211_iserp_rateset(struct ieee80211com *ic, + const struct ieee80211_rateset *rs) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 13 07:54:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA50316A46E; Sun, 13 Jan 2008 07:54:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 74AD216A46B for ; Sun, 13 Jan 2008 07:54:41 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8DC5213C442 for ; Sun, 13 Jan 2008 07:54:41 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D7sfmr012019 for ; Sun, 13 Jan 2008 07:54:41 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D7sfD2012016 for perforce@freebsd.org; Sun, 13 Jan 2008 07:54:41 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 Jan 2008 07:54:41 GMT Message-Id: <200801130754.m0D7sfD2012016@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 133172 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 07:54:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=133172 Change 133172 by sephe@sephe_zealot:sam_wifi on 2008/01/13 07:54:10 - Correct bbp_read - Set TX/RX antenna after BBP is initialized - Set {TX,CIPHER}_BUSY flag after TX desc is fully setup - Process encryption intr when RX intr comes Obtained-from: DragonFly Affected files ... .. //depot/projects/wifi/sys/dev/ral/rt2560.c#28 edit Differences ... ==== //depot/projects/wifi/sys/dev/ral/rt2560.c#28 (text) ==== @@ -1370,8 +1370,10 @@ if (r & RT2560_DECRYPTION_DONE) rt2560_decryption_intr(sc); - if (r & RT2560_RX_DONE) + if (r & RT2560_RX_DONE) { rt2560_rx_intr(sc); + rt2560_encryption_intr(sc); + } /* re-enable interrupts */ RAL_WRITE(sc, RT2560_CSR8, RT2560_INTR_MASK); @@ -1515,8 +1517,8 @@ desc->flags = htole32(flags); desc->flags |= htole32(len << 16); - desc->flags |= encrypt ? htole32(RT2560_TX_CIPHER_BUSY) : - htole32(RT2560_TX_BUSY | RT2560_TX_VALID); + if (!encrypt) + desc->flags |= htole32(RT2560_TX_VALID); desc->physaddr = htole32(physaddr); desc->wme = htole16( @@ -1548,6 +1550,9 @@ if (rate != 2 && (ic->ic_flags & IEEE80211_F_SHPREAMBLE)) desc->plcp_signal |= 0x08; } + + desc->flags |= encrypt ? htole32(RT2560_TX_CIPHER_BUSY) + : htole32(RT2560_TX_BUSY); } static int @@ -2195,6 +2200,16 @@ uint32_t val; int ntries; + for (ntries = 0; ntries < 100; ntries++) { + if (!(RAL_READ(sc, RT2560_BBPCSR) & RT2560_BBP_BUSY)) + break; + DELAY(1); + } + if (ntries == 100) { + device_printf(sc->sc_dev, "could not read from BBP\n"); + return 0; + } + val = RT2560_BBP_BUSY | reg << 8; RAL_WRITE(sc, RT2560_BBPCSR, val); @@ -2752,8 +2767,6 @@ /* set basic rate set (will be updated later) */ RAL_WRITE(sc, RT2560_ARSP_PLCP_1, 0x153); - rt2560_set_txantenna(sc, sc->tx_ant); - rt2560_set_rxantenna(sc, sc->rx_ant); rt2560_update_slot(ifp); rt2560_update_plcp(sc); rt2560_update_led(sc, 0, 0); @@ -2767,6 +2780,9 @@ return; } + rt2560_set_txantenna(sc, sc->tx_ant); + rt2560_set_rxantenna(sc, sc->rx_ant); + /* set default BSS channel */ rt2560_set_chan(sc, ic->ic_curchan); From owner-p4-projects@FreeBSD.ORG Sun Jan 13 07:55:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4022216A420; Sun, 13 Jan 2008 07:55:43 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E103016A419 for ; Sun, 13 Jan 2008 07:55:42 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E249B13C45D for ; Sun, 13 Jan 2008 07:55:42 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D7tgT0012141 for ; Sun, 13 Jan 2008 07:55:42 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D7tgpr012138 for perforce@freebsd.org; Sun, 13 Jan 2008 07:55:42 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 Jan 2008 07:55:42 GMT Message-Id: <200801130755.m0D7tgpr012138@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 133173 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 07:55:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=133173 Change 133173 by sephe@sephe_zealot:sam_wifi on 2008/01/13 07:55:06 Turn on RAL_DEBUG Affected files ... .. //depot/projects/wifi/sys/modules/ral/Makefile#4 edit Differences ... ==== //depot/projects/wifi/sys/modules/ral/Makefile#4 (text+ko) ==== @@ -5,5 +5,6 @@ KMOD = if_ral SRCS = rt2560.c rt2661.c if_ralrate.c if_ral_pci.c \ device_if.h bus_if.h pci_if.h +CFLAGS += -DRAL_DEBUG .include From owner-p4-projects@FreeBSD.ORG Sun Jan 13 08:44:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D289516A46D; Sun, 13 Jan 2008 08:44:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7DA1116A417 for ; Sun, 13 Jan 2008 08:44:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 97F5513C44B for ; Sun, 13 Jan 2008 08:44:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D8ibYc020798 for ; Sun, 13 Jan 2008 08:44:37 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D8iYAj020794 for perforce@freebsd.org; Sun, 13 Jan 2008 08:44:35 GMT (envelope-from jb@freebsd.org) Date: Sun, 13 Jan 2008 08:44:35 GMT Message-Id: <200801130844.m0D8iYAj020794@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133175 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 08:44:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=133175 Change 133175 by jb@jb_freebsd1 on 2008/01/13 08:44:22 IFC Affected files ... .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/book.sgml#9 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/geom/chapter.sgml#11 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml#13 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml#14 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#22 integrate .. //depot/projects/dtrace/src/contrib/cvs/AUTHORS#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/BUGS#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/ChangeLog#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/FAQ#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/FREEBSD-Xlist#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/FREEBSD-upgrade#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/HACKING#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/INSTALL#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/NEWS#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/README#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/TESTS#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/TODO#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/acinclude.m4#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/aclocal.m4#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/config.h.in#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/configure#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/configure.in#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/contrib/ChangeLog#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/contrib/Makefile.am#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/contrib/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/contrib/README#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/contrib/clmerge.in#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/contrib/cln_hist.in#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/contrib/commit_prep.in#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/contrib/cvs2vendor.sh#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/contrib/cvs_acls.html#1 branch .. //depot/projects/dtrace/src/contrib/cvs/contrib/cvs_acls.in#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/contrib/cvscheck.sh#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/contrib/debug_check_log.sh#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/contrib/descend.sh#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/contrib/log.in#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/contrib/log_accum.in#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/contrib/mfpipe.in#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/contrib/pvcs2rcs.in#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/contrib/rcs-to-cvs.sh#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/contrib/rcs2log.sh#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/contrib/rcs2sccs.sh#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/contrib/rcslock.in#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/contrib/sccs2rcs.in#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/diff/ChangeLog#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/diff/Makefile.am#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/diff/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/doc/ChangeLog#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/doc/Makefile.am#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/doc/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/doc/cvs.1#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/doc/cvs.man.footer#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/doc/cvs.man.header#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/doc/cvs.texinfo#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/doc/cvsclient.texi#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/doc/mkman.in#4 delete .. //depot/projects/dtrace/src/contrib/cvs/doc/mkman.pl#1 branch .. //depot/projects/dtrace/src/contrib/cvs/doc/stamp-1#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/doc/stamp-vti#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/doc/version-client.texi#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/doc/version.texi#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/lib/ChangeLog#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/lib/Makefile.am#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/lib/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/lib/fncase.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/lib/getdate#1 branch .. //depot/projects/dtrace/src/contrib/cvs/lib/getpass.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/lib/regex.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/lib/system.h#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/lib/test-getdate.sh#1 branch .. //depot/projects/dtrace/src/contrib/cvs/lib/xtime.h#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/man/ChangeLog#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/man/Makefile.am#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/man/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/man/cvs.1#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/ChangeLog#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/Makefile.am#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/add.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/admin.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/annotate.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/buffer.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/buffer.h#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/checkin.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/checkout.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/classify.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/client.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/client.h#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/commit.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/create_adm.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/cvs.h#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/cvsrc.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/diff.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/edit.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/entries.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/expand_path.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/fileattr.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/filesubr.c#5 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/find_names.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/hardlink.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/hardlink.h#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/hash.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/hash.h#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/history.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/history.h#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/ignore.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/import.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/lock.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/log.c#5 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/login.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/logmsg.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/main.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/mkmodules.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/modules.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/myndbm.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/myndbm.h#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/no_diff.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/parseinfo.c#5 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/patch.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/rcs.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/rcs.h#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/rcscmds.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/recurse.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/release.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/remove.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/repos.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/root.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/root.h#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/run.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/sanity.sh#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/server.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/server.h#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/stack.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/stack.h#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/status.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/subr.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/tag.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/update.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/vers_ts.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/version.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/watch.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/wrapper.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/zlib.c#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/tools/ChangeLog#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/tools/Makefile.am#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/tools/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/cvs/tools/README#4 integrate .. //depot/projects/dtrace/src/etc/defaults/rc.conf#25 integrate .. //depot/projects/dtrace/src/etc/rc.firewall#7 integrate .. //depot/projects/dtrace/src/etc/rc.firewall6#5 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/Makefile#7 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/heapsort.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/qsort.c#5 integrate .. //depot/projects/dtrace/src/sbin/setkey/parse.y#6 integrate .. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#21 integrate .. //depot/projects/dtrace/src/share/man/man9/mbuf_tags.9#4 integrate .. //depot/projects/dtrace/src/sys/arm/arm/support.S#6 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_da.c#14 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/acpica/evgpe.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/Osd/OsdSchedule.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_multiq.c#1 branch .. //depot/projects/dtrace/src/sys/dev/puc/pucdata.c#7 integrate .. //depot/projects/dtrace/src/tools/tools/nanobsd/nanobsd.sh#14 integrate .. //depot/projects/dtrace/src/usr.sbin/inetd/inetd.8#5 integrate .. //depot/projects/dtrace/src/usr.sbin/iostat/iostat.c#7 integrate .. //depot/projects/dtrace/www/en/donations/wantlist.sgml#27 integrate .. //depot/projects/dtrace/www/en/releases/6.3R/schedule.sgml#5 integrate .. //depot/projects/dtrace/www/en/releases/7.0R/schedule.sgml#10 integrate Differences ... ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/book.sgml#9 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Documentation Project - Original Revision: 1.171 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/book.sgml,v 1.12 2007/04/17 03:12:05 delphij Exp $ + Original Revision: 1.172 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/book.sgml,v 1.13 2008/01/12 14:04:56 loader Exp $ --> 2005 2006 2007 + 2008 The FreeBSD Documentation Project @@ -88,6 +89,7 @@ 2005 2006 2007 + 2008 &cnproj.freebsd.org; ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/geom/chapter.sgml#11 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Simplified Chinese Project Original Revision: 1.38 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/geom/chapter.sgml,v 1.12 2007/12/31 15:10:15 loader Exp $ + $FreeBSD: doc/zh_CN.GB2312/books/handbook/geom/chapter.sgml,v 1.13 2008/01/12 14:04:57 loader Exp $ --> @@ -33,7 +33,7 @@ ±¾Õ½«½éÉÜÒÔ &os; GEOM ¿ò¼ÜÀ´Ê¹ÓôÅÅÌ¡£ Õâ°üÀ¨ÁËʹÓÃÕâÒ»¿ò¼ÜÀ´ÅäÖõÄÖ÷ÒªµÄ RAID - ¿ØÖƹ¤¾ß¡£ ÕâÒ»Õ̲»»áÉîÈëÌÖÂÛ GEOM + ¿ØÖƹ¤¾ß¡£ ÕâÒ»Õ²»»áÉîÈëÌÖÂÛ GEOM ÈçºÎ´¦Àí»ò¿ØÖÆ I/O¡¢ ÆäϲãµÄ×Óϵͳ»ò´úÂë¡£ Äú¿ÉÒÔ´Ó &man.geom.4; Áª»úÊֲἰÆäÖÚ¶à SEE ALSO ²Î¿¼ÎÄÏ×Öеõ½ÕâЩÐÅÏ¢¡£ ÕâÒ»ÕÂÒ²²»ÊÇ¶Ô RAID ÅäÖõÄȨÍþ½éÉÜ£¬ ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml#13 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Chinese Documentation Project - Original Revision: 1.442 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml,v 1.19 2007/12/12 05:30:51 loader Exp $ + Original Revision: 1.443 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml,v 1.20 2008/01/12 14:04:57 loader Exp $ --> @@ -2478,6 +2478,24 @@ + RELENG_7 + + + ÕâÊÇ FreeBSD-7.X µÄ¿ª·¢·ÖÖ§£¬ + Ò²±»³Æ×÷ FreeBSD 7-STABLE¡£ + + + + + RELENG_7_0 + + + FreeBSD-7.0 µÄ·¢Ðаæ·ÖÖ§£¬ Ö»ÓÃÓÚ°²È«¹«¸æ£¬ + ÒÔ¼°ÆäËûÖØÒª¸üС£ + + + + RELENG_6 @@ -2487,6 +2505,15 @@ + RELENG_6_3 + + + FreeBSD-6.3 µÄ·¢Ðаæ·ÖÖ§£¬ Ö»ÓÃÓÚ°²È«¹«¸æ£¬ + ÒÔ¼°ÆäËûÖØÒª¸üС£ + + + + RELENG_6_2 @@ -2700,6 +2727,22 @@ + RELENG_7_0_0_RELEASE + + + FreeBSD 7.0 + + + + + RELENG_6_3_0_RELEASE + + + FreeBSD 6.3 + + + + RELENG_6_2_0_RELEASE ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml#14 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.184 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml,v 1.21 2007/12/12 05:30:51 loader Exp $ + Original Revision: 1.185 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml,v 1.22 2008/01/12 14:04:57 loader Exp $ --> @@ -361,7 +361,15 @@ ÅäÖà X11 - ÅäÖà X11 ÐèÒª¼¸²½¡£ µÚÒ»²½ÊÇÒÔ³¬¼¶Óû§µÄÉí·Ý½¨Á¢³õʼµÄÅäÖÃÎļþ£º + ¶ÔÓÚ &xorg; 7.3 Õâ¸ö°æ±¾£¬ + ¿ÉÒÔ²»ÐèÒªÈκεÄÅäÖÃÎļþ¾ÍÄÜÔËÐУ¬ÔÚÌáʾ·ûϼüÈçÏÂÃüÁ + + &prompt.user; startx + + Èç¹ûÕâ¸öÃüÁî²¢²»ÄÜÆô¶¯ X11£¬ + Ò²ÐíÊÇĬÈϵÄÅäÖÃÎļþ²»ÊʺÏÄã»úÆ÷µÄÅäÖ㬠Õâʱºò¾ÍÐèÒªÊÖ¹¤ÅäÖà + X11 ÁË¡£ ÅäÖà X11 ÐèÒª¼¸²½£¬ + µÚÒ»²½ÊÇÒÔ³¬¼¶Óû§µÄÉí·Ý½¨Á¢³õʼµÄÅäÖÃÎļþ£º &prompt.root; Xorg -configure ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#22 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.893 - $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.31 2008/01/02 07:17:57 loader Exp $ + Original Revision: 1.895 + $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.32 2008/01/12 14:04:57 loader Exp $ --> 2005 2006 2007 + 2008 The FreeBSD Documentation Project @@ -45,6 +46,7 @@ 2005 2006 2007 + 2008 &cnproj.freebsd.org; @@ -10641,6 +10643,10 @@ 603100 + ÐÞÕýÁË bit macro µÄ¶à×Ö½ÚÖ§³ÖÖ®ºóµÄ 6.3-STABLE¡£ + 603101 + + 7.0-CURRENT¡£ 700000 @@ -10905,7 +10911,7 @@ 700054 - MFC Á˻ָ´¶Ô FreeBSD 4/5/6 °æ±¾µÄ PCIOCGETCONF¡¢ + 7.0-RELEASE£¬ ÒÔ¼° MFC Á˻ָ´¶Ô FreeBSD 4/5/6 °æ±¾µÄ PCIOCGETCONF¡¢ PCIOCREAD ºÍ PCIOCWRITE IOCTL ABI ÏòϼæÈÝÖ®ºóµÄ 7.0-CURRENT£¬ ÕâÒ»±ä¶¯µ¼Ö PCIOCGETCONF IOCTL µÄ ABI Ôٴη¢Éú±ä»¯¡£ 700055 @@ -10947,6 +10953,15 @@ kdb_enter() Ôö¼Ó "why" ²ÎÊýÖ®ºóµÄ 8.0-CURRENT¡£ 800007 + + ÔÚÈ¥³ý LK_EXCLUPGRADE Ñ¡ÏîºóµÄ 8.0-CURRENT¡£ + 800008 + + + ÒýÈë lockmgr_disown() ºóµÄ + 8.0-CURRENT¡£ + 800009 + ==== //depot/projects/dtrace/src/contrib/cvs/AUTHORS#4 (text+ko) ==== @@ -49,9 +49,11 @@ remote repository access code. Larry Jones and Derek Price have been maintaining and -enhancing CVS for some years. Mark D. Baushke came on in +enhancing CVS for some years. Mark D. Baushke came on in 2003. +Conrad Pino began maintaining the Windows port in 2004. + There have been many, many contributions not listed here. Consult the individual ChangeLog files in each directory for a more complete idea. ==== //depot/projects/dtrace/src/contrib/cvs/BUGS#4 (text+ko) ==== @@ -88,22 +88,6 @@ noticed under BSDI. -* Spaces in arguments to `cvs diff' are currently split on spaces and tabs -before being passed to diff. This can often cause diff to abort since it can -no longer interpret its options string and if it can, coincidentally, -interpret its option string, then the problem may be output in unexpected -formats. - - -* `release' of a project subdir does not remove the `subdir' entry from - `./CVS/Entries'. - - -* Most of the remote commands are encountering assertion failures when listing - the toplevel of the repository (e.g. `cvs rlog .'). This appears to be - related to the symlinked CVS root fix. - - * Status /*-------. ==== //depot/projects/dtrace/src/contrib/cvs/ChangeLog#4 (text+ko) ==== @@ -1,3 +1,281 @@ +2006-06-09 Derek Price + + * NEWS: Note client/server conflict fix. + +2006-05-25 Derek Price + + * configure.in: Accept --with-rsh argument to set RSH_DFLT in config.h. + Prefer `remsh' to `rsh' when autodetecting and comment rationale. + +2006-04-27 Derek Price + + * acinclude.m4 (ACX_WITH_GSSAPI): Detect libgss for HP-UX. + * NEWS: Note that GSSAPI builds under HP-UX. + (Report from Larry Jones .) + +2006-03-07 Derek Price + + * NEWS: Note rtag fixes. + +2006-02-26 Derek Price + + * NEWS: Note CVSADM fix as an efficiency improvement. + +2006-02-01 Derek Price + + * NEWS: Note unconditional val-tags lock removal. + + * NEWS: Note history buffer overflow fix. + +2006-01-30 Derek Price + + * NEWS: Note nonblocking flow control pipe fix. + +2005-12-09 Derek Price + + * NEWS: Note misc doc & bug fixes. + +2005-12-07 Derek Price + + * NEWS: Note recognition of :extssh:. + +2005-10-18 Derek Price + + * KEYS: New file, suggested by Antoine Lexy-Lambert . + * README: Mention KEYS file. + +2005-09-26 Derek Price + + [bug #14639] + * acinclude.m4: Find the crypto library on FreeBSD 5.x. + Patch from Serguei E. Leontiev . + + * NEWS: Note FreeBSD 5.x GSSAPI fix. + + * NEWS: Note fsync'd commits. + +2005-09-24 Derek Price + + * NEWS, HACKING: Standardize on Automake 1.9.6. + +2005-09-22 Derek Price + + * NEWS: Mention conflict fixes. + +2005-09-13 Derek Price + + * TESTS: Mention new $username8 & $anyusername variables. + +2005-09-04 Larry Jones + + * NEWS: s/bug-cvs@gnu.org/bug-cvs@nongnu.org/. + * configure.in: s/info-cvs@gnu.org/info-cvs@nongnu.org/. + * configure: Regenerated. + +2005-09-01 Derek Price + + * AUTHORS, DEVEL-CVS, HACKING, README: Update links, email addresses, + & mailing list descriptions. + +2005-09-01 Derek Price + + * FAQ: Update links. + +2005-09-01 Derek Price + + * HACKING, INSTALL, README, README.VMS, configure.in: Update links and + email addresses. + +2005-08-31 Derek Price + + * www/.htaccess: Remove this file. + +2005-08-31 Derek Price + + * cvs.spec.in: Note last spec file change in internal ChangeLog. + +2005-08-31 Derek Price + + * NEWS: Note spec file repair. + +2005-08-31 Derek Price + + * cvs.spec.in: Update links to point to Savannah. s/Copyright/License/ + for RPM 4.mumble. + +2005-08-30 Larry Jones + + * NEWS: Note import locking fix. + +2005-07-12 Derek Price + + * FAQ, HACKING, INSTALL: Add copyright notices. + +2005-07-11 Derek Price + + * FAQ, HACKING, INSTALL: Update license notices. + +2005-06-02 Derek Price + + * NEWS: Note server compression hang fix. + +2005-06-01 Conrad T. Pino + + * makewin32.cmd: Add Windows NT command file to build CVS Project. + Imported from revision 1.2 on feature branch. + +2005-05-27 Derek Price + + * NEWS: Note diff space split fix. + * BUGS: Remove diff space split note. + +2005-05-03 Derek Price + + * INSTALL: Add footnote about compiling a CVS checkout of CVS on a + case-insensitive UNIX file system like Mac OS X. + +2005-05-02 Derek Price + + * TODO (231): Renumber as... + (234): ...this to match numbering on 1.12.x. + +2005-05-02 Derek Price + + * TODO (231): New item. + (22, 30, 31): Remove completed items. + +2005-05-02 Derek Price + + * NEWS: Note new val-tags locks. + +2005-04-30 Derek Price + + * NEWS: Note new history locks. + +2005-04-20 Derek Price + + * NEWS: Note log overflow fix. + +2005-04-15 Derek Price + + * NEWS: Note Klocwork fixes. + +2005-04-14 Derek Price + + * NEWS: Note contrib Perl taint vulnerability fix. + +2005-03-23 Derek Price + + * ylwrap: New file. + +2005-03-15 Derek Price + + * HACKING, NEWS: Note new Automake version. + +2005-03-04 Jim Hyslop + + * NEWS: Note fix for compile errors on IRIX 5.3. + +2005-02-22 Derek Price + + * NEWS: Note recent watch on/off fileattr fix. + +2005-01-31 Derek Price + + * AUTHORS: Add Conrad Pino. + * README: Update copyright notice. + +2005-01-29 Derek Price + + * NEWS: Note some recent changes. + +2004-11-17 Derek Price + + * NEWS: Note "red file" fix source inclusion. + +2004-11-05 Conrad T. Pino + + * cvsnt.dep: Regenerated after complete rebuild. + * cvsnt.mak: Regenerated after complete rebuild. + +2004-11-03 Derek Price + + * HACKING, NEWS: Note new Autoconf & Automake versions. + +2004-10-29 Derek Price + + * NEWS: Note xreadlink fix. + +2004-10-26 Derek Price + + * NEWS: Note GSSAPI error message fix. + +2004-10-19 Derek Price + + * NEWS: Note resurrection fix. + +2004-10-14 Derek Price + + * NEWS: Note new import branch verification. + +2004-09-25 Derek Price + + * configure.in: Use doc/mkman.pl as source for doc/mkman. + +2004-09-08 Conrad T. Pino + + * cvsnt.dsp: Add "windows-NT/JmgStat.c" to project. Add + "windows-NT/JmgStat.h" to project. Add "lib/xsize.h" to project. + * cvsnt.dep: Regenerated for "cvsnt.dsp" change. + * cvsnt.mak: Regenerated for "cvsnt.dsp" change. + +2004-09-07 Derek Price + + * NEWS: Note Windows DST fix. + +2004-09-03 Derek Price + + * HACKING: Codify backwards compatibility conventions. Remove outdated + reference to very old MSVC++ releases. + +2004-08-30 Derek Price + + * NEWS: Note compliance of log_accum.pl with Perl 5.8.5. + +2004-08-24 Derek Price + + * TODO (24, 49, 92, 113): Remove completed/obsolescent items. + +2004-08-24 Derek Price + + * BUGS: Remove release subdir note. This was fixed with the commit on + 2004-02-25, based on Matthew Ogilvie's patch. + +2004-08-24 Derek Price + + * NEWS: Note r* . fix. + * BUGS: Remove r* . note. + +2004-08-24 Derek Price + + * NEWS: Note invalid tag fix. + +2004-08-24 Mark D. Baushke + + * NEWS: Note that modules -a bugfix has a change in behavior. + +2004-06-22 Derek Price + + * NEWS: Note Conrad's Windows fix. + +2004-06-21 Derek Price + + * .cvsignore: Ignore GPG signature files for distributions. + +2004-06-10 Derek Price + + * NEWS: Note manual update. + 2004-06-09 Derek Price * NEWS: Note Stefan & Sebastian's security fixes. ==== //depot/projects/dtrace/src/contrib/cvs/FAQ#4 (text+ko) ==== @@ -1,3 +1,24 @@ +------------------------------------------------------------------------------- + + CVS is Copyright (C) 1989-2005 The Free Software Foundation, Inc. + + CVS is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 1, or (at your option) + any later version. + + More details are available in the COPYING file but, in simplified + terms, this means that any distributed modifications you make to + this software must also be released under the GNU General Public + License. + + CVS is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +------------------------------------------------------------------------------- + This file contains a CVS FAQ. Until 1995 it was maintained by David Grubbs. It was out of date and not being maintained, but it had a certain following and in 1997 Pascal Molli decided to start @@ -13,13 +34,14 @@ and insert things like tables of contents). The answers which are dated "6/13/1997" below are really from the 1995 -FAQ, for the most part. Many of them are out of date. If you have -some time, you are encouraged to double-check them against other -sources like the Cederqvist manual and update the FAQ. If you don't -have such time, take them with a grain of salt or a few. +FAQ, for the most part. Many of them are out of date. The current FAQ may +be found at . If you have +some time, you are encouraged to export that FAQ as text and import it here. +If you don't have such time, take the answers in this file with at least a few +grains of salt. -Since Feb. 2000 CVS is being maintained by OpenAvenue, Inc. and many of -the existing resources have been centeralized on http://www.cvshome.org. +Since August, 2005, many of the existing CVS resources have been centralized on + & . Category: /, all questions @@ -1899,7 +1921,8 @@ GIC is no longer being maintained and tkCVS is recommended instead. - For more on tkCVS, see http://www.cvshome.org/dev/addontkcvs.html. + For more on tkCVS, see + . kingdon@cyclic.com ==== //depot/projects/dtrace/src/contrib/cvs/FREEBSD-Xlist#4 (text+ko) ==== @@ -1,5 +1,4 @@ -$FreeBSD: src/contrib/cvs/FREEBSD-Xlist,v 1.1 2004/06/09 20:14:53 des Exp $ - +$FreeBSD: src/contrib/cvs/FREEBSD-Xlist,v 1.2 2008/01/13 05:50:33 obrien Exp $ */*.com */*.dep */*.dsp @@ -11,6 +10,7 @@ cvs.spec* cvsnt.* doc/*.info* +doc/*.pdf doc/*.ps doc/texinfo.tex emx @@ -18,4 +18,5 @@ os2 vms windows-NT +ylwrap zlib ==== //depot/projects/dtrace/src/contrib/cvs/FREEBSD-upgrade#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.11 2004/06/09 20:51:26 des Exp $ +$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.12 2008/01/13 06:35:22 obrien Exp $ MAINTAINER= peter@FreeBSD.org @@ -16,16 +16,17 @@ first. Remove it when it looks ok. The initial import was done with: - cvs import src/contrib/cvs CVSHOME v1_8_1 + cvs import src/contrib/cvs CVSHOME v1_11_22 When new versions are imported, cvs will give instructions on how to merge the local and vendor changes when/if conflicts arise. -The developers can be reached at: . Local changes +The developers can be reached at: . Local changes that are suitable for public consumption should be submitted for inclusion in future releases. peter@freebsd.org - 20 Aug 1996 +obrien@freebsd.org - 12 Jan 2008 Current local changes: - CVS_LOCAL_BRANCH_NUM environment variable support for choosing the @@ -36,3 +37,9 @@ - CVSROOT/options file - Variable keyword expansion controls including custom keywords. - $ CVSHeader$ keyword - like Header, but with $CVSROOT stripped off. + - 'CVS_OPTIONS' environmental variable support. + - Allow -D with -r on checkout. + - Support for "diff -j", allowing tag:date based diffs. + - iso8601 option keyword. + - Comprehensive "-T" CVS/Template support. + - We use the cvs.1 manpage from man/, not the offical one in doc/ ==== //depot/projects/dtrace/src/contrib/cvs/HACKING#4 (text+ko) ==== @@ -1,10 +1,29 @@ How to write code for CVS +* License of CVS + + CVS is Copyright (C) 1989-2005 The Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 1, or (at your option) + any later version. + + More details are available in the COPYING file but, in simplified + terms, this means that any distributed modifications you make to + this software must also be released under the GNU General Public + License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + * Source Patches against the development version of CVS are most likely to be accepted: - $ cvs -d:pserver:anoncvs@cvs.cvshome.org/cvsroot co ccvs + $ CVS_RSH=ssh cvs -d:ext:anoncvs@savannah.nongnu.org:/cvsroot/cvs co ccvs * Compiler options @@ -13,13 +32,28 @@ might cause spurious warnings, but at least on some machines, there should be no spurious warnings. For example: - $ CFLAGS="-g -Wall" ./configure + $ CFLAGS="-g -Wall" ./configure Configure is not very good at remembering this setting; it will get wiped out whenever you do a ./config.status --recheck, so you'll need to use: - $ CFLAGS="-g -Wall" ./config.status --recheck + $ CFLAGS="-g -Wall" ./config.status --recheck + +* Backwards Compatibility + +Only bug fixes are accepted into the stable branch. New features should be +applied to the trunk. + +If it is not inextricable from a bug fix, CVS's output (to stdout/stderr) +should not be changed on the stable branch in order to best support scripts and +other tools which parse CVS's output. It is ok to change output between +feature releases (on the trunk), though such changes should be noted in the +NEWS file. + +Changes in the way CVS responds to command line options, config options, etc. +should be accompanied by deprecation warnings for an entire stable series of +releases before being changed permanently, if at all possible. * Indentation style @@ -100,10 +134,6 @@ and perhaps an exception or two we haven't mentioned). This is the file standards.text at the GNU FTP sites. -Filenames for .c and .h files may contain _ but should not contain - -(the latter causes Visual C++ 2.1 to create makefiles which Visual C++ -4.0 cannot use). - * Regenerating Build Files On UNIX, if you wish to change the Build files, you will need Autoconf and @@ -115,13 +145,13 @@ automatically aren't included in the generated Makefiles unless you run configure with the --enable-maintainer-mode option. -The CVS Makefiles and configure script were built using Automake 1.7.9 and -Autoconf 2.58, respectively. +The CVS Makefiles and configure script were built using Automake 1.9.6 and +Autoconf 2.59, respectively. There is a known bug in Autoconf 2.57 that will prevent the configure scripts it generates from working on some platforms. Other combinations of autotool versions may or may not work. If you get other versions to work, -please send a report to . +please send a report to . * Writing patches (strategy) @@ -174,7 +204,7 @@ Include words like "I grant permission to distribute this patch under the terms of the GNU Public License" with your patch. By sending a -patch to bug-cvs@gnu.org, you implicitly grant this permission. +patch to bug-cvs@nongnu.org, you implicitly grant this permission. Submitting a patch to bug-cvs is the way to reach the people who have signed up to receive such submissions (including CVS developers), but @@ -203,27 +233,21 @@ * Mailing lists -Anyone can add themselves to the following mailing lists: +In addition to the mailing lists listed in the README file, developers should +take particular note of the following mailling lists: - dev. Unless you are accepted as a CVS developer as - described in the DEVEL-CVS file, you will only be able to - read this list, not send to it. The charter of the list is - also in DEVEL-CVS. - cvs. The only messages sent to this list are sent + bug-cvs: This is the list which users are requested to send bug reports + to. General CVS development and design discussions also take place on + this list. + info-cvs: This list is intended for user questions, but general CVS + development and design discussions sometimes take place on this list. + cvs-cvs: The only messages sent to this list are sent automatically, via the CVS `loginfo' mechanism, when someone checks something in to the master CVS repository. - test-results. The only messages sent to this list are sent + cvs-test-results: The only messages sent to this list are sent automatically, daily, by a script which runs "make check" and "make remotecheck" on the master CVS sources. -To subscribe to dev, cvs, or test-results, send -a message to "-subscribe@ccvs.cvshome.org" or visit -http://ccvs.cvshome.org/servlets/ProjectMailingListList and follow the -instructions there. -One other list related to CVS development is bug-cvs. This is the -list which users are requested to send bug reports to. Anyone can -subscribe; to do so send mail to bug-cvs-request@gnu.org. - -Other CVS discussions take place on the info-cvs mailing list -(send mail to info-cvs-request@gnu.org to subscribe) or on -the newsgroup comp.software.config-mgmt. +To subscribe to any of these lists, send mail to -request@nongnu.org +or visit http://savannah.nongnu.org/mail/?group=cvs and follow the instructions +for the list you wish to subscribe to. ==== //depot/projects/dtrace/src/contrib/cvs/INSTALL#4 (text+ko) ==== @@ -1,4 +1,24 @@ -First, read the README file. If you're still happy... +------------------------------------------------------------------------------- >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 13 09:06:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87DF016A6C4; Sun, 13 Jan 2008 09:06:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4BE8A16A69D for ; Sun, 13 Jan 2008 09:06:04 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 685FA13C467 for ; Sun, 13 Jan 2008 09:06:04 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D964dc034008 for ; Sun, 13 Jan 2008 09:06:04 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D961kt034005 for perforce@freebsd.org; Sun, 13 Jan 2008 09:06:01 GMT (envelope-from peter-gmail@wemm.org) Date: Sun, 13 Jan 2008 09:06:01 GMT Message-Id: <200801130906.m0D961kt034005@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 133176 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 09:06:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=133176 Change 133176 by peter@peter_overcee on 2008/01/13 09:05:26 IFC @133174 Affected files ... .. //depot/projects/hammer/ObsoleteFiles.inc#44 integrate .. //depot/projects/hammer/contrib/cvs/AUTHORS#3 integrate .. //depot/projects/hammer/contrib/cvs/BUGS#4 integrate .. //depot/projects/hammer/contrib/cvs/ChangeLog#6 integrate .. //depot/projects/hammer/contrib/cvs/FAQ#4 integrate .. //depot/projects/hammer/contrib/cvs/FREEBSD-Xlist#2 integrate .. //depot/projects/hammer/contrib/cvs/FREEBSD-upgrade#4 integrate .. //depot/projects/hammer/contrib/cvs/HACKING#4 integrate .. //depot/projects/hammer/contrib/cvs/INSTALL#6 integrate .. //depot/projects/hammer/contrib/cvs/Makefile.in#6 integrate .. //depot/projects/hammer/contrib/cvs/NEWS#6 integrate .. //depot/projects/hammer/contrib/cvs/README#4 integrate .. //depot/projects/hammer/contrib/cvs/TESTS#4 integrate .. //depot/projects/hammer/contrib/cvs/TODO#5 integrate .. //depot/projects/hammer/contrib/cvs/acinclude.m4#6 integrate .. //depot/projects/hammer/contrib/cvs/aclocal.m4#6 integrate .. //depot/projects/hammer/contrib/cvs/config.h.in#6 integrate .. //depot/projects/hammer/contrib/cvs/configure#6 integrate .. //depot/projects/hammer/contrib/cvs/configure.in#6 integrate .. //depot/projects/hammer/contrib/cvs/contrib/ChangeLog#5 integrate .. //depot/projects/hammer/contrib/cvs/contrib/Makefile.am#5 integrate .. //depot/projects/hammer/contrib/cvs/contrib/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/cvs/contrib/README#3 integrate .. //depot/projects/hammer/contrib/cvs/contrib/clmerge.in#2 integrate .. //depot/projects/hammer/contrib/cvs/contrib/cln_hist.in#2 integrate .. //depot/projects/hammer/contrib/cvs/contrib/commit_prep.in#3 integrate .. //depot/projects/hammer/contrib/cvs/contrib/cvs2vendor.sh#3 integrate .. //depot/projects/hammer/contrib/cvs/contrib/cvs_acls.html#1 branch .. //depot/projects/hammer/contrib/cvs/contrib/cvs_acls.in#4 integrate .. //depot/projects/hammer/contrib/cvs/contrib/cvscheck.sh#2 integrate .. //depot/projects/hammer/contrib/cvs/contrib/debug_check_log.sh#3 integrate .. //depot/projects/hammer/contrib/cvs/contrib/descend.sh#2 integrate .. //depot/projects/hammer/contrib/cvs/contrib/log.in#2 integrate .. //depot/projects/hammer/contrib/cvs/contrib/log_accum.in#3 integrate .. //depot/projects/hammer/contrib/cvs/contrib/mfpipe.in#2 integrate .. //depot/projects/hammer/contrib/cvs/contrib/pvcs2rcs.in#2 integrate .. //depot/projects/hammer/contrib/cvs/contrib/rcs-to-cvs.sh#2 integrate .. //depot/projects/hammer/contrib/cvs/contrib/rcs2log.sh#4 integrate .. //depot/projects/hammer/contrib/cvs/contrib/rcs2sccs.sh#4 integrate .. //depot/projects/hammer/contrib/cvs/contrib/rcslock.in#2 integrate .. //depot/projects/hammer/contrib/cvs/contrib/sccs2rcs.in#4 integrate .. //depot/projects/hammer/contrib/cvs/diff/ChangeLog#6 integrate .. //depot/projects/hammer/contrib/cvs/diff/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/cvs/diff/Makefile.in#6 integrate .. //depot/projects/hammer/contrib/cvs/doc/ChangeLog#6 integrate .. //depot/projects/hammer/contrib/cvs/doc/Makefile.am#5 integrate .. //depot/projects/hammer/contrib/cvs/doc/Makefile.in#6 integrate .. //depot/projects/hammer/contrib/cvs/doc/cvs.1#2 integrate .. //depot/projects/hammer/contrib/cvs/doc/cvs.man.footer#2 integrate .. //depot/projects/hammer/contrib/cvs/doc/cvs.man.header#2 integrate .. //depot/projects/hammer/contrib/cvs/doc/cvs.texinfo#6 integrate .. //depot/projects/hammer/contrib/cvs/doc/cvsclient.texi#4 integrate .. //depot/projects/hammer/contrib/cvs/doc/mkman.in#2 delete .. //depot/projects/hammer/contrib/cvs/doc/mkman.pl#1 branch .. //depot/projects/hammer/contrib/cvs/doc/stamp-1#5 integrate .. //depot/projects/hammer/contrib/cvs/doc/stamp-vti#5 integrate .. //depot/projects/hammer/contrib/cvs/doc/version-client.texi#5 integrate .. //depot/projects/hammer/contrib/cvs/doc/version.texi#5 integrate .. //depot/projects/hammer/contrib/cvs/lib/ChangeLog#6 integrate .. //depot/projects/hammer/contrib/cvs/lib/Makefile.am#5 integrate .. //depot/projects/hammer/contrib/cvs/lib/Makefile.in#6 integrate .. //depot/projects/hammer/contrib/cvs/lib/fncase.c#3 integrate .. //depot/projects/hammer/contrib/cvs/lib/getdate#1 branch .. //depot/projects/hammer/contrib/cvs/lib/getpass.c#2 integrate .. //depot/projects/hammer/contrib/cvs/lib/regex.c#4 integrate .. //depot/projects/hammer/contrib/cvs/lib/system.h#5 integrate .. //depot/projects/hammer/contrib/cvs/lib/test-getdate.sh#1 branch .. //depot/projects/hammer/contrib/cvs/lib/xtime.h#2 integrate .. //depot/projects/hammer/contrib/cvs/man/ChangeLog#6 integrate .. //depot/projects/hammer/contrib/cvs/man/Makefile.am#4 integrate .. //depot/projects/hammer/contrib/cvs/man/Makefile.in#6 integrate .. //depot/projects/hammer/contrib/cvs/man/cvs.1#6 integrate .. //depot/projects/hammer/contrib/cvs/src/ChangeLog#6 integrate .. //depot/projects/hammer/contrib/cvs/src/Makefile.am#5 integrate .. //depot/projects/hammer/contrib/cvs/src/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/cvs/src/add.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/admin.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/annotate.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/buffer.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/buffer.h#5 integrate .. //depot/projects/hammer/contrib/cvs/src/checkin.c#3 integrate .. //depot/projects/hammer/contrib/cvs/src/checkout.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/classify.c#4 integrate .. //depot/projects/hammer/contrib/cvs/src/client.c#6 integrate .. //depot/projects/hammer/contrib/cvs/src/client.h#4 integrate .. //depot/projects/hammer/contrib/cvs/src/commit.c#6 integrate .. //depot/projects/hammer/contrib/cvs/src/create_adm.c#4 integrate .. //depot/projects/hammer/contrib/cvs/src/cvs.h#6 integrate .. //depot/projects/hammer/contrib/cvs/src/cvsrc.c#4 integrate .. //depot/projects/hammer/contrib/cvs/src/diff.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/edit.c#4 integrate .. //depot/projects/hammer/contrib/cvs/src/entries.c#3 integrate .. //depot/projects/hammer/contrib/cvs/src/expand_path.c#3 integrate .. //depot/projects/hammer/contrib/cvs/src/fileattr.c#3 integrate .. //depot/projects/hammer/contrib/cvs/src/filesubr.c#7 integrate .. //depot/projects/hammer/contrib/cvs/src/find_names.c#4 integrate .. //depot/projects/hammer/contrib/cvs/src/hardlink.c#3 integrate .. //depot/projects/hammer/contrib/cvs/src/hardlink.h#2 integrate .. //depot/projects/hammer/contrib/cvs/src/hash.c#3 integrate .. //depot/projects/hammer/contrib/cvs/src/hash.h#3 integrate .. //depot/projects/hammer/contrib/cvs/src/history.c#6 integrate .. //depot/projects/hammer/contrib/cvs/src/history.h#2 integrate .. //depot/projects/hammer/contrib/cvs/src/ignore.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/import.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/lock.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/log.c#8 integrate .. //depot/projects/hammer/contrib/cvs/src/login.c#6 integrate .. //depot/projects/hammer/contrib/cvs/src/logmsg.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/main.c#7 integrate .. //depot/projects/hammer/contrib/cvs/src/mkmodules.c#4 integrate .. //depot/projects/hammer/contrib/cvs/src/modules.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/myndbm.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/myndbm.h#2 integrate .. //depot/projects/hammer/contrib/cvs/src/no_diff.c#3 integrate .. //depot/projects/hammer/contrib/cvs/src/parseinfo.c#8 integrate .. //depot/projects/hammer/contrib/cvs/src/patch.c#6 integrate .. //depot/projects/hammer/contrib/cvs/src/rcs.c#7 integrate .. //depot/projects/hammer/contrib/cvs/src/rcs.h#4 integrate .. //depot/projects/hammer/contrib/cvs/src/rcscmds.c#4 integrate .. //depot/projects/hammer/contrib/cvs/src/recurse.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/release.c#3 integrate .. //depot/projects/hammer/contrib/cvs/src/remove.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/repos.c#3 integrate .. //depot/projects/hammer/contrib/cvs/src/root.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/root.h#3 integrate .. //depot/projects/hammer/contrib/cvs/src/run.c#3 integrate .. //depot/projects/hammer/contrib/cvs/src/sanity.sh#6 integrate .. //depot/projects/hammer/contrib/cvs/src/server.c#9 integrate .. //depot/projects/hammer/contrib/cvs/src/server.h#4 integrate .. //depot/projects/hammer/contrib/cvs/src/stack.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/stack.h#2 integrate .. //depot/projects/hammer/contrib/cvs/src/status.c#4 integrate .. //depot/projects/hammer/contrib/cvs/src/subr.c#6 integrate .. //depot/projects/hammer/contrib/cvs/src/tag.c#6 integrate .. //depot/projects/hammer/contrib/cvs/src/update.c#6 integrate .. //depot/projects/hammer/contrib/cvs/src/vers_ts.c#6 integrate .. //depot/projects/hammer/contrib/cvs/src/version.c#3 integrate .. //depot/projects/hammer/contrib/cvs/src/watch.c#4 integrate .. //depot/projects/hammer/contrib/cvs/src/wrapper.c#6 integrate .. //depot/projects/hammer/contrib/cvs/src/zlib.c#5 integrate .. //depot/projects/hammer/contrib/cvs/tools/ChangeLog#5 integrate .. //depot/projects/hammer/contrib/cvs/tools/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/cvs/tools/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/cvs/tools/README#3 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#81 integrate .. //depot/projects/hammer/etc/namedb/named.conf#13 integrate .. //depot/projects/hammer/etc/rc.firewall#7 integrate .. //depot/projects/hammer/etc/rc.firewall6#8 integrate .. //depot/projects/hammer/gnu/usr.bin/Makefile#17 integrate .. //depot/projects/hammer/lib/libc/stdlib/heapsort.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/qsort.c#4 integrate .. //depot/projects/hammer/lib/libkvm/kvm.c#12 integrate .. //depot/projects/hammer/sbin/fsck_msdosfs/boot.c#5 integrate .. //depot/projects/hammer/sbin/setkey/parse.y#5 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#84 integrate .. //depot/projects/hammer/share/man/man9/mbuf_tags.9#7 integrate .. //depot/projects/hammer/sys/amd64/include/ieeefp.h#19 integrate .. //depot/projects/hammer/sys/arm/arm/support.S#12 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#45 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evgpe.c#13 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSchedule.c#20 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_multiq.c#1 branch .. //depot/projects/hammer/sys/dev/fdc/fdc.c#33 integrate .. //depot/projects/hammer/sys/dev/puc/pucdata.c#30 integrate .. //depot/projects/hammer/sys/i386/include/ieeefp.h#6 integrate .. //depot/projects/hammer/sys/kern/kern_lock.c#35 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#44 integrate .. //depot/projects/hammer/tools/regression/usr.bin/Makefile#5 integrate .. //depot/projects/hammer/tools/regression/usr.bin/tr/Makefile#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/tr/regress.00.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/tr/regress.01.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/tr/regress.02.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/tr/regress.03.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/tr/regress.04.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/tr/regress.05.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/tr/regress.06.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/tr/regress.07.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/tr/regress.08.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/tr/regress.09.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/tr/regress.0a.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/tr/regress.0b.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/tr/regress.in#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/tr/regress.sh#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/tr/regress.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/tr/regress2.in#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/nanobsd.sh#16 integrate .. //depot/projects/hammer/usr.bin/systat/ifstat.c#5 integrate .. //depot/projects/hammer/usr.sbin/inetd/inetd.8#11 integrate .. //depot/projects/hammer/usr.sbin/iostat/iostat.c#10 integrate .. //depot/user/peter/bsvn/contrib/subversion/subversion/libsvn_subr/subst.c#4 edit Differences ... ==== //depot/projects/hammer/ObsoleteFiles.inc#44 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.124 2007/12/07 22:56:10 dougb Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.125 2008/01/11 13:41:31 jhb Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080108: Moved to section 2 +OLD_FILES+=usr/share/man/man3/shm_open.3.gz +OLD_FILES+=usr/share/man/man3/shm_unlink.3.gz # 20071207: Merged with fortunes-o.real OLD_FILES+=usr/share/games/fortune/fortunes2-o OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat @@ -25,6 +28,8 @@ .endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h +# 20071125: Renamed to pmc_get_msr() +OLD_FILES+=usr/share/man/man3/pmc_x86_get_msr.3.gz # 20071108: Removed very crunch OLDCARD support file OLD_FILES+=etc/defaults/pccard.conf # 20071104: Removed bsdlabel, fdisk and gpt from rescue on ia64. @@ -33,6 +38,8 @@ OLD_FILES+=rescue/fdisk OLD_FILES+=rescue/gpt .endif +# 20071026: kthread(9)/kproc(9) API changes +OLD_FILES+=usr/share/man/man9/kthread_create.9.gz # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd ==== //depot/projects/hammer/contrib/cvs/AUTHORS#3 (text+ko) ==== @@ -49,9 +49,11 @@ remote repository access code. Larry Jones and Derek Price have been maintaining and -enhancing CVS for some years. Mark D. Baushke came on in +enhancing CVS for some years. Mark D. Baushke came on in 2003. +Conrad Pino began maintaining the Windows port in 2004. + There have been many, many contributions not listed here. Consult the individual ChangeLog files in each directory for a more complete idea. ==== //depot/projects/hammer/contrib/cvs/BUGS#4 (text+ko) ==== @@ -88,22 +88,6 @@ noticed under BSDI. -* Spaces in arguments to `cvs diff' are currently split on spaces and tabs -before being passed to diff. This can often cause diff to abort since it can -no longer interpret its options string and if it can, coincidentally, -interpret its option string, then the problem may be output in unexpected -formats. - - -* `release' of a project subdir does not remove the `subdir' entry from - `./CVS/Entries'. - - -* Most of the remote commands are encountering assertion failures when listing - the toplevel of the repository (e.g. `cvs rlog .'). This appears to be - related to the symlinked CVS root fix. - - * Status /*-------. ==== //depot/projects/hammer/contrib/cvs/ChangeLog#6 (text+ko) ==== @@ -1,3 +1,281 @@ +2006-06-09 Derek Price + + * NEWS: Note client/server conflict fix. + +2006-05-25 Derek Price + + * configure.in: Accept --with-rsh argument to set RSH_DFLT in config.h. + Prefer `remsh' to `rsh' when autodetecting and comment rationale. + +2006-04-27 Derek Price + + * acinclude.m4 (ACX_WITH_GSSAPI): Detect libgss for HP-UX. + * NEWS: Note that GSSAPI builds under HP-UX. + (Report from Larry Jones .) + +2006-03-07 Derek Price + + * NEWS: Note rtag fixes. + +2006-02-26 Derek Price + + * NEWS: Note CVSADM fix as an efficiency improvement. + +2006-02-01 Derek Price + + * NEWS: Note unconditional val-tags lock removal. + + * NEWS: Note history buffer overflow fix. + +2006-01-30 Derek Price + + * NEWS: Note nonblocking flow control pipe fix. + +2005-12-09 Derek Price + + * NEWS: Note misc doc & bug fixes. + +2005-12-07 Derek Price + + * NEWS: Note recognition of :extssh:. + +2005-10-18 Derek Price + + * KEYS: New file, suggested by Antoine Lexy-Lambert . + * README: Mention KEYS file. + +2005-09-26 Derek Price + + [bug #14639] + * acinclude.m4: Find the crypto library on FreeBSD 5.x. + Patch from Serguei E. Leontiev . + + * NEWS: Note FreeBSD 5.x GSSAPI fix. + + * NEWS: Note fsync'd commits. + +2005-09-24 Derek Price + + * NEWS, HACKING: Standardize on Automake 1.9.6. + +2005-09-22 Derek Price + + * NEWS: Mention conflict fixes. + +2005-09-13 Derek Price + + * TESTS: Mention new $username8 & $anyusername variables. + +2005-09-04 Larry Jones + + * NEWS: s/bug-cvs@gnu.org/bug-cvs@nongnu.org/. + * configure.in: s/info-cvs@gnu.org/info-cvs@nongnu.org/. + * configure: Regenerated. + +2005-09-01 Derek Price + + * AUTHORS, DEVEL-CVS, HACKING, README: Update links, email addresses, + & mailing list descriptions. + +2005-09-01 Derek Price + + * FAQ: Update links. + +2005-09-01 Derek Price + + * HACKING, INSTALL, README, README.VMS, configure.in: Update links and + email addresses. + +2005-08-31 Derek Price + + * www/.htaccess: Remove this file. + +2005-08-31 Derek Price + + * cvs.spec.in: Note last spec file change in internal ChangeLog. + +2005-08-31 Derek Price + + * NEWS: Note spec file repair. + +2005-08-31 Derek Price + + * cvs.spec.in: Update links to point to Savannah. s/Copyright/License/ + for RPM 4.mumble. + +2005-08-30 Larry Jones + + * NEWS: Note import locking fix. + +2005-07-12 Derek Price + + * FAQ, HACKING, INSTALL: Add copyright notices. + +2005-07-11 Derek Price + + * FAQ, HACKING, INSTALL: Update license notices. + +2005-06-02 Derek Price + + * NEWS: Note server compression hang fix. + +2005-06-01 Conrad T. Pino + + * makewin32.cmd: Add Windows NT command file to build CVS Project. + Imported from revision 1.2 on feature branch. + +2005-05-27 Derek Price + + * NEWS: Note diff space split fix. + * BUGS: Remove diff space split note. + +2005-05-03 Derek Price + + * INSTALL: Add footnote about compiling a CVS checkout of CVS on a + case-insensitive UNIX file system like Mac OS X. + +2005-05-02 Derek Price + + * TODO (231): Renumber as... + (234): ...this to match numbering on 1.12.x. + +2005-05-02 Derek Price + + * TODO (231): New item. + (22, 30, 31): Remove completed items. + +2005-05-02 Derek Price + + * NEWS: Note new val-tags locks. + +2005-04-30 Derek Price + + * NEWS: Note new history locks. + +2005-04-20 Derek Price + + * NEWS: Note log overflow fix. + +2005-04-15 Derek Price + + * NEWS: Note Klocwork fixes. + +2005-04-14 Derek Price + + * NEWS: Note contrib Perl taint vulnerability fix. + +2005-03-23 Derek Price + + * ylwrap: New file. + +2005-03-15 Derek Price + + * HACKING, NEWS: Note new Automake version. + +2005-03-04 Jim Hyslop + + * NEWS: Note fix for compile errors on IRIX 5.3. + +2005-02-22 Derek Price + + * NEWS: Note recent watch on/off fileattr fix. + +2005-01-31 Derek Price + + * AUTHORS: Add Conrad Pino. + * README: Update copyright notice. + +2005-01-29 Derek Price + + * NEWS: Note some recent changes. + +2004-11-17 Derek Price + + * NEWS: Note "red file" fix source inclusion. + +2004-11-05 Conrad T. Pino + + * cvsnt.dep: Regenerated after complete rebuild. + * cvsnt.mak: Regenerated after complete rebuild. + +2004-11-03 Derek Price + + * HACKING, NEWS: Note new Autoconf & Automake versions. + +2004-10-29 Derek Price + + * NEWS: Note xreadlink fix. + +2004-10-26 Derek Price + + * NEWS: Note GSSAPI error message fix. + +2004-10-19 Derek Price + + * NEWS: Note resurrection fix. + +2004-10-14 Derek Price + + * NEWS: Note new import branch verification. + +2004-09-25 Derek Price + + * configure.in: Use doc/mkman.pl as source for doc/mkman. + +2004-09-08 Conrad T. Pino + + * cvsnt.dsp: Add "windows-NT/JmgStat.c" to project. Add + "windows-NT/JmgStat.h" to project. Add "lib/xsize.h" to project. + * cvsnt.dep: Regenerated for "cvsnt.dsp" change. + * cvsnt.mak: Regenerated for "cvsnt.dsp" change. + +2004-09-07 Derek Price + + * NEWS: Note Windows DST fix. + +2004-09-03 Derek Price + + * HACKING: Codify backwards compatibility conventions. Remove outdated + reference to very old MSVC++ releases. + +2004-08-30 Derek Price + + * NEWS: Note compliance of log_accum.pl with Perl 5.8.5. + +2004-08-24 Derek Price + + * TODO (24, 49, 92, 113): Remove completed/obsolescent items. + +2004-08-24 Derek Price + + * BUGS: Remove release subdir note. This was fixed with the commit on + 2004-02-25, based on Matthew Ogilvie's patch. + +2004-08-24 Derek Price + + * NEWS: Note r* . fix. + * BUGS: Remove r* . note. + +2004-08-24 Derek Price + + * NEWS: Note invalid tag fix. + +2004-08-24 Mark D. Baushke + + * NEWS: Note that modules -a bugfix has a change in behavior. + +2004-06-22 Derek Price + + * NEWS: Note Conrad's Windows fix. + +2004-06-21 Derek Price + + * .cvsignore: Ignore GPG signature files for distributions. + +2004-06-10 Derek Price + + * NEWS: Note manual update. + 2004-06-09 Derek Price * NEWS: Note Stefan & Sebastian's security fixes. ==== //depot/projects/hammer/contrib/cvs/FAQ#4 (text+ko) ==== @@ -1,3 +1,24 @@ +------------------------------------------------------------------------------- + + CVS is Copyright (C) 1989-2005 The Free Software Foundation, Inc. + + CVS is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 1, or (at your option) + any later version. + + More details are available in the COPYING file but, in simplified + terms, this means that any distributed modifications you make to + this software must also be released under the GNU General Public + License. + + CVS is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +------------------------------------------------------------------------------- + This file contains a CVS FAQ. Until 1995 it was maintained by David Grubbs. It was out of date and not being maintained, but it had a certain following and in 1997 Pascal Molli decided to start @@ -13,13 +34,14 @@ and insert things like tables of contents). The answers which are dated "6/13/1997" below are really from the 1995 -FAQ, for the most part. Many of them are out of date. If you have -some time, you are encouraged to double-check them against other -sources like the Cederqvist manual and update the FAQ. If you don't -have such time, take them with a grain of salt or a few. +FAQ, for the most part. Many of them are out of date. The current FAQ may +be found at . If you have +some time, you are encouraged to export that FAQ as text and import it here. +If you don't have such time, take the answers in this file with at least a few +grains of salt. -Since Feb. 2000 CVS is being maintained by OpenAvenue, Inc. and many of -the existing resources have been centeralized on http://www.cvshome.org. +Since August, 2005, many of the existing CVS resources have been centralized on + & . Category: /, all questions @@ -1899,7 +1921,8 @@ GIC is no longer being maintained and tkCVS is recommended instead. - For more on tkCVS, see http://www.cvshome.org/dev/addontkcvs.html. + For more on tkCVS, see + . kingdon@cyclic.com ==== //depot/projects/hammer/contrib/cvs/FREEBSD-Xlist#2 (text+ko) ==== @@ -1,5 +1,4 @@ -$FreeBSD: src/contrib/cvs/FREEBSD-Xlist,v 1.1 2004/06/09 20:14:53 des Exp $ - +$FreeBSD: src/contrib/cvs/FREEBSD-Xlist,v 1.2 2008/01/13 05:50:33 obrien Exp $ */*.com */*.dep */*.dsp @@ -11,6 +10,7 @@ cvs.spec* cvsnt.* doc/*.info* +doc/*.pdf doc/*.ps doc/texinfo.tex emx @@ -18,4 +18,5 @@ os2 vms windows-NT +ylwrap zlib ==== //depot/projects/hammer/contrib/cvs/FREEBSD-upgrade#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.11 2004/06/09 20:51:26 des Exp $ +$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.12 2008/01/13 06:35:22 obrien Exp $ MAINTAINER= peter@FreeBSD.org @@ -16,16 +16,17 @@ first. Remove it when it looks ok. The initial import was done with: - cvs import src/contrib/cvs CVSHOME v1_8_1 + cvs import src/contrib/cvs CVSHOME v1_11_22 When new versions are imported, cvs will give instructions on how to merge the local and vendor changes when/if conflicts arise. -The developers can be reached at: . Local changes +The developers can be reached at: . Local changes that are suitable for public consumption should be submitted for inclusion in future releases. peter@freebsd.org - 20 Aug 1996 +obrien@freebsd.org - 12 Jan 2008 Current local changes: - CVS_LOCAL_BRANCH_NUM environment variable support for choosing the @@ -36,3 +37,9 @@ - CVSROOT/options file - Variable keyword expansion controls including custom keywords. - $ CVSHeader$ keyword - like Header, but with $CVSROOT stripped off. + - 'CVS_OPTIONS' environmental variable support. + - Allow -D with -r on checkout. + - Support for "diff -j", allowing tag:date based diffs. + - iso8601 option keyword. + - Comprehensive "-T" CVS/Template support. + - We use the cvs.1 manpage from man/, not the offical one in doc/ ==== //depot/projects/hammer/contrib/cvs/HACKING#4 (text+ko) ==== @@ -1,10 +1,29 @@ How to write code for CVS +* License of CVS + + CVS is Copyright (C) 1989-2005 The Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 1, or (at your option) + any later version. + + More details are available in the COPYING file but, in simplified + terms, this means that any distributed modifications you make to + this software must also be released under the GNU General Public + License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + * Source Patches against the development version of CVS are most likely to be accepted: - $ cvs -d:pserver:anoncvs@cvs.cvshome.org/cvsroot co ccvs + $ CVS_RSH=ssh cvs -d:ext:anoncvs@savannah.nongnu.org:/cvsroot/cvs co ccvs * Compiler options @@ -13,13 +32,28 @@ might cause spurious warnings, but at least on some machines, there should be no spurious warnings. For example: - $ CFLAGS="-g -Wall" ./configure + $ CFLAGS="-g -Wall" ./configure Configure is not very good at remembering this setting; it will get wiped out whenever you do a ./config.status --recheck, so you'll need to use: - $ CFLAGS="-g -Wall" ./config.status --recheck + $ CFLAGS="-g -Wall" ./config.status --recheck + +* Backwards Compatibility + +Only bug fixes are accepted into the stable branch. New features should be +applied to the trunk. + +If it is not inextricable from a bug fix, CVS's output (to stdout/stderr) +should not be changed on the stable branch in order to best support scripts and +other tools which parse CVS's output. It is ok to change output between +feature releases (on the trunk), though such changes should be noted in the +NEWS file. + +Changes in the way CVS responds to command line options, config options, etc. +should be accompanied by deprecation warnings for an entire stable series of +releases before being changed permanently, if at all possible. * Indentation style @@ -100,10 +134,6 @@ and perhaps an exception or two we haven't mentioned). This is the file standards.text at the GNU FTP sites. -Filenames for .c and .h files may contain _ but should not contain - -(the latter causes Visual C++ 2.1 to create makefiles which Visual C++ -4.0 cannot use). - * Regenerating Build Files On UNIX, if you wish to change the Build files, you will need Autoconf and @@ -115,13 +145,13 @@ automatically aren't included in the generated Makefiles unless you run configure with the --enable-maintainer-mode option. -The CVS Makefiles and configure script were built using Automake 1.7.9 and -Autoconf 2.58, respectively. +The CVS Makefiles and configure script were built using Automake 1.9.6 and +Autoconf 2.59, respectively. There is a known bug in Autoconf 2.57 that will prevent the configure scripts it generates from working on some platforms. Other combinations of autotool versions may or may not work. If you get other versions to work, -please send a report to . +please send a report to . * Writing patches (strategy) @@ -174,7 +204,7 @@ Include words like "I grant permission to distribute this patch under the terms of the GNU Public License" with your patch. By sending a -patch to bug-cvs@gnu.org, you implicitly grant this permission. +patch to bug-cvs@nongnu.org, you implicitly grant this permission. Submitting a patch to bug-cvs is the way to reach the people who have signed up to receive such submissions (including CVS developers), but @@ -203,27 +233,21 @@ * Mailing lists -Anyone can add themselves to the following mailing lists: +In addition to the mailing lists listed in the README file, developers should +take particular note of the following mailling lists: - dev. Unless you are accepted as a CVS developer as - described in the DEVEL-CVS file, you will only be able to - read this list, not send to it. The charter of the list is - also in DEVEL-CVS. - cvs. The only messages sent to this list are sent + bug-cvs: This is the list which users are requested to send bug reports + to. General CVS development and design discussions also take place on + this list. + info-cvs: This list is intended for user questions, but general CVS + development and design discussions sometimes take place on this list. + cvs-cvs: The only messages sent to this list are sent automatically, via the CVS `loginfo' mechanism, when someone checks something in to the master CVS repository. - test-results. The only messages sent to this list are sent + cvs-test-results: The only messages sent to this list are sent automatically, daily, by a script which runs "make check" and "make remotecheck" on the master CVS sources. -To subscribe to dev, cvs, or test-results, send -a message to "-subscribe@ccvs.cvshome.org" or visit -http://ccvs.cvshome.org/servlets/ProjectMailingListList and follow the -instructions there. -One other list related to CVS development is bug-cvs. This is the -list which users are requested to send bug reports to. Anyone can -subscribe; to do so send mail to bug-cvs-request@gnu.org. - -Other CVS discussions take place on the info-cvs mailing list -(send mail to info-cvs-request@gnu.org to subscribe) or on -the newsgroup comp.software.config-mgmt. +To subscribe to any of these lists, send mail to -request@nongnu.org +or visit http://savannah.nongnu.org/mail/?group=cvs and follow the instructions +for the list you wish to subscribe to. ==== //depot/projects/hammer/contrib/cvs/INSTALL#6 (text+ko) ==== @@ -1,4 +1,24 @@ -First, read the README file. If you're still happy... +------------------------------------------------------------------------------- + +CVS is Copyright (C) 1989-2005 The Free Software Foundation, Inc. + +CVS is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 1, or (at your option) +any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +------------------------------------------------------------------------------- + +Now back to our regularly scheduled program: + +Please read the README file before reading this INSTALL file. Then, to +install CVS: + First you need to obtain and install the CVS executables. If you got a distribution which contains executables, consult the installation @@ -95,7 +115,7 @@ CVS has been tested on the following platforms. The most recent version of CVS reported to have been tested is indicated, but more recent versions of CVS probably will work too. Please send updates to -this list to bug-cvs@gnu.org (doing so in the form of a diff +this list to bug-cvs@nongnu.org (doing so in the form of a diff to this file, or at least exact suggested text, is encouraged). "tested" means, at a minimum, that CVS compiles and appears to work on simple (manual) testing. In many cases it also means "make check" @@ -182,7 +202,8 @@ IBM RS/6000 running AIX 4.3 (1.10.7) Lynx 2.3.1 120495 (1.6.86) (footnote 9) Lynx 2.5 (1.9) (footnote 10) - MkLinux DR3 GENERIC #6 (1.10.5.1) (presumably LinuxPPC too) + Linux DR3 GENERIC #6 (1.10.5.1) (presumably LinuxPPC too) + Mac OS X ALL (footnote 14) Mac OS X Darwin 6.6 Darwin Kernel Version 6.6 (1.11.1p1) Mac OS X Darwin 5.5 Darwin Kernel Version 5.5 (1.11.6) (footnote 12) Mac OS X Darwin 5.5 Darwin Kernel Version 5.5 (1.12.1) (footnote 12) @@ -253,6 +274,17 @@ A build under HP PA-RISC 2.0 will probably not run under PA-RISC 1.1 unless "+DAportable" is added to the HP ANSI cc compiler flags. +(footnote 14) + Because of the case-insensitive file system on Mac OS X, you cannot build + CVS directly from a checkout from CVS. The name of the built executable, + `cvs', conflicts with name of the CVS administration directory, `CVS'. + The work-around is to build the executable from a build directory separate + from the source directory. i.e.: + + cvs co ccvs; cd ccvs + mkdir build; cd build + ../configure && make + ------------------------------------------------------------------------------- Building from source code under Unix: ==== //depot/projects/hammer/contrib/cvs/Makefile.in#6 (text+ko) ==== @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -28,7 +28,6 @@ # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -36,7 +35,6 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -50,6 +48,46 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +subdir = . +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/cvs.spec.in $(top_srcdir)/configure \ + $(top_srcdir)/emx/Makefile.in $(top_srcdir)/os2/Makefile.in \ + $(top_srcdir)/zlib/Makefile.in AUTHORS COPYING COPYING.LIB \ + ChangeLog INSTALL NEWS TODO compile depcomp install-sh \ + mdate-sh missing mkinstalldirs ylwrap +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno configure.status.lineno +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile zlib/Makefile +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 +GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -119,6 +157,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ datadir = @datadir@ @@ -132,6 +172,7 @@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -139,6 +180,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +with_default_rsh = @with_default_rsh@ # Unix source subdirs, where we'll want to run lint and etags: # This is a legacy variable from b4 Automake @@ -147,7 +189,6 @@ SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \ windows-NT os2 emx vms >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 13 09:29:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3967A16A418; Sun, 13 Jan 2008 09:29:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F336716A419 for ; Sun, 13 Jan 2008 09:29:28 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DBC7313C459 for ; Sun, 13 Jan 2008 09:29:28 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0D9TSiv037071 for ; Sun, 13 Jan 2008 09:29:28 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D9TSuY037068 for perforce@freebsd.org; Sun, 13 Jan 2008 09:29:28 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 Jan 2008 09:29:28 GMT Message-Id: <200801130929.m0D9TSuY037068@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 133177 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 09:29:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=133177 Change 133177 by sephe@sephe_zealot:sam_wifi on 2008/01/13 09:28:46 Add ieee80211_phy.c: Efficient TX time/duration calculation (it is not hooked into building yet) Obtained from: sam Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_phy.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jan 13 11:45:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFBE116A421; Sun, 13 Jan 2008 11:45:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 74D1916A417 for ; Sun, 13 Jan 2008 11:45:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7494013C459 for ; Sun, 13 Jan 2008 11:45:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0DBjrMe077776 for ; Sun, 13 Jan 2008 11:45:53 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0DBjra3077773 for perforce@freebsd.org; Sun, 13 Jan 2008 11:45:53 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 13 Jan 2008 11:45:53 GMT Message-Id: <200801131145.m0DBjra3077773@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 133182 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 11:45:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=133182 Change 133182 by hselasky@hselasky_laptop001 on 2008/01/13 11:44:56 OHCI isochronous "off by one" bugfix. When doing isochronous transfers the final physical page was computed like: usbd_get_page(xfer->frbuffers + 0, buf_offset, &buf_res); Instead of: usbd_get_page(xfer->frbuffers + 0, buf_offset-1, &buf_res); This can lead to invalid memory access in some special cases. Non-isochronous transfers are not affected. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ohci.c#57 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#57 (text+ko) ==== @@ -1907,24 +1907,22 @@ struct ohci_hcca *hcca; uint32_t buf_offset; uint32_t nframes; - uint32_t bp0; - uint32_t end_phy; uint32_t ed_flags; uint32_t *plen; uint16_t itd_offset[OHCI_ITD_NOFFSET]; + uint16_t length; uint8_t ncur; - uint8_t allzero = 1; ohci_itd_t *td; ohci_itd_t *td_last = NULL; ohci_ed_t *ed; - DPRINTFN(5, ("xfer=%p next=%d nframes=%d\n", - xfer, xfer->pipe->isoc_next, xfer->nframes)); - hcca = ohci_get_hcca(sc); nframes = le32toh(hcca->hcca_frame_number); + DPRINTFN(5, ("xfer=%p isoc_next=%u nframes=%u hcca_fn=%u\n", + xfer, xfer->pipe->isoc_next, xfer->nframes, nframes)); + if ((LIST_FIRST(&(xfer->pipe->list_head)) == NULL) || (((nframes - xfer->pipe->isoc_next) & 0xFFFF) < xfer->nframes) || (((xfer->pipe->isoc_next - nframes) & 0xFFFF) >= 128)) { @@ -1955,7 +1953,6 @@ nframes = xfer->nframes; buf_offset = 0; - usbd_get_page(xfer->frbuffers + 0, buf_offset, &buf_res); plen = xfer->frlengths; @@ -1968,32 +1965,24 @@ xfer->td_transfer_first = td; ncur = 0; - - bp0 = OHCI_PAGE(buf_res.physaddr); + length = 0; - end_phy = 0; - while (nframes--) { if (td == NULL) { panic("%s:%d: out of TD's\n", __FUNCTION__, __LINE__); } - itd_offset[ncur] = htole16(OHCI_ITD_MK_OFFS - (buf_res.physaddr - bp0)); - if (*plen) { - allzero = 0; - buf_offset += (*plen) - 1; - usbd_get_page(xfer->frbuffers + 0, buf_offset, &buf_res); - - end_phy = buf_res.physaddr; - buf_offset += 1; - usbd_get_page(xfer->frbuffers + 0, buf_offset, &buf_res); - } + itd_offset[ncur] = length; + buf_offset += *plen; + length += *plen; plen++; ncur++; - if ((ncur == OHCI_ITD_NOFFSET) || - (OHCI_PAGE(buf_res.physaddr) != bp0) || + if (/* check if the ITD is full */ + (ncur == OHCI_ITD_NOFFSET) || + /* check if we have put more than 4K into the ITD */ + (length & 0xF000) || + /* check if it is the last frame */ (nframes == 0)) { /* fill current ITD */ @@ -2003,22 +1992,37 @@ OHCI_ITD_NOINTR | OHCI_ITD_SET_FC(ncur)); - if (allzero) { + td->frames = ncur; + xfer->pipe->isoc_next += ncur; + + if (length == 0) { + /* all zero */ td->itd_bp0 = 0; td->itd_be = ~0; + + while (ncur--) { + td->itd_offset[ncur] = + htole16(OHCI_ITD_MK_OFFS(0)); + } } else { - td->itd_bp0 = htole32(bp0); - td->itd_be = htole32(end_phy); - } - td->frames = ncur; + usbd_get_page(xfer->frbuffers + 0, buf_offset-length, &buf_res); + length = OHCI_PAGE_MASK(buf_res.physaddr); + buf_res.physaddr = + OHCI_PAGE(buf_res.physaddr); + td->itd_bp0 = htole32(buf_res.physaddr); + usbd_get_page(xfer->frbuffers + 0, buf_offset-1, &buf_res); + td->itd_be = htole32(buf_res.physaddr); - xfer->pipe->isoc_next += ncur; - bp0 = OHCI_PAGE(buf_res.physaddr); - while (ncur--) { - td->itd_offset[ncur] = itd_offset[ncur]; + while (ncur--) { + itd_offset[ncur] += length; + itd_offset[ncur] = + OHCI_ITD_MK_OFFS(itd_offset[ncur]); + td->itd_offset[ncur] = + htole16(itd_offset[ncur]); + } } ncur = 0; - allzero = 1; + length = 0; td_last = td; td = td->obj_next; From owner-p4-projects@FreeBSD.ORG Sun Jan 13 11:45:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E49C16A52C; Sun, 13 Jan 2008 11:45:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 984F516A41A for ; Sun, 13 Jan 2008 11:45:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9917613C478 for ; Sun, 13 Jan 2008 11:45:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0DBjrox077782 for ; Sun, 13 Jan 2008 11:45:53 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0DBjr9R077779 for perforce@freebsd.org; Sun, 13 Jan 2008 11:45:53 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 13 Jan 2008 11:45:53 GMT Message-Id: <200801131145.m0DBjr9R077779@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 133183 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 11:45:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=133183 Change 133183 by hselasky@hselasky_laptop001 on 2008/01/13 11:45:39 Style change by "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ohci.c#58 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#58 (text+ko) ==== @@ -1921,7 +1921,7 @@ nframes = le32toh(hcca->hcca_frame_number); DPRINTFN(5, ("xfer=%p isoc_next=%u nframes=%u hcca_fn=%u\n", - xfer, xfer->pipe->isoc_next, xfer->nframes, nframes)); + xfer, xfer->pipe->isoc_next, xfer->nframes, nframes)); if ((LIST_FIRST(&(xfer->pipe->list_head)) == NULL) || (((nframes - xfer->pipe->isoc_next) & 0xFFFF) < xfer->nframes) || @@ -1978,11 +1978,11 @@ plen++; ncur++; - if (/* check if the ITD is full */ + if ( /* check if the ITD is full */ (ncur == OHCI_ITD_NOFFSET) || - /* check if we have put more than 4K into the ITD */ - (length & 0xF000) || - /* check if it is the last frame */ + /* check if we have put more than 4K into the ITD */ + (length & 0xF000) || + /* check if it is the last frame */ (nframes == 0)) { /* fill current ITD */ @@ -2001,24 +2001,24 @@ td->itd_be = ~0; while (ncur--) { - td->itd_offset[ncur] = - htole16(OHCI_ITD_MK_OFFS(0)); + td->itd_offset[ncur] = + htole16(OHCI_ITD_MK_OFFS(0)); } } else { - usbd_get_page(xfer->frbuffers + 0, buf_offset-length, &buf_res); + usbd_get_page(xfer->frbuffers + 0, buf_offset - length, &buf_res); length = OHCI_PAGE_MASK(buf_res.physaddr); - buf_res.physaddr = - OHCI_PAGE(buf_res.physaddr); + buf_res.physaddr = + OHCI_PAGE(buf_res.physaddr); td->itd_bp0 = htole32(buf_res.physaddr); - usbd_get_page(xfer->frbuffers + 0, buf_offset-1, &buf_res); + usbd_get_page(xfer->frbuffers + 0, buf_offset - 1, &buf_res); td->itd_be = htole32(buf_res.physaddr); while (ncur--) { itd_offset[ncur] += length; - itd_offset[ncur] = - OHCI_ITD_MK_OFFS(itd_offset[ncur]); - td->itd_offset[ncur] = - htole16(itd_offset[ncur]); + itd_offset[ncur] = + OHCI_ITD_MK_OFFS(itd_offset[ncur]); + td->itd_offset[ncur] = + htole16(itd_offset[ncur]); } } ncur = 0; From owner-p4-projects@FreeBSD.ORG Sun Jan 13 11:54:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93B8516A420; Sun, 13 Jan 2008 11:54:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5984416A41A for ; Sun, 13 Jan 2008 11:54:03 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 596C113C467 for ; Sun, 13 Jan 2008 11:54:03 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0DBs3tg079153 for ; Sun, 13 Jan 2008 11:54:03 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0DBs2DE079136 for perforce@freebsd.org; Sun, 13 Jan 2008 11:54:02 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 13 Jan 2008 11:54:02 GMT Message-Id: <200801131154.m0DBs2DE079136@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 133184 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 11:54:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=133184 Change 133184 by hselasky@hselasky_laptop001 on 2008/01/13 11:53:19 UHCI bugfix. Avoid fixups on isochronous transfers that have a length of zero bytes, because "usbd_get_page()" might access invalid memory in the case the total length of all the isochronous transfer(s) is also zero bytes. This is because no memory is loaded into DMA if the total transfer length is zero bytes. This also will fix an "off by one" issue in some special cases where "usbd_get_page()" is involved. Non-isochronous transfers are not affected by this change. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uhci.c#58 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#58 (text+ko) ==== @@ -2255,10 +2255,22 @@ td->len = *plen; + if (td->len == 0) { + /* + * Do not call "uhci_mem_layout_fixup()" when + * the length is zero! + */ + td->td_buffer = 0; + td->fix_pc = NULL; + + } else { + /* fill out buffer pointer and do fixup, if any */ uhci_mem_layout_fixup(&ml, td); + } + /* update status */ if (nframes == 0) { td->td_status = htole32 From owner-p4-projects@FreeBSD.ORG Sun Jan 13 11:54:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5365816A516; Sun, 13 Jan 2008 11:54:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E15616A417 for ; Sun, 13 Jan 2008 11:54:03 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7E20613C468 for ; Sun, 13 Jan 2008 11:54:03 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0DBs3uI079159 for ; Sun, 13 Jan 2008 11:54:03 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0DBs3Sw079156 for perforce@freebsd.org; Sun, 13 Jan 2008 11:54:03 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 13 Jan 2008 11:54:03 GMT Message-Id: <200801131154.m0DBs3Sw079156@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 133185 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 11:54:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=133185 Change 133185 by hselasky@hselasky_laptop001 on 2008/01/13 11:53:48 Style change by "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uhci.c#59 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#59 (text+ko) ==== @@ -2256,18 +2256,18 @@ td->len = *plen; if (td->len == 0) { - /* - * Do not call "uhci_mem_layout_fixup()" when - * the length is zero! + /* + * Do not call "uhci_mem_layout_fixup()" when the + * length is zero! */ td->td_buffer = 0; td->fix_pc = NULL; } else { - /* fill out buffer pointer and do fixup, if any */ + /* fill out buffer pointer and do fixup, if any */ - uhci_mem_layout_fixup(&ml, td); + uhci_mem_layout_fixup(&ml, td); } From owner-p4-projects@FreeBSD.ORG Sun Jan 13 13:07:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B58C216A41A; Sun, 13 Jan 2008 13:07:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B27E16A418 for ; Sun, 13 Jan 2008 13:07:21 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 79B1413C45A for ; Sun, 13 Jan 2008 13:07:21 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0DD7Lkr000618 for ; Sun, 13 Jan 2008 13:07:21 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0DD7LhZ000615 for perforce@freebsd.org; Sun, 13 Jan 2008 13:07:21 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 Jan 2008 13:07:21 GMT Message-Id: <200801131307.m0DD7LhZ000615@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 133188 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 13:07:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=133188 Change 133188 by sephe@sephe_zealot:sam_wifi on 2008/01/13 13:07:16 - Add ieee80211_phy into wlan module - During wlan module loading, initialize various rate tables - During ieee80211_ifattach() set channel's rate table Affected files ... .. //depot/projects/wifi/sys/modules/wlan/Makefile#10 edit .. //depot/projects/wifi/sys/net80211/_ieee80211.h#27 edit .. //depot/projects/wifi/sys/net80211/ieee80211.c#59 edit .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#32 edit .. //depot/projects/wifi/sys/net80211/ieee80211_phy.c#2 edit .. //depot/projects/wifi/sys/net80211/ieee80211_phy.h#1 add Differences ... ==== //depot/projects/wifi/sys/modules/wlan/Makefile#10 (text+ko) ==== @@ -7,7 +7,7 @@ ieee80211_freebsd.c ieee80211_input.c ieee80211_ioctl.c \ ieee80211_node.c ieee80211_output.c ieee80211_power.c \ ieee80211_proto.c ieee80211_scan.c ieee80211_regdomain.c \ - ieee80211_ht.c + ieee80211_ht.c ieee80211_phy.c SRCS+= bus_if.h device_if.h opt_compat.h opt_inet.h opt_ipx.h .if !defined(KERNBUILDDIR) ==== //depot/projects/wifi/sys/net80211/_ieee80211.h#27 (text+ko) ==== @@ -102,6 +102,7 @@ /* * Channels are specified by frequency and attributes. */ +struct ieee80211_rate_table; struct ieee80211_channel { uint32_t ic_flags; /* see below */ uint16_t ic_freq; /* setting in Mhz */ @@ -111,6 +112,7 @@ int8_t ic_minpower; /* minimum tx power in .5 dBm */ uint8_t ic_state; /* dynamic state */ uint8_t ic_extieee; /* HT40 extension channel number */ + const struct ieee80211_rate_table *ic_rt; /* rate table */ }; #define IEEE80211_CHAN_MAX 255 ==== //depot/projects/wifi/sys/net80211/ieee80211.c#59 (text+ko) ==== @@ -42,6 +42,7 @@ #include #include +#include #include @@ -181,6 +182,9 @@ setbit(ic->ic_modecaps, IEEE80211_MODE_11NA); if (IEEE80211_IS_CHAN_HTG(c)) setbit(ic->ic_modecaps, IEEE80211_MODE_11NG); + + c->ic_rt = ieee80211_get_ratetable(c); + KASSERT(c->ic_rt != NULL, ("no channel rate table\n")); } /* initialize candidate channels to all available */ memcpy(ic->ic_chan_active, ic->ic_chan_avail, ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#32 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include +#include SYSCTL_NODE(_net, OID_AUTO, wlan, CTLFLAG_RD, 0, "IEEE 80211 parameters"); @@ -413,6 +414,7 @@ case MOD_LOAD: if (bootverbose) printf("wlan: <802.11 Link Layer>\n"); + ieee80211_phy_init(); return 0; case MOD_UNLOAD: return 0; ==== //depot/projects/wifi/sys/net80211/ieee80211_phy.c#2 (text+ko) ==== @@ -42,7 +42,9 @@ #include #include +#include +#ifdef notyet /* * Contention window (slots). */ @@ -75,7 +77,7 @@ uint16_t i_crc; } __packed; -uint8_t ieee80211_plcp2rate(uint8_t, int); +#endif /* notyet */ struct ieee80211_rate_table { int rateCount; /* NB: for proper padding */ @@ -94,14 +96,15 @@ } info[32]; }; -const struct ieee80211_rate_table *ieee80211_getratetable( - struct ieee80211_channel *); +#ifdef notyet +uint8_t ieee80211_plcp2rate(uint8_t, int); enum ieee80211_phytype ieee80211_rate2phytype( const struct ieee80211_rate_table *, uint8_t rate); uint8_t ieee80211_ack_rate(const struct ieee80211_rate_table *, uint8_t rate); uint16_t ieee80211_compute_txtime(const struct ieee80211_rate_table *, uint32_t frameLen, uint16_t rate, int flags); +#endif /* notyet */ /* shorthands to compact tables for readability */ #define OFDM IEEE80211_T_OFDM @@ -168,8 +171,8 @@ { /* short ctrl */ /* Preamble dot11Rate Rate */ -/* 6 Mb */ { OFDM, 3000, 0x00, (0x80|6), 0 }, -/* 9 Mb */ { OFDM, 4500, 0x00, 9, 0 }, +/* 6 Mb */ { OFDM, 3000, 0x00, (0x80| 6), 0 }, +/* 9 Mb */ { OFDM, 4500, 0x00, 9, 0 }, /* 12 Mb */ { OFDM, 6000, 0x00, (0x80|12), 2 }, /* 18 Mb */ { OFDM, 9000, 0x00, 18, 2 }, /* 24 Mb */ { OFDM, 12000, 0x00, (0x80|24), 4 }, @@ -185,9 +188,9 @@ { /* short ctrl */ /* Preamble dot11Rate Rate */ -/* 6 Mb */ { OFDM, 1500, 0x00, (0x80|3), 0 }, -/* 9 Mb */ { OFDM, 2250, 0x00, 4, 0 }, -/* 12 Mb */ { OFDM, 3000, 0x00, (0x80|6), 2 }, +/* 6 Mb */ { OFDM, 1500, 0x00, (0x80| 3), 0 }, +/* 9 Mb */ { OFDM, 2250, 0x00, 4, 0 }, +/* 12 Mb */ { OFDM, 3000, 0x00, (0x80| 6), 2 }, /* 18 Mb */ { OFDM, 4500, 0x00, 9, 2 }, /* 24 Mb */ { OFDM, 6000, 0x00, (0x80|12), 4 }, /* 36 Mb */ { OFDM, 9000, 0x00, 18, 4 }, @@ -234,6 +237,34 @@ #undef TURBO #undef XR +static void ieee80211_setup_ratetable(struct ieee80211_rate_table *); + +/* Setup all rate tables */ +void +ieee80211_phy_init(void) +{ + static struct ieee80211_rate_table * const ratetables[] = { + &ieee80211_half_table, + &ieee80211_quarter_table, + &ieee80211_11a_table, + &ieee80211_11g_table, + &ieee80211_turbog_table, + &ieee80211_turboa_table, + &ieee80211_turboa_table, + &ieee80211_11a_table, + &ieee80211_11g_table, + &ieee80211_11b_table + }; + int i; + +#define N(arr) (int)(sizeof(arr) / sizeof(arr[0])) + + for (i = 0; i < N(ratetables); ++i) + ieee80211_setup_ratetable(ratetables[i]); + +#undef N +} + /* * Setup a rate table's reverse lookup table and fill in * ack durations. The reverse lookup tables are assumed @@ -244,7 +275,7 @@ * XXX not reentrant, but shouldn't matter */ static void -ieee80211_setupratetable(struct ieee80211_rate_table *rt) +ieee80211_setup_ratetable(struct ieee80211_rate_table *rt) { #define N(a) (sizeof(a)/sizeof(a[0])) #define WLAN_CTRL_FRAME_SIZE (2+2+6+4) /* ACK+FCS */ @@ -254,13 +285,11 @@ rt->rateCodeToIndex[i] = (uint8_t) -1; for (i = 0; i < rt->rateCount; i++) { uint8_t code = rt->info[i].dot11Rate; +#ifdef notyet uint8_t cix = rt->info[i].controlRate; +#endif - KASSERT(code < N(rt->rateCodeToIndex), ("code %d", code)); rt->rateCodeToIndex[code] = i; - KASSERT((code | rt->info[i].shortPreamble) < - N(rt->rateCodeToIndex), - ("code %d preamble %d", code, rt->info[i].shortPreamble)); rt->rateCodeToIndex[code | rt->info[i].shortPreamble] = i; if (code & IEEE80211_RATE_BASIC) { /* @@ -270,6 +299,8 @@ rt->rateCodeToIndex[code] = i; rt->rateCodeToIndex[code | rt->info[i].shortPreamble] = i; } + +#ifdef notyet /* * XXX for 11g the control rate to use for 5.5 and 11 Mb/s * depends on whether they are marked as basic rates; @@ -280,13 +311,14 @@ WLAN_CTRL_FRAME_SIZE, cix, 0); rt->info[i].spAckDuration = ieee80211_compute_txtime(rt, WLAN_CTRL_FRAME_SIZE, cix, 1); +#endif /* notyet */ } #undef WLAN_CTRL_FRAME_SIZE #undef N } const struct ieee80211_rate_table * -ieee80211_getratetable(struct ieee80211_channel *c) +ieee80211_get_ratetable(struct ieee80211_channel *c) { struct ieee80211_rate_table *rt; @@ -313,15 +345,14 @@ rt = &ieee80211_11b_table; else { /* NB: should not get here */ - printf("%s: no rate table for channel; freq %u flags 0x%x\n", - __func__, c->ic_freq, c->ic_flags); - return NULL; + panic("%s: no rate table for channel; freq %u flags 0x%x\n", + __func__, c->ic_freq, c->ic_flags); } - if (rt != NULL && rt->rateCodeToIndex[0] == 0) /* not setup */ - ieee80211_setupratetable(rt); return rt; } +#ifdef notyet + /* * Covert PLCP signal/rate field to net80211 rate (.5Mbits/s) */ @@ -484,3 +515,5 @@ } return txTime; } + +#endif /* notyet */ From owner-p4-projects@FreeBSD.ORG Sun Jan 13 14:58:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D7AC616A41B; Sun, 13 Jan 2008 14:58:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9D2F116A418 for ; Sun, 13 Jan 2008 14:58:21 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 993DF13C45B for ; Sun, 13 Jan 2008 14:58:21 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0DEwL7d022891 for ; Sun, 13 Jan 2008 14:58:21 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0DEwLim022888 for perforce@freebsd.org; Sun, 13 Jan 2008 14:58:21 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 13 Jan 2008 14:58:21 GMT Message-Id: <200801131458.m0DEwLim022888@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 133192 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 14:58:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=133192 Change 133192 by hselasky@hselasky_laptop001 on 2008/01/13 14:58:20 Important patch. Sometimes the BUS-DMA framework will not report all segments, even if the virtual memory we load is crossing a segment! Because BUS-DMA starts counting "maxsegsz" from the "aligned" memory location, and when align=1 byte we are in for trouble. I'm not sure sure if this is a bug in BUS-DMA. Solution: Manually extend the last segment. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#86 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#86 (text+ko) ==== @@ -2269,6 +2269,7 @@ struct usbd_page *pg; uint32_t rem; uint8_t owned; + uint8_t ext_seg; /* extend last segment */ pc = arg; xfer = pc->xfer; @@ -2297,6 +2298,12 @@ rem = segs->ds_addr & (USB_PAGE_SIZE - 1); pc->page_offset_buf = rem; pc->page_offset_end += rem; + if (nseg < ((pc->page_offset_end + + (USB_PAGE_SIZE - 1)) / USB_PAGE_SIZE)) { + ext_seg = 1; + } else { + ext_seg = 0; + } nseg--; while (nseg > 0) { @@ -2306,6 +2313,14 @@ pg->physaddr = segs->ds_addr & ~(USB_PAGE_SIZE - 1); } + /* + * XXX The segments we get from BUS-DMA are not aligned, + * XXX so we need to extend the last segment if we are + * XXX unaligned and cross the segment boundary! + */ + if (ext_seg) { + (pg + 1)->physaddr = pg->physaddr + USB_PAGE_SIZE; + } if (xfer) { owned = mtx_owned(xfer->priv_mtx); if (!owned) @@ -2572,6 +2587,7 @@ struct usbd_page *pg; uint32_t rem; uint8_t owned; + uint8_t ext_seg; /* extend last segment */ xfer = pc->xfer; @@ -2599,6 +2615,12 @@ rem = segs->ds_addr & (USB_PAGE_SIZE - 1); pc->page_offset_buf = rem; pc->page_offset_end += rem; + if (nseg < ((pc->page_offset_end + + (USB_PAGE_SIZE - 1)) / USB_PAGE_SIZE)) { + ext_seg = 1; + } else { + ext_seg = 0; + } nseg--; while (nseg > 0) { @@ -2608,6 +2630,14 @@ pg->physaddr = segs->ds_addr & ~(USB_PAGE_SIZE - 1); } + /* + * XXX The segments we get from BUS-DMA are not aligned, + * XXX so we need to extend the last segment if we are + * XXX unaligned and cross the segment boundary! + */ + if (ext_seg) { + (pg + 1)->physaddr = pg->physaddr + USB_PAGE_SIZE; + } if (xfer) { owned = mtx_owned(xfer->priv_mtx); if (!owned) From owner-p4-projects@FreeBSD.ORG Sun Jan 13 15:11:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88B2216A41B; Sun, 13 Jan 2008 15:11:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4E15A16A419 for ; Sun, 13 Jan 2008 15:11:35 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4833613C455 for ; Sun, 13 Jan 2008 15:11:35 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0DFBZnh026562 for ; Sun, 13 Jan 2008 15:11:35 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0DFBZri026556 for perforce@freebsd.org; Sun, 13 Jan 2008 15:11:35 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 13 Jan 2008 15:11:35 GMT Message-Id: <200801131511.m0DFBZri026556@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 133193 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 15:11:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=133193 Change 133193 by hselasky@hselasky_laptop001 on 2008/01/13 15:10:39 EHCI bugfix. Fix two "off by one" issues in the isochronous endpoint routines for HIGH and FULL speed alike the ones recently found in the OHCI and UHCI driver. Basically there are two issues: 1) don't call usbd_get_page() when the buffer length is zero. 2) don't call usbd_get_page() with an offset equal to the buffer size. Use buffer size minus one if not case 1. This issue does not affect any non-isochronous endpoints. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci.c#70 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#70 (text+ko) ==== @@ -2474,7 +2474,6 @@ nframes = xfer->nframes; buf_offset = 0; - usbd_get_page(xfer->frbuffers + 0, buf_offset, &buf_res); plen = xfer->frlengths; @@ -2524,12 +2523,20 @@ */ sa = usbd_fs_isoc_schedule_alloc(fss, *plen); + if (*plen) { + /* only call "usbd_get_page()" when we have a non-zero length */ + usbd_get_page(xfer->frbuffers + 0, buf_offset, &buf_res); td->sitd_bp[0] = htole32(buf_res.physaddr); - buf_offset += *plen; - usbd_get_page(xfer->frbuffers + 0, buf_offset, &buf_res); - - temp = buf_res.physaddr & (~0xFFF); + /* NOTE: We need to subtract one from the + * offset so that we are on a valid page! + */ + usbd_get_page(xfer->frbuffers + 0, buf_offset-1, &buf_res); + temp = buf_res.physaddr & ~0xFFF; + } else { + td->sitd_bp[0] = 0; + temp = 0; + } if (UE_GET_DIR(xfer->endpoint) == UE_DIR_OUT) { tlen = *plen; @@ -2696,8 +2703,10 @@ uint32_t buf_offset; uint32_t nframes; uint32_t *plen; + uint32_t itd_offset[8+1]; + uint8_t x; + uint8_t td_no; uint8_t page_no; - uint8_t td_no; #ifdef USB_DEBUG uint8_t once = 1; @@ -2752,10 +2761,6 @@ nframes = xfer->nframes; buf_offset = 0; - usbd_get_page(xfer->frbuffers + 0, buf_offset, &buf_res); - - page_addr = buf_res.physaddr & ~0xFFF; - page_no = 0; td_no = 0; plen = xfer->frlengths; @@ -2793,78 +2798,70 @@ #endif *plen = xfer->max_frame_size; } - if (td_no == 0) { + + status = (EHCI_ITD_SET_LEN(*plen) | + EHCI_ITD_ACTIVE | + EHCI_ITD_SET_PG(0)); + td->itd_status[td_no] = htole32(status); + itd_offset[td_no] = buf_offset; + buf_offset += *plen; + plen++; + td_no++; + + if ((td_no == 8) || (nframes == 0)) { + + /* the rest of the transfers are not active, if any */ + for (x = td_no; x != 8; x++) { + td->itd_status[x] = 0; /* not active */ + } + + /* check if there is any data to be transferred */ + if (itd_offset[0] != buf_offset) { + page_no = 0; + itd_offset[td_no] = buf_offset; + + /* get first page offset */ + usbd_get_page(xfer->frbuffers + 0, itd_offset[0], &buf_res); + /* get page address */ + page_addr = buf_res.physaddr & ~0xFFF; - /* update page address */ - td->itd_bp[page_no] &= htole32(0xFFF); - td->itd_bp[page_no] |= htole32(page_addr); + for (x = 0; x != td_no; x++) { + /* set page number and page offset */ + status = (EHCI_ITD_SET_PG(page_no) | + (buf_res.physaddr & 0xFFF)); + td->itd_status[x] |= htole32(status); - if (nframes < 7) { - /* - * clear all status in case some are not - * initialized + /* get next page offset */ + if (itd_offset[x+1] == buf_offset) { + /* + * We subtract one so that we don't go + * off the last page! */ - td->itd_status[0] = 0; - td->itd_status[1] = 0; - td->itd_status[2] = 0; - td->itd_status[3] = 0; - td->itd_status[4] = 0; - td->itd_status[5] = 0; - td->itd_status[6] = 0; - td->itd_status[7] = 0; + usbd_get_page(xfer->frbuffers + 0, buf_offset-1, &buf_res); + } else { + usbd_get_page(xfer->frbuffers + 0, itd_offset[x+1], &buf_res); } - } - /* compute status */ - if (nframes == 0) { - status = - (EHCI_ITD_SET_LEN(*plen) | - EHCI_ITD_ACTIVE | - EHCI_ITD_IOC | - EHCI_ITD_SET_PG(page_no) | - (buf_res.physaddr & 0xFFF)); - } else { - status = - (EHCI_ITD_SET_LEN(*plen) | - EHCI_ITD_ACTIVE | - EHCI_ITD_SET_PG(page_no) | - (buf_res.physaddr & 0xFFF)); - } - buf_offset += *plen; - usbd_get_page(xfer->frbuffers + 0, buf_offset, &buf_res); - - if ((buf_res.physaddr ^ page_addr) & ~0xFFF) { - /* new page needed */ - page_addr = buf_res.physaddr & ~0xFFF; - page_no++; - - if (page_no < 7) { + /* check if we need a new page */ + if ((buf_res.physaddr ^ page_addr) & ~0xFFF) { + /* new page needed */ + page_addr = buf_res.physaddr & ~0xFFF; + if (page_no == 6) { + panic("%s: too many pages\n", __FUNCTION__); + } + page_no++; /* update page address */ td->itd_bp[page_no] &= htole32(0xFFF); td->itd_bp[page_no] |= htole32(page_addr); } - } - if (page_no < 7) { - /* activate the transfer */ - td->itd_status[td_no] = htole32(status); - } else { - /* pretend that the transfer has finished */ - td->itd_status[td_no] = (nframes == 0) ? - htole32(EHCI_ITD_IOC) : 0; -#ifdef USB_DEBUG - if (once) { - once = 0; - printf("%s: isoc limit reached! " - "Max %d bytes per 8 frames. Frame skipped.\n", - __FUNCTION__, (6 << 12)); + } + } + + /* set IOC bit if we are complete */ + if (nframes == 0) { + td->itd_status[7] |= htole32(EHCI_ITD_IOC); } -#endif - } - - plen++; - td_no++; - if ((td_no == 8) || (nframes == 0)) { usbd_pc_cpu_flush(td->page_cache); #ifdef USB_DEBUG if (ehcidebug > 15) { @@ -2876,7 +2873,6 @@ EHCI_APPEND_HS_TD(td, *pp_last); pp_last++; - page_no = 0; td_no = 0; td_last = td; td = td->obj_next; From owner-p4-projects@FreeBSD.ORG Sun Jan 13 15:11:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F88316A520; Sun, 13 Jan 2008 15:11:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8B6BE16A420 for ; Sun, 13 Jan 2008 15:11:35 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 85A7B13C457 for ; Sun, 13 Jan 2008 15:11:35 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0DFBZgH026570 for ; Sun, 13 Jan 2008 15:11:35 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0DFBZVK026566 for perforce@freebsd.org; Sun, 13 Jan 2008 15:11:35 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 13 Jan 2008 15:11:35 GMT Message-Id: <200801131511.m0DFBZVK026566@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 133194 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 15:11:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=133194 Change 133194 by hselasky@hselasky_laptop001 on 2008/01/13 15:11:19 Style change by "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci.c#71 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#71 (text+ko) ==== @@ -2524,15 +2524,19 @@ sa = usbd_fs_isoc_schedule_alloc(fss, *plen); if (*plen) { - /* only call "usbd_get_page()" when we have a non-zero length */ - usbd_get_page(xfer->frbuffers + 0, buf_offset, &buf_res); - td->sitd_bp[0] = htole32(buf_res.physaddr); - buf_offset += *plen; - /* NOTE: We need to subtract one from the - * offset so that we are on a valid page! + /* + * only call "usbd_get_page()" when we have a + * non-zero length + */ + usbd_get_page(xfer->frbuffers + 0, buf_offset, &buf_res); + td->sitd_bp[0] = htole32(buf_res.physaddr); + buf_offset += *plen; + /* + * NOTE: We need to subtract one from the offset so + * that we are on a valid page! */ - usbd_get_page(xfer->frbuffers + 0, buf_offset-1, &buf_res); - temp = buf_res.physaddr & ~0xFFF; + usbd_get_page(xfer->frbuffers + 0, buf_offset - 1, &buf_res); + temp = buf_res.physaddr & ~0xFFF; } else { td->sitd_bp[0] = 0; temp = 0; @@ -2703,7 +2707,7 @@ uint32_t buf_offset; uint32_t nframes; uint32_t *plen; - uint32_t itd_offset[8+1]; + uint32_t itd_offset[8 + 1]; uint8_t x; uint8_t td_no; uint8_t page_no; @@ -2798,10 +2802,9 @@ #endif *plen = xfer->max_frame_size; } - status = (EHCI_ITD_SET_LEN(*plen) | - EHCI_ITD_ACTIVE | - EHCI_ITD_SET_PG(0)); + EHCI_ITD_ACTIVE | + EHCI_ITD_SET_PG(0)); td->itd_status[td_no] = htole32(status); itd_offset[td_no] = buf_offset; buf_offset += *plen; @@ -2810,58 +2813,57 @@ if ((td_no == 8) || (nframes == 0)) { - /* the rest of the transfers are not active, if any */ - for (x = td_no; x != 8; x++) { - td->itd_status[x] = 0; /* not active */ - } + /* the rest of the transfers are not active, if any */ + for (x = td_no; x != 8; x++) { + td->itd_status[x] = 0; /* not active */ + } - /* check if there is any data to be transferred */ - if (itd_offset[0] != buf_offset) { - page_no = 0; - itd_offset[td_no] = buf_offset; + /* check if there is any data to be transferred */ + if (itd_offset[0] != buf_offset) { + page_no = 0; + itd_offset[td_no] = buf_offset; - /* get first page offset */ - usbd_get_page(xfer->frbuffers + 0, itd_offset[0], &buf_res); - /* get page address */ - page_addr = buf_res.physaddr & ~0xFFF; + /* get first page offset */ + usbd_get_page(xfer->frbuffers + 0, itd_offset[0], &buf_res); + /* get page address */ + page_addr = buf_res.physaddr & ~0xFFF; - for (x = 0; x != td_no; x++) { - /* set page number and page offset */ - status = (EHCI_ITD_SET_PG(page_no) | - (buf_res.physaddr & 0xFFF)); - td->itd_status[x] |= htole32(status); + for (x = 0; x != td_no; x++) { + /* set page number and page offset */ + status = (EHCI_ITD_SET_PG(page_no) | + (buf_res.physaddr & 0xFFF)); + td->itd_status[x] |= htole32(status); - /* get next page offset */ - if (itd_offset[x+1] == buf_offset) { - /* - * We subtract one so that we don't go - * off the last page! - */ - usbd_get_page(xfer->frbuffers + 0, buf_offset-1, &buf_res); - } else { - usbd_get_page(xfer->frbuffers + 0, itd_offset[x+1], &buf_res); - } + /* get next page offset */ + if (itd_offset[x + 1] == buf_offset) { + /* + * We subtract one so that + * we don't go off the last + * page! + */ + usbd_get_page(xfer->frbuffers + 0, buf_offset - 1, &buf_res); + } else { + usbd_get_page(xfer->frbuffers + 0, itd_offset[x + 1], &buf_res); + } - /* check if we need a new page */ - if ((buf_res.physaddr ^ page_addr) & ~0xFFF) { - /* new page needed */ - page_addr = buf_res.physaddr & ~0xFFF; - if (page_no == 6) { - panic("%s: too many pages\n", __FUNCTION__); + /* check if we need a new page */ + if ((buf_res.physaddr ^ page_addr) & ~0xFFF) { + /* new page needed */ + page_addr = buf_res.physaddr & ~0xFFF; + if (page_no == 6) { + panic("%s: too many pages\n", __FUNCTION__); + } + page_no++; + /* update page address */ + td->itd_bp[page_no] &= htole32(0xFFF); + td->itd_bp[page_no] |= htole32(page_addr); + } } - page_no++; - /* update page address */ - td->itd_bp[page_no] &= htole32(0xFFF); - td->itd_bp[page_no] |= htole32(page_addr); } - } - } - /* set IOC bit if we are complete */ if (nframes == 0) { td->itd_status[7] |= htole32(EHCI_ITD_IOC); } - usbd_pc_cpu_flush(td->page_cache); #ifdef USB_DEBUG if (ehcidebug > 15) { From owner-p4-projects@FreeBSD.ORG Sun Jan 13 21:22:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB51216A419; Sun, 13 Jan 2008 21:22:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 681A216A417 for ; Sun, 13 Jan 2008 21:22:16 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4DA7613C447 for ; Sun, 13 Jan 2008 21:22:16 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0DLMG8h008177 for ; Sun, 13 Jan 2008 21:22:16 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0DLMGaI008173 for perforce@freebsd.org; Sun, 13 Jan 2008 21:22:16 GMT (envelope-from jhb@freebsd.org) Date: Sun, 13 Jan 2008 21:22:16 GMT Message-Id: <200801132122.m0DLMGaI008173@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 Cc: Subject: PERFORCE change 133201 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2008 21:22:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=133201 Change 133201 by jhb@jhb_mutex on 2008/01/13 21:22:13 Move the DPMS patches out of the acpi_video(4) driver and into a new i386-only dpms(4) module/driver. Affected files ... .. //depot/projects/power/notes#13 edit .. //depot/projects/power/sys/dev/acpica/acpi_video.c#7 edit .. //depot/user/jhb/acpipci/conf/files.i386#97 edit .. //depot/user/jhb/acpipci/i386/isa/dpms.c#1 add .. //depot/user/jhb/acpipci/modules/Makefile#98 edit .. //depot/user/jhb/acpipci/modules/dpms/Makefile#1 add Differences ... ==== //depot/projects/power/notes#13 (text+ko) ==== @@ -72,8 +72,6 @@ Other stuff: -- Make the DPMS support in acpi_video a separate driver that attaches to - vgapci0 - Automated idle device power management - Basic idea is that when a device is idle for a specified amount of time, it should power down into D1 or D2. For example, NICs can power down ==== //depot/projects/power/sys/dev/acpica/acpi_video.c#7 (text+ko) ==== @@ -1,6 +1,5 @@ /*- * Copyright (c) 2002-2003 Taku YAMAMOTO - * Copyright (c) 2004 Benjamin Close * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -38,33 +37,10 @@ #include #include #include -#ifdef __i386__ -#include -#endif #include #include -#ifdef __i386__ -#define USE_DPMS - -/* - * VESA DPMS States - */ -#define DPMS_ON 0x00 -#define DPMS_STANDBY 0x01 -#define DPMS_SUSPEND 0x02 -#define DPMS_OFF 0x04 -#define DPMS_REDUCEDON 0x08 - -#define VBE_DPMS_FUNCTION 0x4F10 -#define VBE_DPMS_GET_SUPPORTED_STATES 0x00 -#define VBE_DPMS_GET_STATE 0x02 -#define VBE_DPMS_SET_STATE 0x01 -#define VBE_MAJORVERSION_MASK 0x0F -#define VBE_MINORVERSION_MASK 0xF0 -#endif - /* ACPI video extension driver. */ struct acpi_video_output { ACPI_HANDLE handle; @@ -90,10 +66,6 @@ ACPI_HANDLE handle; struct acpi_video_output_queue vid_outputs; eventhandler_tag vid_pwr_evh; -#ifdef USE_DPMS - int vid_dpms_supported_states; - int vid_dpms_initial_state; -#endif }; /* interfaces */ @@ -103,8 +75,6 @@ static int acpi_video_attach(device_t); static int acpi_video_detach(device_t); static int acpi_video_shutdown(device_t); -static int acpi_video_suspend(device_t); -static int acpi_video_resume(device_t); static void acpi_video_notify_handler(ACPI_HANDLE, UINT32, void *); static void acpi_video_power_profile(void *); static void acpi_video_bind_outputs(struct acpi_video_softc *); @@ -126,11 +96,6 @@ static UINT32 vo_get_device_status(ACPI_HANDLE); static UINT32 vo_get_graphics_state(ACPI_HANDLE); static void vo_set_device_state(ACPI_HANDLE, UINT32); -#ifdef USE_DPMS -static int dpms_get_supported_states(int *); -static int dpms_get_current_state(int *); -static int dpms_set_state(int); -#endif /* events */ #define VID_NOTIFY_SWITCHED 0x80 @@ -184,8 +149,6 @@ DEVMETHOD(device_attach, acpi_video_attach), DEVMETHOD(device_detach, acpi_video_detach), DEVMETHOD(device_shutdown, acpi_video_shutdown), - DEVMETHOD(device_resume, acpi_video_resume), - DEVMETHOD(device_suspend, acpi_video_suspend), { 0, 0 } }; @@ -301,13 +264,6 @@ acpi_video_power_profile(sc); -#ifdef USE_DPMS - if (dpms_get_supported_states(&sc->vid_dpms_supported_states) == 0) - dpms_get_current_state(&sc->vid_dpms_initial_state); - else - sc->vid_dpms_supported_states = -1; -#endif - return (0); } @@ -345,32 +301,6 @@ return (0); } -static int -acpi_video_suspend(device_t dev) -{ - struct acpi_video_softc *sc; - - sc = device_get_softc(dev); -#ifdef USE_DPMS - if (sc->vid_dpms_supported_states != -1) - dpms_set_state(DPMS_OFF); -#endif - return (0); -} - -static int -acpi_video_resume(device_t dev) -{ - struct acpi_video_softc *sc; - - sc = device_get_softc(dev); -#ifdef USE_DPMS - if (sc->vid_dpms_supported_states != -1) - dpms_set_state(sc->vid_dpms_initial_state); -#endif - return (0); -} - static void acpi_video_notify_handler(ACPI_HANDLE handle, UINT32 notify, void *context) { @@ -1008,48 +938,3 @@ printf("can't evaluate %s._DSS - %s\n", acpi_name(handle), AcpiFormatException(status)); } - -#ifdef USE_DPMS -static int -dpms_call_bios(int subfunction, int *bh) -{ - struct vm86frame vmf; - int error; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_ax = VBE_DPMS_FUNCTION; - vmf.vmf_bl = subfunction; - vmf.vmf_bh = *bh; - vmf.vmf_es = 0; - vmf.vmf_di = 0; - error = vm86_intcall(0x10, &vmf); - if (error == 0 && (vmf.vmf_eax & 0xffff) != 0x004f) - error = ENXIO; - if (error == 0) - *bh = vmf.vmf_bh; - return (error); -} - -static int -dpms_get_supported_states(int *states) -{ - - *states = 0; - return (dpms_call_bios(VBE_DPMS_GET_SUPPORTED_STATES, states)); -} - -static int -dpms_get_current_state(int *state) -{ - - *state = 0; - return (dpms_call_bios(VBE_DPMS_GET_STATE, state)); -} - -static int -dpms_set_state(int state) -{ - - return (dpms_call_bios(VBE_DPMS_SET_STATE, &state)); -} -#endif ==== //depot/user/jhb/acpipci/conf/files.i386#97 (text+ko) ==== @@ -346,6 +346,7 @@ i386/isa/atpic.c standard #i386/isa/atpic_vector.s standard i386/isa/clock.c standard +i386/isa/dpms.c optional dpms i386/isa/elcr.c standard i386/isa/elink.c optional ep | ie i386/isa/isa.c optional isa ==== //depot/user/jhb/acpipci/modules/Makefile#98 (text+ko) ==== @@ -70,6 +70,7 @@ dcons_crom \ de \ ${_digi} \ + ${_dpms} \ ${_dpt} \ ${_drm} \ dummynet \ @@ -380,6 +381,7 @@ _cpufreq= cpufreq _cs= cs _digi= digi +_dpms= dpms _drm= drm _ed= ed _elink= elink From owner-p4-projects@FreeBSD.ORG Mon Jan 14 01:56:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5683116A41B; Mon, 14 Jan 2008 01:56:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1BAEE16A419 for ; Mon, 14 Jan 2008 01:56:06 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 11E7A13C448 for ; Mon, 14 Jan 2008 01:56:06 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0E1u5x5083310 for ; Mon, 14 Jan 2008 01:56:05 GMT (envelope-from andre@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0E1u5q9083307 for perforce@freebsd.org; Mon, 14 Jan 2008 01:56:05 GMT (envelope-from andre@freebsd.org) Date: Mon, 14 Jan 2008 01:56:05 GMT Message-Id: <200801140156.m0E1u5q9083307@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andre@freebsd.org using -f From: Andre Oppermann To: Perforce Change Reviews Cc: Subject: PERFORCE change 133211 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 01:56:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=133211 Change 133211 by andre@andre_flirtbox on 2008/01/14 01:55:13 When missing segment prepend to first block instead of creating a new one Fix segment prepending Add KASSERT Update comments Affected files ... .. //depot/projects/tcp_reass/netinet/tcp_reass.c#3 edit Differences ... ==== //depot/projects/tcp_reass/netinet/tcp_reass.c#3 (text+ko) ==== @@ -182,7 +182,7 @@ /* Accounting. */ tcpstat.tcps_rcvoopack++; tcpstat.tcps_rcvoobyte += *tlenp; - /* NB: m_adj(m, -i) may free mbufs at the tail of a chain. */ + /* NB: m_adj(m, -i) may free mbufs at the tail of a chain. */ for (n = m; n; n = n->m_next) segs++; tp->t_trqlen += segs; @@ -206,11 +206,14 @@ tqe = TAILQ_FIRST(&tp->t_trq); KASSERT(tqe != NULL, ("%s: missing segment but nothing in queue", __func__)); + KASSERT(SEQ_GT(tqe->trq_seq, th->th_seq), + ("%s: first block already contains missing segment", __func__)); if (SEQ_LT(tqe->trq_seq, th->th_seq + *tlenp)) { - /* Trim tail. */ + /* Trim tail of segment. */ if ((i = tqe->trq_seq - (th->th_seq + *tlenp))) { m_adj(m, i); *tlenp -= i; + /* tcpstat */ /* Update accounting. */ if (segs > 1) { for (n = m; n; n = n->m_next) @@ -219,18 +222,26 @@ tcp_reass_qsize -= segs; } } + /* Segment prepends first block. */ + tqe->trq_len += *tlenp; + tqe->trq_segs += segs; + tqe->trq_seq = th->th_seq; + n = m_last(m); + n->m_next = tqe->trq_m; + tqe->trq_m = m; + goto present; } goto insert; } /* See where it fits. */ TAILQ_FOREACH(tqe, &tp->t_trq, trq_q) { - /* Segment is after our coverage. */ + /* Segment is after this blocks coverage. */ if (SEQ_LT(tqe->trq_seq + tqe->trq_len, th->th_seq)) continue; - /* Segment is after the previous one but before us. */ + /* Segment is after the previous one but before this one. */ if (SEQ_GT(tqe->trq_seq, th->th_seq + *tlenp)) - break; + break; /* Insert as new block. */ /* Segment is already fully covered. */ if (SEQ_LEQ(tqe->trq_seq, th->th_seq) && SEQ_GEQ(tqe->trq_seq + tqe->trq_len, th->th_seq + *tlenp)) { @@ -242,25 +253,28 @@ *tlenp = 0; return (0); } - /* Segment appends. */ + /* Segment appends to this block. */ if (SEQ_LEQ(tqe->trq_seq + tqe->trq_len, th->th_seq)) { - /* Trim head. */ + /* Trim head of segment. */ if ((i = tqe->trq_seq + tqe->trq_len - th->th_seq)) { m_adj(m, i); *tlenp -= i; + /* tcpstat */ } tqe->trq_len += *tlenp; tqe->trq_segs += segs; tqe->trq_ml->m_next = m; tqe->trq_ml = m_last(m); - /* Check for next block to merge. */ + /* Check if segment bridges two blocks to merge. */ if ((tqen = TAILQ_NEXT(tqe, trq_q)) && SEQ_GEQ(tqe->trq_seq + tqe->trq_len, tqen->trq_seq)) { - /* Trim head. */ + /* Trim head of next block. */ + /* XXXAO: Should trim tail of segment instead. */ if ((i = tqe->trq_seq + tqe->trq_len - tqen->trq_seq)) { m_adj(tqen->trq_m, i); tqen->trq_len -= i; + /* tcpstat */ } tqe->trq_len += tqen->trq_len; tqe->trq_segs += tqen->trq_segs; @@ -273,7 +287,7 @@ } /* Segment prepends. */ if (SEQ_GT(tqe->trq_seq, th->th_seq)) { - /* Trim tail. */ + /* Trim tail of segment. */ if ((i = tqe->trq_seq - (th->th_seq + *tlenp))) { m_adj(m, i); *tlenp -= i; @@ -287,9 +301,10 @@ } tqe->trq_len += *tlenp; tqe->trq_segs += segs; - tqe->trq_m = m; + tqe->trq_seq = th->th_seq; n = m_last(m); n->m_next = tqe->trq_m; + tqe->trq_m = m; return (0); } } From owner-p4-projects@FreeBSD.ORG Mon Jan 14 03:26:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5204D16A41B; Mon, 14 Jan 2008 03:26:40 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 17EE416A419 for ; Mon, 14 Jan 2008 03:26:40 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 13C6A13C43E for ; Mon, 14 Jan 2008 03:26:40 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0E3Qdke003141 for ; Mon, 14 Jan 2008 03:26:39 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0E3Qd9N003138 for perforce@freebsd.org; Mon, 14 Jan 2008 03:26:39 GMT (envelope-from sephe@FreeBSD.org) Date: Mon, 14 Jan 2008 03:26:39 GMT Message-Id: <200801140326.m0E3Qd9N003138@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 133214 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 03:26:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=133214 Change 133214 by sephe@sephe_zealot:sam_wifi on 2008/01/14 03:25:54 Always stop watchdog callout in rt2661_stop() Affected files ... .. //depot/projects/wifi/sys/dev/ral/rt2661.c#20 edit Differences ... ==== //depot/projects/wifi/sys/dev/ral/rt2661.c#20 (text) ==== @@ -401,9 +401,8 @@ struct rt2661_softc *sc = xsc; struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = ic->ic_ifp; - + rt2661_stop(sc); - callout_stop(&sc->watchdog_ch); callout_stop(&sc->rssadapt_ch); bpfdetach(ifp); @@ -2670,6 +2669,7 @@ RAL_LOCK(sc); rt2661_stop_locked(sc); + callout_stop(&sc->watchdog_ch); RAL_UNLOCK(sc); } From owner-p4-projects@FreeBSD.ORG Mon Jan 14 03:40:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41D8116A421; Mon, 14 Jan 2008 03:40:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E389716A41B for ; Mon, 14 Jan 2008 03:40:55 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DF5B913C44B for ; Mon, 14 Jan 2008 03:40:55 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0E3etxk008386 for ; Mon, 14 Jan 2008 03:40:55 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0E3et9r008383 for perforce@freebsd.org; Mon, 14 Jan 2008 03:40:55 GMT (envelope-from sephe@FreeBSD.org) Date: Mon, 14 Jan 2008 03:40:55 GMT Message-Id: <200801140340.m0E3et9r008383@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 133215 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 03:40:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=133215 Change 133215 by sephe@sephe_zealot:sam_wifi on 2008/01/14 03:40:20 - Don't reset watchdog timer, if there are TX descs pending - IFF_DRV_OACTIVE is in ifnet.if_drv_flags - In rt2661_init(), protect if_drv_flags adjustment by RAL_LOCK Affected files ... .. //depot/projects/wifi/sys/dev/ral/rt2661.c#21 edit Differences ... ==== //depot/projects/wifi/sys/dev/ral/rt2661.c#21 (text) ==== @@ -1022,11 +1022,13 @@ bus_dmamap_sync(txq->desc_dmat, txq->desc_map, BUS_DMASYNC_PREWRITE); + if (txq->queued == 0) + sc->sc_tx_timer = 0; + if (txq->queued < txq->count) { struct ifnet *ifp = sc->sc_ic.ic_ifp; - sc->sc_tx_timer = 0; - ifp->if_flags &= ~IFF_DRV_OACTIVE; + ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; rt2661_start(ifp); } } @@ -2647,11 +2649,12 @@ /* kick Rx */ RAL_WRITE(sc, RT2661_RX_CNTL_CSR, 1); - RAL_UNLOCK(sc); ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; + RAL_UNLOCK(sc); + if (ic->ic_opmode != IEEE80211_M_MONITOR) { if (ic->ic_roaming != IEEE80211_ROAMING_MANUAL) ieee80211_new_state(ic, IEEE80211_S_SCAN, -1); @@ -2668,8 +2671,8 @@ struct rt2661_softc *sc = priv; RAL_LOCK(sc); + callout_stop(&sc->watchdog_ch); rt2661_stop_locked(sc); - callout_stop(&sc->watchdog_ch); RAL_UNLOCK(sc); } From owner-p4-projects@FreeBSD.ORG Mon Jan 14 04:26:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 863AE16A41B; Mon, 14 Jan 2008 04:26:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 31B5F16A418 for ; Mon, 14 Jan 2008 04:26:45 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2AECB13C4EF for ; Mon, 14 Jan 2008 04:26:45 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0E4QiGp018297 for ; Mon, 14 Jan 2008 04:26:44 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0E4Qheb018294 for perforce@freebsd.org; Mon, 14 Jan 2008 04:26:43 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 14 Jan 2008 04:26:43 GMT Message-Id: <200801140426.m0E4Qheb018294@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 133216 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 04:26:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=133216 Change 133216 by gcooper@shiina-ibook on 2008/01/14 04:26:26 Rechecking in for RCS... Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/Makefile.inc#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/Makefile.inc#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/README#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/add.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/extract.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/futil.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/main.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/perform.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/pkg_add.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/create.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/main.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/perform.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/pkg_create.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/pl.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/delete/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/delete/delete.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/delete/main.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/delete/perform.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/delete/pkg_delete.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/info.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/main.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/perform.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/pkg_info.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/show.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/.match.c.swp#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/add_del.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/deps.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/exec.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/file.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/global.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/lib.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/match.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/msg.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/pen.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/pkgwrap.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/plist.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/str.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/url.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/version.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lsof.gmon#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/prof_scripts/prof_postprocess.pl#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/prof_scripts/prof_process.pl#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/prof_scripts/run_prof.sh#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/README#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/check.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/common.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/extern.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/gzip.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/gzip.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/main.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/pgp.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/pgp_check.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/pgp_sign.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/pkg_sign.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/sha1.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/sign.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/stand.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/stand.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/x509.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/tkpkg#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/unlocker.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/main.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/perform.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/perform.old.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/pkg_version.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/test-pkg_version.sh#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/version.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/archive_read_open_stream.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/macros.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg.h#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db.c#6 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_freebsd.c#8 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_match.c#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_private.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd.c#7 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_contents.c#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_lexer.l#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_parser.y#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_private.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_manifest.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_manifest_freebsd.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_private.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_files.c#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_ftp.c#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_local_freebsd.c#6 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_private.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox_private.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_util.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkgfile.c#6 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/scripts/styleify.pl#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_create/main.c#4 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/add/section.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/add/section.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/base.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/base.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/check/section.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/check/section.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/clean/section.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/clean/section.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/delete/section.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/delete/section.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/info/pkg_action_info.h#3 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/info/section.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/info/section.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/show/section.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/show/section.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/sign/section.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/sign/section.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/update/section.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/update/section.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/version/section.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/version/section.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_add_arg_parser.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_add_arg_parser.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_arg_parser.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_arg_parser.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_check_arg_parser.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_check_arg_parser.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_clean_arg_parser.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_clean_arg_parser.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_delete_arg_parser.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_delete_arg_parser.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_info_arg_parser.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_info_arg_parser.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_show_arg_parser.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_show_arg_parser.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_sign_arg_parser.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_sign_arg_parser.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_update_arg_parser.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_update_arg_parser.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_version_arg_parser.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_version_arg_parser.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/main.c#6 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkgman.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/register/INCOMPLETE_SOURCES#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/register/connection_manage.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/register/db_manage.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/register/main.c#2 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/archive_read_open_stream.c#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/macros.h#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg.h#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db.c#6 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_freebsd.c#8 (text+ko) ==== @@ -52,8 +52,9 @@ int empty_dirs; /* Used in the removal of files */ struct pkg_db *db; const char *last_dir; - char last_file[FILENAME_MAX]; + char last_file[FILENAME_MAX+1]; char directory[MAXPATHLEN]; + char display_file[FILENAME_MAX+1]; }; /* @@ -189,7 +190,7 @@ int force, pkg_db_action *pkg_action) { struct pkg_install_data install_data; - char cwd[MAXPATHLEN]; + char cwd[MAXPATHLEN+1]; assert(db != NULL); assert(pkg != NULL); @@ -200,13 +201,17 @@ /* Set the package environment */ if (prefix == NULL) { + const char *pkg_prefix = pkg_get_prefix(pkg); - if (pkg_prefix == NULL) + if (pkg_prefix == NULL) { setenv("PKG_PREFIX", "/usr/local", 1); - else + } else { setenv("PKG_PREFIX", pkg_prefix, 1); - } else + } + + } else { setenv("PKG_PREFIX", prefix, 1); + } pkg_action(PKG_DB_PACKAGE, "Package name is %s", pkg_get_name(pkg)); ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_match.c#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_private.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd.c#7 (text+ko) ==== @@ -118,7 +118,7 @@ * * This creates a pkg object from a given file pointer. * It is able to then manipulate the package and install the it to the pkg_db. - * @todo Write + * * @return A new package object or NULL */ struct pkg * ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd.h#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_contents.c#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_lexer.l#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_parser.y#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_private.h#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_manifest.c#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_manifest_freebsd.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_private.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo.h#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_files.c#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_ftp.c#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_local_freebsd.c#6 (text+ko) ==== @@ -42,6 +42,11 @@ static struct pkg *file_get_pkg(struct pkg_repo *, const char *); +struct local_freebsd_repo { + char *path; + +}; + /** * @defgroup PackageRepoLocalFreebsd FreeBSD local files repository * @ingroup PackageRepo ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_private.h#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox_private.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_util.c#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkgfile.c#6 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/scripts/styleify.pl#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/add/section.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/add/section.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/base.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/base.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/check/section.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/check/section.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/clean/section.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/clean/section.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/delete/section.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/delete/section.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/info/section.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/info/section.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/show/section.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/show/section.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/sign/section.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/sign/section.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/update/section.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/update/section.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/version/section.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/version/section.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_add_arg_parser.c#3 (text+ko) ==== @@ -1,1 +1,59 @@ #include "pkg_add_arg_parser.h" + +void +parse_args() +{ + + while ((ch = getopt(argc, argv, options)) != -1) { + switch(ch) { + case 'C': + strlcpy(add.chroot, optarg, PATH_MAX); + break; + case 'f': + add.flags |= force_flag; + break; + case 'I': + add.flags |= no_run_script_flag; + break; + case 'K': + /* Save the package file in . or ${PKGDIR} */ + add.flags |= keep_file_flag; + break; + case 'M': + errx(1, "Unsupported argument"); + break; + case 'n': + add.flags |= no_run_flag; + break; + case 'P': + add.base_prefix = optarg; + add.prefix = optarg; + break; + case 'p': + add.base_prefix = optarg; + add.prefix = NULL; + break; + case 'R': + add.flags |= no_record_install_flag; + break; + case 'r': + remote = 1; + break; + case 'S': + errx(1, "Unsupported argument"); + break; + case 't': + errx(1, "The -t argument is unneeded as the staging area is unused"); + break; + case 'v': + add.flags |= verbosity_flag; + break; + case 'h': + case '?': + default: + usage(); + break; + } + } + +} ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_add_arg_parser.h#3 (text+ko) ==== @@ -1,0 +1,7 @@ +#ifndef __PKG_ACT_ADD_AP_H + +#define __PKG_ACT_ADD_AP_H + + + +#endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_arg_parser.c#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_arg_parser.h#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_check_arg_parser.c#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_check_arg_parser.h#3 (text+ko) ==== @@ -1,0 +1,7 @@ +#ifndef __PKG_ACT_CHECK_AP_H + +#define __PKG_ACT_CHECK_AP_H + + + +#endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_clean_arg_parser.c#3 (text+ko) ==== @@ -1,1 +1,3 @@ -#include "pkg_add_arg_parser.h" +#include "pkg_action_clean_arg_parser.h" + + ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_clean_arg_parser.h#3 (text+ko) ==== @@ -1,0 +1,7 @@ +#ifndef __PKG_ACT_CLEAN_AP_H + +#define __PKG_ACT_CLEAN_AP_H + + + +#endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_delete_arg_parser.c#3 (text+ko) ==== @@ -1,1 +1,49 @@ #include "pkg_add_arg_parser.h" + +int +parse() +{ + + /** Parse args **/ + { + + case 'a': + delete.match_type = PKG_DB_MATCH_ALL; + break; + case 'd': + delete.flags |= remove_empty_dirs_flag; + break; + case 'D': + delete.flags |= no_run_script_flag; + break; + case 'f': + delete.flags |= force_flag; + break; + case 'G': + delete.match_type = PKG_DB_MATCH_EXACT; + break; + case 'i': + delete.flags |= interactive_flag; + break; + case 'n': + delete.flags |= no_run_flag; + break; + case 'p': + delete.prefix = optarg; + errx(1, "Unsupported argument"); + break; + case 'r': + delete.flags |= recursive_flag; + break; + case 'v': + delete.flags |= verbosity_flag; + break; + case 'x': + delete.match_type = PKG_DB_MATCH_REGEX; + break; + case 'X': + delete.match_type = PKG_DB_MATCH_EREGEX; + + } + +} ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_delete_arg_parser.h#3 (text+ko) ==== @@ -1,0 +1,7 @@ +#ifndef __PKG_ACT_DELETE_AP_H + +#define __PKG_ACT_DELETE_AP_H + + + +#endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_info_arg_parser.c#3 (text+ko) ==== @@ -1,1 +1,112 @@ #include "pkg_add_arg_parser.h" + +int +parse() +{ + + /** getopt blah goes here.. **/ + { + + case 'a': + info.match_type = MATCH_ALL; + break; + case 'b': + info.use_blocksize = 1; + break; + case 'c': + info.flags |= SHOW_COMMENT; + break; + case 'd': + info.flags |= SHOW_DESC; + break; + case 'D': + info.flags |= SHOW_DISPLAY; + break; + case 'e': + info.check_package = optarg; + break; + case 'E': + info.flags |= SHOW_PKGNAME; + break; + case 'f': + info.flags |= SHOW_PLIST; + break; + case 'g': + info.flags |= SHOW_CKSUM; + break; + case 'G': + info.match_type = MATCH_EXACT; + break; + case 'i': + info.flags |= SHOW_INSTALL; + break; + case 'I': + info.flags |= SHOW_INDEX; + break; + case 'j': + info.flags |= SHOW_REQUIRE; + break; + case 'k': + info.flags |= SHOW_DEINSTALL; + break; + case 'l': + info.separator = optarg; + break; + case 'L': + info.flags |= SHOW_FILES; + break; + case 'm': + info.flags |= SHOW_MTREE; + break; + case 'o': + info.flags |= SHOW_ORIGIN; + break; + case 'O': + info.origin = optarg; + break; + case 'p': + info.flags |= SHOW_PREFIX; + break; + case 'P': + info.flags |= SHOW_PTREV; + break; + case 'q': + info.quiet = 1; + break; + case 'Q': + info.quiet = 2; + break; + case 'r': + info.flags |= SHOW_DEPEND; + break; + case 'R': + info.flags |= SHOW_REQBY; + break; + case 's': + info.flags |= SHOW_SIZE; + break; + case 't': + errx(1, "Unsupported argument"); + break; + case 'V': + info.flags |= SHOW_FMTREV; + break; + case 'W': + /* If package list is empty, create a new one */ + if (SLIST_EMPTY(&w_package_names)) { + /* Create the head of the slist */ + SLIST_HEAD(top_package, char *) + w_package_names = SLIST_HEAD_INITIALIZER(w_packages); + } + /* Insert found argument at head of list */ + SLIST_INSERT_HEAD(); + break; + case 'x': + info.match_type = MATCH_REGEX; + break; + case 'X': + info.match_type = MATCH_EREGEX; + + } + +} ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_info_arg_parser.h#3 (text+ko) ==== @@ -1,0 +1,7 @@ +#ifndef __PKG_ACT_INFO_AP_H + +#define __PKG_ACT_INFO_AP_H + + + +#endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_show_arg_parser.c#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_show_arg_parser.h#3 (text+ko) ==== @@ -1,0 +1,7 @@ +#ifndef __PKG_ACT_SHOW_AP_H + +#define __PKG_ACT_SHOW_AP_H + + + +#endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_sign_arg_parser.c#3 (text+ko) ==== @@ -1,1 +1,37 @@ #include "pkg_add_arg_parser.h" + +int +parse() +{ + + case 't': + if (strcmp(optarg, "pgp") == 0) + type = TAG_PGP; + else if (strcmp(optarg, "sha1") == 0) + type = TAG_SHA1; + else if (strcmp(optarg, "x509") == 0) + type = TAG_X509; + else + usage(); + break; + case 'u': + userid = strdup(optarg); + break; + + case 'k': + userkey = optarg; + break; + + case 'q': + quiet = 1; + break; + +#ifndef CHECKER_ONLY + case 's': + mode = SIGN; + break; +#endif + case 'c': + mode = CHECK; + +} ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_sign_arg_parser.h#3 (text+ko) ==== @@ -1,0 +1,7 @@ +#ifndef __PKG_ACT_SIGN_AP_H + +#define __PKG_ACT_SIGN_AP_H + + + +#endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_update_arg_parser.c#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_update_arg_parser.h#3 (text+ko) ==== @@ -1,0 +1,7 @@ +#ifndef __PKG_ACT_UPDATE_AP_H + +#define __PKG_ACT_UPDATE_AP_H + + + +#endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_version_arg_parser.c#3 (text+ko) ==== @@ -1,1 +1,53 @@ #include "pkg_add_arg_parser.h" + +int +parse() +{ + + /* + * Use /usr/ports/INDEX* instead of the Makefiles for version + * comparison bases. + */ + case 'I': + version.flags |= VERSION_USE_INDEX_ONLY; + break; + + /* Look only for the specified installed statuses */ + case 'l': + LimitChars = optarg; + break; + + /* Avoid looking for package installed statuses */ + case 'L': + PreventChars = optarg; + break; + + case 'q': + version.flags |= QUIET; + break; + + case 's': + MatchName = optarg; + break; + + case 'O': + LookUpOrigin = optarg; + break; + + case 'o': + version.flags |= VERSION_SHOW_PKG_ORIGIN; + break; + + case 't': + errx(2, "Invalid -t usage."); + break; + + case 'T': + errx(2, "Invalid -T usage."); + break; + + case 'X': + version.match_type = MATCH_EREGEX; + break; + +} ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_version_arg_parser.h#3 (text+ko) ==== @@ -1,0 +1,7 @@ +#ifndef __PKG_ACT_VERSION_AP_H + +#define __PKG_ACT_VERSION_AP_H + + + +#endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/main.c#6 (text+ko) ==== @@ -8,11 +8,11 @@ main(int argc, char **argv) { + char action_type; + char *cmd_str; char **optional_opt_str_p; - uint64 global_flags = 0; - pkg_action_arg_parser parsers[COMMAND_LENGTH-1]; STAILQ_HEAD(fpkg_actions_stailq, freebsd_pkg_action) fpkg_actions_queue_head = @@ -25,106 +25,119 @@ optional_opt_str_p = (char**) malloc(sizeof(char*)+1); if (0 == strcmp(cmd_str, ADD)) { - action_type = add; + action_type = _pkg_add; } else if (0 == strcmp(cmd_str, CLEAN)) { - action_type = clean; + action_type = _pkg_clean; } else if (0 == strcmp(cmd_str, CHECK)) { - action_type = check; + action_type = _pkg_check; } else if (0 == strcmp(cmd_str, CREATE)) { - action_type = create; + action_type = _pkg_create; } else if (0 == strcmp(cmd_str, DELETE)) { - action_type = delete; + action_type = _pkg_delete; } else if (0 == strcmp(cmd_str, INFO)) { - action_type = info; + action_type = _pkg_info; } else if (0 == strcmp(cmd_str, SEARCH)) { - action_type = search; + action_type = _pkg_search; } else if (0 == strcmp(cmd_str, SIGN)) { - action_type = sign; + action_type = _pkg_sign; } else if (0 == strcmp(cmd_str, UPDATE)) { - action_type = update; + action_type = _pkg_update; } else if (0 == strcmp(cmd_str, VERSION)) { - action_type = version; + action_type = _pkg_version; } else { - action_type = NULL; + action_type = _pkg_null; } - /** Skip over command string.. **/ - optind = OPTION_OFFSET; + /* + * Global command args parsing is in following block. + * + * Skip over the _pkg_null option, as no one prescribed + * what action should be performed.. + */ + if (action_type != _pkg_null) { + + /** Skip over action / command string.. **/ + optind = OPTION_OFFSET; - char opt_char; + char opt_char; - int old_optind; - int optional_opts_ind; - int i; + int old_optind; + int optional_opts_ind; + int i; - /** Preset the initial counter variables to 0. **/ - old_optind = optional_opts_ind = 0; + /** Preset the initial counter variables to 0. **/ + old_optind = optional_opts_ind = 0; - /** Don't error out on unknown / non-globally applied flags, yet.. **/ - opterr = 0; + /** Don't error out on unknown / non-globally applied flags, yet.. **/ + opterr = 0; - /** Parse in global arguments **/ - while ( (opt_char = getopt(argc, argv, GLOBAL_OPT_STRING)) != -1 ) { + /** Parse in global arguments **/ + while ( (opt_char = getopt(argc, argv, GLOBAL_OPT_STRING)) != -1 ) { - switch (opt_char) { - /** Force **/ - case 'f': - global_settings->opts |= FORCE_FLAG; - break; - /** Interactive **/ - case 'i': - global_settings->opts |= INTERACTIVE_FLAG; - break; - /** No-exec command **/ - case 'o': - if (optarg != NULL && strlen(optarg)) { - char *tmp_pkg_origin; - strdup(tmp_pkg_origin, optarg); - /* - * @todo: Add tmp_pkg_origin to STAILQ here - * with origin names.. - * - * Does this get freed with pkg_freebsd_pkg_new - * (or whatever the constructor was..)? - */ + switch (opt_char) { + /** Force **/ + case 'f': + global_settings->iu_opts |= FORCE_FLAG; + break; + /** Interactive **/ + case 'i': + global_settings->iu_opts |= INTERACTIVE_FLAG; + break; + /** No-exec command **/ + case 'o': + if (optarg != NULL && strlen(optarg)) { + char *tmp_pkg_origin; + strdup(tmp_pkg_origin, optarg); + /* + * @todo: Add tmp_pkg_origin to STAILQ here + * with origin names.. + * + * Does this get freed with pkg_freebsd_pkg_new + * (or whatever the constructor was..)? + */ + } + break; + /** Prefix **/ + case 'p': + if (optarg != NULL && strlen(optarg)) { + strdup(global_settings->prefix_path_str, optarg); + } else { + + } + break; + /** Quiet **/ + case 'q': + if (global_settings->opts & VERBOSE_FLAG) { + errx(QV_ERR_MSG); + } + global_settings->iu_opts |= QUIET_FLAG; + break; + /** Recursive **/ + case 'r': + global_settings->misc_opts |= RECURSIVE_FLAG; + break; + /** Verbose **/ + case 'v': + if (global_settings->opts & QUIET_FLAG) { + errx(QV_ERR_MSG); + } + global_settings->iu_opts |= VERBOSE_FLAG; + break; } - break; - /** Prefix **/ - case 'p': - if (optarg != NULL && strlen(optarg)) { - strdup(global_settings->prefix_path_str, optarg); + + /* + * Copy down all char* pointers to optional_opt_str_p to parse + * later on [in pkg_action_arg_parser->parse_args(..)].. + */ + for (i = old_optind; i < optind; i++) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 14 04:29:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73FFC16A469; Mon, 14 Jan 2008 04:29:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1F1B616A41A for ; Mon, 14 Jan 2008 04:29:48 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1A05113C4CC for ; Mon, 14 Jan 2008 04:29:48 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0E4TluK018389 for ; Mon, 14 Jan 2008 04:29:47 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0E4TlaE018386 for perforce@freebsd.org; Mon, 14 Jan 2008 04:29:47 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 14 Jan 2008 04:29:47 GMT Message-Id: <200801140429.m0E4TlaE018386@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 133217 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 04:29:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=133217 Change 133217 by gcooper@shiina-ibook on 2008/01/14 04:29:00 Yanking out arg-parsing code; will yank out stage code sometime within the next couple weeks.. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_add/main.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_delete/main.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_info/main.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_info/match.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_info/pkg_info.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_info/show.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_sign/main.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_version/main.c#4 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_add/main.c#4 (text+ko) ==== @@ -77,59 +77,6 @@ add.chroot[0] = '\0'; add.base_prefix = NULL; add.prefix = NULL; - while ((ch = getopt(argc, argv, options)) != -1) { - switch(ch) { - case 'C': - strlcpy(add.chroot, optarg, PATH_MAX); - break; - case 'f': - add.flags |= force_flag; - break; - case 'I': - add.flags |= no_run_script_flag; - break; - case 'K': - /* Save the package file in . or ${PKGDIR} */ - add.flags |= keep_file_flag; - break; - case 'M': - errx(1, "Unsupported argument"); - break; - case 'n': - add.flags |= no_run_flag; - break; - case 'P': - add.base_prefix = optarg; - add.prefix = optarg; - break; - case 'p': - add.base_prefix = optarg; - add.prefix = NULL; - break; - case 'R': - add.flags |= no_record_install_flag; - break; - case 'r': - remote = 1; - break; - case 'S': - errx(1, "Unsupported argument"); - break; - case 't': - errx(1, "The -t argument is unneeded as the staging area is unused"); - break; - case 'v': - add.flags |= verbosity_flag; - break; - case 'h': - case '?': - default: - usage(); - break; - } - } - argc -= optind; - argv += optind; /* * Get package from remote source. ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_delete/main.c#4 (text+ko) ==== @@ -65,54 +65,8 @@ delete.flags = 0; delete.match_type = PKG_DB_MATCH_GLOB; delete.prefix = NULL; - while ((ch = getopt(argc, argv, options)) != -1) { - switch(ch) { - case 'a': - delete.match_type = PKG_DB_MATCH_ALL; - break; - case 'd': - delete.flags |= remove_empty_dirs_flag; - break; - case 'D': - delete.flags |= no_run_script_flag; - break; - case 'f': - delete.flags |= force_flag; - break; - case 'G': - delete.match_type = PKG_DB_MATCH_EXACT; - break; - case 'i': - delete.flags |= interactive_flag; - break; - case 'n': - delete.flags |= no_run_flag; - break; - case 'p': - delete.prefix = optarg; - errx(1, "Unsupported argument"); - break; - case 'r': - delete.flags |= recursive_flag; - break; - case 'v': - delete.flags |= verbosity_flag; - break; - case 'x': - delete.match_type = PKG_DB_MATCH_REGEX; - break; - case 'X': - delete.match_type = PKG_DB_MATCH_EREGEX; - break; - case 'h': - case '?': - default: - usage(); - break; - } - } - argc -= optind; - argv += optind; + + /** Parse args here **/ if (delete.db == NULL) { delete.db = pkg_db_open_freebsd("/"); ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_info/main.c#4 (text+ko) ==== @@ -64,130 +64,15 @@ info.match_type = MATCH_ALL; info.flags = SHOW_INDEX; } else { - int ch; - int i; - while ((ch = getopt(argc, argv, options)) != -1) { - switch (ch) { - case 'a': - info.match_type = MATCH_ALL; - break; - case 'b': - info.use_blocksize = 1; - break; - case 'c': - info.flags |= SHOW_COMMENT; - break; - case 'd': - info.flags |= SHOW_DESC; - break; - case 'D': - info.flags |= SHOW_DISPLAY; - break; - case 'e': - info.check_package = optarg; - break; - case 'E': - info.flags |= SHOW_PKGNAME; - break; - case 'f': - info.flags |= SHOW_PLIST; - break; - case 'g': - info.flags |= SHOW_CKSUM; - break; - case 'G': - info.match_type = MATCH_EXACT; - break; - case 'i': - info.flags |= SHOW_INSTALL; - break; - case 'I': - info.flags |= SHOW_INDEX; - break; - case 'j': - info.flags |= SHOW_REQUIRE; - break; - case 'k': - info.flags |= SHOW_DEINSTALL; - break; - case 'l': - info.separator = optarg; - break; - case 'L': - info.flags |= SHOW_FILES; - break; - case 'm': - info.flags |= SHOW_MTREE; - break; - case 'o': - info.flags |= SHOW_ORIGIN; - break; - case 'O': - info.origin = optarg; - break; - case 'p': - info.flags |= SHOW_PREFIX; - break; - case 'P': - info.flags |= SHOW_PTREV; - break; - case 'q': - info.quiet = 1; - break; - case 'Q': - info.quiet = 2; - break; - case 'r': - info.flags |= SHOW_DEPEND; - break; - case 'R': - info.flags |= SHOW_REQBY; - break; - case 's': - info.flags |= SHOW_SIZE; - break; - case 't': - errx(1, "Unsupported argument"); - break; - case 'v': - info.flags = SHOW_COMMENT | SHOW_DESC | - SHOW_PLIST | SHOW_INSTALL | - SHOW_DEINSTALL | SHOW_REQUIRE | - SHOW_DISPLAY | SHOW_MTREE; - break; - case 'V': - info.flags |= SHOW_FMTREV; - break; - case 'W': - /* If package list is empty, create a new one */ - if (SLIST_EMPTY(&w_package_names)) { - /* Create the head of the slist */ - SLIST_HEAD(top_package, char *) - w_package_names = SLIST_HEAD_INITIALIZER(w_packages); - } - /* Insert found argument at head of list */ - SLIST_INSERT_HEAD(); - break; - case 'x': - info.match_type = MATCH_REGEX; - break; - case 'X': - info.match_type = MATCH_EREGEX; - break; - case 'h': - default: - usage(); - break; - } - } - argc -= optind; - argv += optind; + + /** Parse args **/ info.pkgs = malloc(sizeof(char *) * (argc + 1)); for (i=0; i < argc; i++) { info.pkgs[i] = argv[i]; } info.pkgs[i] = NULL; + } /* Set the default flags */ @@ -297,7 +182,7 @@ /* Sort the packages and display them */ if (pkgs == NULL) { - /* XXX Error message */ + errx("You must provide at least one package.."); return 1; } for (cur = 0; pkgs[cur] != NULL; cur++) ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_info/match.c#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_info/pkg_info.h#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_info/show.c#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_sign/main.c#4 (text+ko) ==== @@ -67,11 +67,7 @@ /* wrapper for the check_signature function (open file if needed) */ static int -check(filename, type, userid, envp) - /*@observer@*/const char *filename; - int type; - /*@null@*/const char *userid; - char *envp[]; +check(const char *filename, int type, const char *userid, char *envp[]) { int result; FILE *file; @@ -85,12 +81,10 @@ } result = check_signature(file, userid, envp, filename); if (fclose(file) == 0) { - if (result == PKG_BADSIG || result == PKG_SIGERROR) - return 0; - else + if (!(result == PKG_BADSIG || result == PKG_SIGERROR)) return 1; - } else - return 0; + } + return 0; } int @@ -124,48 +118,8 @@ mode = CHECK; #endif - while ((ch = getopt(argc, argv, "t:u:k:qscv")) != -1) { - switch(ch) { - case 't': - if (strcmp(optarg, "pgp") == 0) - type = TAG_PGP; - else if (strcmp(optarg, "sha1") == 0) - type = TAG_SHA1; - else if (strcmp(optarg, "x509") == 0) - type = TAG_X509; - else - usage(); - break; - case 'u': - userid = strdup(optarg); - break; - - case 'k': - userkey = optarg; - break; - - case 'q': - quiet = 1; - break; - -#ifndef CHECKER_ONLY - case 's': - mode = SIGN; - break; -#endif - case 'c': - mode = CHECK; - break; + /** Parse **/ - case 'v': - verbose = 1; - break; - default: - usage(); - } - } - argc -= optind; - argv += optind; if (argc == 0) { if (mode == CHECK) success &= check("-", 0, userid, envp); @@ -182,4 +136,5 @@ for (i = 0; i < argc; i++) success &= (mode == SIGN ? sign : check)(argv[i], type, userid, envp); exit(success == 1 ? EXIT_SUCCESS : EXIT_FAILURE); + } ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_version/main.c#4 (text+ko) ==== @@ -68,69 +68,9 @@ cmp = pkg_version_match(argv[3], argv[2]); exit(cmp == 1 ? 0 : 1); } - else while ((ch = getopt(argc, argv, options)) != -1) { - switch(ch) { - case 'v': - Verbose++; - break; - /* - * Use /usr/ports/INDEX* instead of the Makefiles for version - * comparison bases. - */ - case 'I': - version.flags |= VERSION_USE_INDEX_ONLY; - break; - - /* Look only for the specified installed statuses */ - case 'l': - LimitChars = optarg; - break; - - /* Avoid looking for package installed statuses */ - case 'L': - PreventChars = optarg; - break; - - case 'q': - version.flags |= QUIET; - break; - - case 's': - MatchName = optarg; - break; + /**Else parse**/ - case 'O': - LookUpOrigin = optarg; - break; - - case 'o': - version.flags |= VERSION_SHOW_PKG_ORIGIN; - break; - - case 't': - errx(2, "Invalid -t usage."); - break; - - case 'T': - errx(2, "Invalid -T usage."); - break; - - case 'X': - version.match_type = MATCH_EREGEX; - break; - - case 'h': - case '?': - default: - usage(); - break; - } - } - - argc -= optind; - argv += optind; - return pkg_version(version); } @@ -141,5 +81,4 @@ "usage: pkg_version [-hIoqv] [-l limchar] [-L limchar] [[-X] -s string] [-O origin] [index]", " pkg_version -t v1 v2", " pkg_version -T name pattern"); - exit(1); } From owner-p4-projects@FreeBSD.ORG Mon Jan 14 04:31:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC3C116A419; Mon, 14 Jan 2008 04:31:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6922616A418 for ; Mon, 14 Jan 2008 04:31:50 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4C9BC13C458 for ; Mon, 14 Jan 2008 04:31:50 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0E4VoPa018994 for ; Mon, 14 Jan 2008 04:31:50 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0E4VoDN018991 for perforce@freebsd.org; Mon, 14 Jan 2008 04:31:50 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 14 Jan 2008 04:31:50 GMT Message-Id: <200801140431.m0E4VoDN018991@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 133218 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 04:31:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=133218 Change 133218 by gcooper@shiina-ibook on 2008/01/14 04:30:51 Base files for all action parsers (some code included; WIP of course). Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/base.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/base.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jan 14 04:31:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9648516A469; Mon, 14 Jan 2008 04:31:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 909B616A46B for ; Mon, 14 Jan 2008 04:31:50 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 74C1113C45B for ; Mon, 14 Jan 2008 04:31:50 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0E4VoYZ019001 for ; Mon, 14 Jan 2008 04:31:50 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0E4VokO018998 for perforce@freebsd.org; Mon, 14 Jan 2008 04:31:50 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 14 Jan 2008 04:31:50 GMT Message-Id: <200801140431.m0E4VokO018998@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 133219 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 04:31:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=133219 Change 133219 by gcooper@shiina-ibook on 2008/01/14 04:31:15 Forgot to add the .c file earlier. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_create_arg_parser.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jan 14 04:32:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 437D016A46D; Mon, 14 Jan 2008 04:32:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E49F316A468 for ; Mon, 14 Jan 2008 04:32:51 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DFCD713C4F4 for ; Mon, 14 Jan 2008 04:32:51 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0E4Wpbm019323 for ; Mon, 14 Jan 2008 04:32:51 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0E4WpvM019320 for perforce@freebsd.org; Mon, 14 Jan 2008 04:32:51 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 14 Jan 2008 04:32:51 GMT Message-Id: <200801140432.m0E4WpvM019320@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 133220 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 04:32:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=133220 Change 133220 by gcooper@shiina-ibook on 2008/01/14 04:32:35 Checkpointing the files. It appears p4 isn't seeing the yanked code (weird..). Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_add_arg_parser.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_add_arg_parser.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_arg_parser.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_arg_parser.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_check_arg_parser.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_check_arg_parser.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_clean_arg_parser.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_clean_arg_parser.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_create_arg_parser.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_delete_arg_parser.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_delete_arg_parser.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_info_arg_parser.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_info_arg_parser.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_show_arg_parser.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_show_arg_parser.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_sign_arg_parser.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_sign_arg_parser.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_update_arg_parser.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_update_arg_parser.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_version_arg_parser.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_version_arg_parser.h#4 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_add_arg_parser.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_add_arg_parser.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_arg_parser.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_arg_parser.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_check_arg_parser.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_check_arg_parser.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_clean_arg_parser.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_clean_arg_parser.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_create_arg_parser.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_delete_arg_parser.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_delete_arg_parser.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_info_arg_parser.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_info_arg_parser.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_show_arg_parser.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_show_arg_parser.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_sign_arg_parser.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_sign_arg_parser.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_update_arg_parser.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_update_arg_parser.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_version_arg_parser.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_version_arg_parser.h#4 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Jan 14 04:41:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1542B16A420; Mon, 14 Jan 2008 04:41:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CEB4716A41B for ; Mon, 14 Jan 2008 04:41:24 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CA77E13C4EC for ; Mon, 14 Jan 2008 04:41:24 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0E4fOXe020779 for ; Mon, 14 Jan 2008 04:41:24 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0E4fO4R020776 for perforce@freebsd.org; Mon, 14 Jan 2008 04:41:24 GMT (envelope-from sephe@FreeBSD.org) Date: Mon, 14 Jan 2008 04:41:24 GMT Message-Id: <200801140441.m0E4fO4R020776@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 133223 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 04:41:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=133223 Change 133223 by sephe@sephe_zealot:sam_wifi on 2008/01/14 04:40:41 - Compute durations for nonfrag data frames - Rename controlRate to ctlRateIndex - Indentation - Adjust comments a little bit - Don't map for short preamble rates, this kind of mapping does not work (0x04 overlap some rate codes) and it is never used - Rename ieee80211_compute_txtime to ieee80211_compute_duration, since the result returned by this function includes SIFS Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_phy.c#3 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_phy.c#3 (text+ko) ==== @@ -89,7 +89,7 @@ * preamble in CCK rate code */ uint8_t dot11Rate; /* value for supported rates * info element of MLME */ - uint8_t controlRate; /* index of next lower basic + uint8_t ctlRateIndex; /* index of next lower basic * rate; used for dur. calcs */ uint16_t lpAckDuration; /* long preamble ACK dur. */ uint16_t spAckDuration; /* short preamble ACK dur. */ @@ -102,8 +102,6 @@ const struct ieee80211_rate_table *, uint8_t rate); uint8_t ieee80211_ack_rate(const struct ieee80211_rate_table *, uint8_t rate); -uint16_t ieee80211_compute_txtime(const struct ieee80211_rate_table *, - uint32_t frameLen, uint16_t rate, int flags); #endif /* notyet */ /* shorthands to compact tables for readability */ @@ -113,7 +111,7 @@ #define PBCC (IEEE80211_T_HT+1) /* XXX */ static struct ieee80211_rate_table ieee80211_11b_table = { - 4, /* number of rates */ + 4, /* number of rates, XXX no PBCC */ { 0 }, { /* short ctrl */ @@ -238,6 +236,8 @@ #undef XR static void ieee80211_setup_ratetable(struct ieee80211_rate_table *); +static uint16_t ieee80211_compute_duration(const struct ieee80211_rate_table *, + uint32_t frameLen, uint16_t rate, int flags); /* Setup all rate tables */ void @@ -278,41 +278,38 @@ ieee80211_setup_ratetable(struct ieee80211_rate_table *rt) { #define N(a) (sizeof(a)/sizeof(a[0])) -#define WLAN_CTRL_FRAME_SIZE (2+2+6+4) /* ACK+FCS */ +#define WLAN_CTRL_FRAME_SIZE \ + (sizeof(struct ieee80211_frame_ack) + IEEE80211_CRC_LEN) + int i; for (i = 0; i < N(rt->rateCodeToIndex); i++) rt->rateCodeToIndex[i] = (uint8_t) -1; for (i = 0; i < rt->rateCount; i++) { uint8_t code = rt->info[i].dot11Rate; -#ifdef notyet - uint8_t cix = rt->info[i].controlRate; -#endif + uint8_t cix = rt->info[i].ctlRateIndex; rt->rateCodeToIndex[code] = i; - rt->rateCodeToIndex[code | rt->info[i].shortPreamble] = i; if (code & IEEE80211_RATE_BASIC) { /* * Map w/o basic rate bit too. */ code &= IEEE80211_RATE_VAL; rt->rateCodeToIndex[code] = i; - rt->rateCodeToIndex[code | rt->info[i].shortPreamble] = i; } -#ifdef notyet /* * XXX for 11g the control rate to use for 5.5 and 11 Mb/s * depends on whether they are marked as basic rates; * the static tables are setup with an 11b-compatible * 2Mb/s rate which will work but is suboptimal */ - rt->info[i].lpAckDuration = ieee80211_compute_txtime(rt, + rt->info[i].lpAckDuration = ieee80211_compute_duration(rt, WLAN_CTRL_FRAME_SIZE, cix, 0); - rt->info[i].spAckDuration = ieee80211_compute_txtime(rt, - WLAN_CTRL_FRAME_SIZE, cix, 1); -#endif /* notyet */ + rt->info[i].spAckDuration = ieee80211_compute_duration(rt, + WLAN_CTRL_FRAME_SIZE, cix, IEEE80211_F_SHPREAMBLE); } + #undef WLAN_CTRL_FRAME_SIZE #undef N } @@ -401,16 +398,19 @@ uint8_t ieee80211_ack_rate(const struct ieee80211_rate_table *rt, uint8_t rate) { - uint8_t cix = rt->info[rt->rateCodeToIndex[rate]].controlRate; + uint8_t cix = rt->info[rt->rateCodeToIndex[rate]].ctlRateIndex; return rt->info[cix].dot11Rate; } +#endif /* notyet */ + /* * Compute the time to transmit a frame of length frameLen bytes * using the specified rate, phy, and short preamble setting. + * SIFS is included. */ -uint16_t -ieee80211_compute_txtime(const struct ieee80211_rate_table *rt, +static uint16_t +ieee80211_compute_duration(const struct ieee80211_rate_table *rt, uint32_t frameLen, uint16_t rate, int flags) { uint8_t rix = rt->rateCodeToIndex[rate]; @@ -424,9 +424,9 @@ switch (rt->info[rix].phy) { case IEEE80211_T_CCK: -#define CCK_SIFS_TIME 10 -#define CCK_PREAMBLE_BITS 144 -#define CCK_PLCP_BITS 48 +#define CCK_SIFS_TIME 10 +#define CCK_PREAMBLE_BITS 144 +#define CCK_PLCP_BITS 48 phyTime = CCK_PREAMBLE_BITS + CCK_PLCP_BITS; if ((flags & IEEE80211_F_SHPREAMBLE) && rt->info[rix].shortPreamble) @@ -440,10 +440,10 @@ #undef CCK_PLCP_BITS case IEEE80211_T_OFDM: -#define OFDM_SIFS_TIME 16 -#define OFDM_PREAMBLE_TIME 20 -#define OFDM_PLCP_BITS 22 -#define OFDM_SYMBOL_TIME 4 +#define OFDM_SIFS_TIME 16 +#define OFDM_PREAMBLE_TIME 20 +#define OFDM_PLCP_BITS 22 +#define OFDM_SYMBOL_TIME 4 #define OFDM_SIFS_TIME_HALF 32 #define OFDM_PREAMBLE_TIME_HALF 40 @@ -461,7 +461,7 @@ numBits = OFDM_PLCP_BITS + (frameLen << 3); numSymbols = howmany(numBits, bitsPerSymbol); txTime = OFDM_SIFS_TIME_QUARTER - + OFDM_PREAMBLE_TIME_QUARTER + + OFDM_PREAMBLE_TIME_QUARTER + (numSymbols * OFDM_SYMBOL_TIME_QUARTER); } else if (rt == &ieee80211_quarter_table) { bitsPerSymbol = (kbps * OFDM_SYMBOL_TIME_HALF) / 1000; @@ -469,8 +469,8 @@ numBits = OFDM_PLCP_BITS + (frameLen << 3); numSymbols = howmany(numBits, bitsPerSymbol); - txTime = OFDM_SIFS_TIME_HALF + - OFDM_PREAMBLE_TIME_HALF + txTime = OFDM_SIFS_TIME_HALF + + OFDM_PREAMBLE_TIME_HALF + (numSymbols * OFDM_SYMBOL_TIME_HALF); } else { /* full rate channel */ bitsPerSymbol = (kbps * OFDM_SYMBOL_TIME) / 1000; @@ -478,7 +478,8 @@ numBits = OFDM_PLCP_BITS + (frameLen << 3); numSymbols = howmany(numBits, bitsPerSymbol); - txTime = OFDM_SIFS_TIME + OFDM_PREAMBLE_TIME + txTime = OFDM_SIFS_TIME + + OFDM_PREAMBLE_TIME + (numSymbols * OFDM_SYMBOL_TIME); } break; @@ -489,10 +490,10 @@ #undef OFDM_SYMBOL_TIME case IEEE80211_T_TURBO: -#define TURBO_SIFS_TIME 8 -#define TURBO_PREAMBLE_TIME 14 -#define TURBO_PLCP_BITS 22 -#define TURBO_SYMBOL_TIME 4 +#define TURBO_SIFS_TIME 8 +#define TURBO_PREAMBLE_TIME 14 +#define TURBO_PLCP_BITS 22 +#define TURBO_SYMBOL_TIME 4 /* we still save OFDM rates in kbps - so double them */ bitsPerSymbol = ((kbps << 1) * TURBO_SYMBOL_TIME) / 1000; KASSERT(bitsPerSymbol != 0, ("turbo bps")); @@ -508,12 +509,9 @@ #undef TURBO_SYMBOL_TIME default: - printf("%s: unknown phy %u (rate %u)\n", - __func__, rt->info[rix].phy, rate); - txTime = 0; + panic("%s: unknown phy %u (rate %u)\n", __func__, + rt->info[rix].phy, rate); break; } return txTime; } - -#endif /* notyet */ From owner-p4-projects@FreeBSD.ORG Mon Jan 14 04:51:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2613516A469; Mon, 14 Jan 2008 04:51:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C77BA16A420 for ; Mon, 14 Jan 2008 04:51:35 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AB96913C465 for ; Mon, 14 Jan 2008 04:51:35 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0E4pZCM030804 for ; Mon, 14 Jan 2008 04:51:35 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0E4pZgT030797 for perforce@freebsd.org; Mon, 14 Jan 2008 04:51:35 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 14 Jan 2008 04:51:35 GMT Message-Id: <200801140451.m0E4pZgT030797@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 133226 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 04:51:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=133226 Change 133226 by gcooper@shiina-ibook on 2008/01/14 04:51:30 Delete unnecessary files. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_arg_parser.c#5 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_arg_parser.h#5 delete Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jan 14 04:52:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 235ED16A46B; Mon, 14 Jan 2008 04:52:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C402D16A421 for ; Mon, 14 Jan 2008 04:52:36 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BE6C113C45B for ; Mon, 14 Jan 2008 04:52:36 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0E4qaQG031371 for ; Mon, 14 Jan 2008 04:52:36 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0E4qa6M031367 for perforce@freebsd.org; Mon, 14 Jan 2008 04:52:36 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 14 Jan 2008 04:52:36 GMT Message-Id: <200801140452.m0E4qa6M031367@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 133227 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 04:52:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=133227 Change 133227 by gcooper@shiina-ibook on 2008/01/14 04:52:28 Name files with less redundant scheme: part 1 (ok, I like directory heirarchies more; sorry Andrew..). Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/add/pkg_action_add_arg_parser.c#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/add/pkg_action_add_arg_parser.h#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/base.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/check/pkg_action_check_arg_parser.c#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/check/pkg_action_check_arg_parser.h#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/clean/pkg_action_clean_arg_parser.c#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/clean/pkg_action_clean_arg_parser.h#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/create/pkg_action_create_arg_parser.c#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/delete/pkg_action_delete_arg_parser.c#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/delete/pkg_action_delete_arg_parser.h#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/info/pkg_action_info_arg_parser.c#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/info/pkg_action_info_arg_parser.h#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_add_arg_parser.c#5 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_add_arg_parser.h#5 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_check_arg_parser.c#5 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_check_arg_parser.h#5 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_clean_arg_parser.c#5 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_clean_arg_parser.h#5 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_create_arg_parser.c#3 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_delete_arg_parser.c#5 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_delete_arg_parser.h#5 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_info_arg_parser.c#5 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_info_arg_parser.h#5 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_settings.c#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_show_arg_parser.c#5 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_show_arg_parser.h#5 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_sign_arg_parser.c#5 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_sign_arg_parser.h#5 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_update_arg_parser.c#5 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_update_arg_parser.h#5 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_version_arg_parser.c#5 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_version_arg_parser.h#5 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/show/pkg_action_show_arg_parser.c#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/show/pkg_action_show_arg_parser.h#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/sign/pkg_action_sign_arg_parser.c#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/sign/pkg_action_sign_arg_parser.h#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/update/pkg_action_update_arg_parser.c#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/update/pkg_action_update_arg_parser.h#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/version/pkg_action_version_arg_parser.c#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/version/pkg_action_version_arg_parser.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jan 14 04:53:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6462F16A420; Mon, 14 Jan 2008 04:53:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1212416A41A for ; Mon, 14 Jan 2008 04:53:38 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E9F4913C448 for ; Mon, 14 Jan 2008 04:53:37 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0E4rbbO031653 for ; Mon, 14 Jan 2008 04:53:37 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0E4rbnm031650 for perforce@freebsd.org; Mon, 14 Jan 2008 04:53:37 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 14 Jan 2008 04:53:37 GMT Message-Id: <200801140453.m0E4rbnm031650@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 133228 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 04:53:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=133228 Change 133228 by gcooper@shiina-ibook on 2008/01/14 04:53:20 One more rename that wasn't added into last changelist.. basically rename base to a more logical name, such as 'pkg_action_settings' (the current structure name). Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/base.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_settings.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jan 14 05:04:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D72F16A469; Mon, 14 Jan 2008 05:04:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 119C116A420 for ; Mon, 14 Jan 2008 05:04:52 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0CCFF13C46E for ; Mon, 14 Jan 2008 05:04:52 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0E54pVa034622 for ; Mon, 14 Jan 2008 05:04:51 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0E54pVh034619 for perforce@freebsd.org; Mon, 14 Jan 2008 05:04:51 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 14 Jan 2008 05:04:51 GMT Message-Id: <200801140504.m0E54pVh034619@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 133234 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 05:04:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=133234 Change 133234 by gcooper@shiina-ibook on 2008/01/14 05:04:07 Name files with less redundant scheme: part 2. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/arg_parser.h\pkg_action_clean_arg_parser.h#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/add/arg_parser.c#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/add/arg_parser.h#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/add/pkg_action_add_arg_parser.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/add/pkg_action_add_arg_parser.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/check/arg_parser.c#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/check/arg_parser.h#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/check/pkg_action_check_arg_parser.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/check/pkg_action_check_arg_parser.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/clean/arg_parser.c#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/clean/arg_parser.h#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/clean/pkg_action_clean_arg_parser.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/clean/pkg_action_clean_arg_parser.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/create/arg_parser.c#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/create/arg_parser.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/create/pkg_action_create_arg_parser.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/delete/arg_parser.c#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/delete/arg_parser.h#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/delete/pkg_action_delete_arg_parser.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/delete/pkg_action_delete_arg_parser.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/info/arg_parser.c#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/info/arg_parser.h#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/info/pkg_action_info_arg_parser.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/info/pkg_action_info_arg_parser.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/show/arg_parser.c#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/show/arg_parser.h#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/show/pkg_action_show_arg_parser.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/show/pkg_action_show_arg_parser.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/sign/arg_parser.c#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/sign/arg_parser.h#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/sign/pkg_action_sign_arg_parser.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/sign/pkg_action_sign_arg_parser.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/update/arg_parser.h#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/update/pkg_action_update_arg_parser.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/version/arg_parser.c#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/version/arg_parser.h#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/version/pkg_action_version_arg_parser.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/version/pkg_action_version_arg_parser.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jan 14 07:07:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 423BC16A468; Mon, 14 Jan 2008 07:07:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E38EA16A419 for ; Mon, 14 Jan 2008 07:07:13 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DEFE313C467 for ; Mon, 14 Jan 2008 07:07:13 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0E77DiY059341 for ; Mon, 14 Jan 2008 07:07:13 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0E77Dpg059338 for perforce@freebsd.org; Mon, 14 Jan 2008 07:07:13 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Mon, 14 Jan 2008 07:07:13 GMT Message-Id: <200801140707.m0E77Dpg059338@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 133242 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 07:07:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=133242 Change 133242 by zhouzhouyi@zhouzhouyi_mactest on 2008/01/14 07:07:07 Style Modification Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/rename/00.t#3 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/rename/00.t#3 (text+ko) ==== @@ -1,91 +1,98 @@ #!/bin/sh -# $FreeBSD: src/tools/regression/mactest/tests/rename/00.t,v 1.2 2007/01/25 20:50:02 zhouzhouyi Exp $ +# $FreeBSD$ -desc="rename changes file name" +desc="test MAC Framework check of rename operation" dir=`dirname $0` . ${dir}/../misc.sh -echo "1..8" +case "${os}" in +FreeBSD) -n0=`namegen` -n1=`namegen` -n2=`namegen` -n3=`namegen` + mac_mls_support=`sysctl -n security.mac.mls.enabled 2>/dev/null` + mac_biba_support=`sysctl -n security.mac.biba.enabled 2>/dev/null` + mac_test_support=`sysctl -n security.mac.test.pseudoinit 2>/dev/null` + if [ "${mac_mls_support}" != "" ] && [ "${mac_biba_support}" != "" ] && + [ "${mac_test_support}" != "" ]; then #turn off all the switches -for i in `sysctl security.mac | grep "\.enabled"| - sed 's/\([a-z\.]*\.enabled\)\(:\ \)\([01]\)/\1/`; do -sysctl ${i}=0 -done + for i in `sysctl security.mac | grep "\.enabled"| + sed 's/\([a-z\.]*\.enabled\)\(:\ \)\([01]\)/\1/`; do + sysctl ${i}=0 >/dev/null + done + + + if [ -f ${mactest_conf} ]; then + rm ${mactest_conf} + fi + touch ${mactest_conf} + setfmac "mls/equal,biba/equal" ${mactest_conf} + + echo "1..8" + + n0=`namegen` + n1=`namegen` + n2=`namegen` + n3=`namegen` + + + dvplabel=`getfmac ".."| sed 's/\(\.\.:\ \)\([a-z\,\/]*\)/\2/`; -mac_mls_support=`sysctl -n security.mac.mls.enabled 2>/dev/null` -mac_biba_support=`sysctl -n security.mac.biba.enabled 2>/dev/null` -if [ "${mac_mls_support}" != "" ] && [ "${mac_biba_support}" != "" ] ; then - dvplabel=`getfmac ".."| sed 's/\(\.\.:\ \)\([a-z\,\/]*\)/\2/`; +#case 1,2,3: setup the directory structures + mactestexpect "" 0 -m "mls/low(low-high)" -f ${mactest_conf} mkdir ${n3} 0755 + mactestexpect "" "" -m "mls/low(low-high)" -f ${mactest_conf} system setfmac "mls/6" ${n3} + cd ${n3} + mactestexpect "" 0 -m "mls/7(low-high)" -f ${mactest_conf} create ${n2} 0644 -############################################################# -#first make working dir, the hook checks are already done in open: - if [ -f ${mactest_conf} ]; then - rm ${mactest_conf} - fi - touch ${mactest_conf} + sysctl security.mac.mls.enabled=1 > /dev/null - mactestexpect "" 0 -m "mls/low(low-high)" -f ${mactest_conf} mkdir ${n3} 0755 - mactestexpect "" "" -m "mls/low(low-high)" -f ${mactest_conf} system setfmac "mls/6" ${n3} - cd ${n3} - mactestexpect "" 0 -m "mls/7(low-high)" -f ${mactest_conf} create ${n2} 0644 +#case 4: the mls label of the process is equal the file to be renamed but dominate parent dir: + echo -n "pid = -1 vnode_check_rename_from:" > ${mactest_conf} + echo "biba/high(low-high),mls/7(low-high) biba/high,mls/6 biba/high,mls/7" >> ${mactest_conf} + mactestexpect "" EACCES -m "mls/7(low-high)" -f ${mactest_conf} rename ${n2} ${n1} -############################################################# - t=`sysctl security.mac.mls.enabled=1` - echo "enforcing mac/mls!" +#case 5: the mls label of the process is equal the parent dir but dominated by the file + echo -n "pid = -1 vnode_check_rename_from:" > ${mactest_conf} + echo "biba/high(low-high),mls/6(low-high) biba/high,mls/6 biba/high,mls/7" >> ${mactest_conf} -############################################################# -#case the mls label of the process is equal the file to be renamed but dominate parent dir: - echo -n "pid = -1 mac_test_check_vnode_rename_from:" > ${mactest_conf} - echo "biba/high(low-high),mls/7(low-high) biba/high,mls/6 biba/high,mls/7" >> ${mactest_conf} - mactestexpect "" EACCES -m "mls/7(low-high)" -f ${mactest_conf} rename ${n2} ${n1} + echo -n "pid = -1 vnode_check_lookup:" >> ${mactest_conf} + echo "biba/high(low-high),mls/6(low-high) biba/high,mls/6" >> ${mactest_conf} -############################################################# -#case the mls label of the process is equal the parent dir but dominated by the file - echo -n "pid = -1 mac_test_check_vnode_rename_from:" > ${mactest_conf} - echo "biba/high(low-high),mls/6(low-high) biba/high,mls/6 biba/high,mls/7" >> ${mactest_conf} + echo -n "pid = -1 vnode_check_rename_to:" >> ${mactest_conf} + echo "biba/high(low-high),mls/6(low-high) biba/high,mls/6 NULL" >> ${mactest_conf} + mactestexpect "" 0 -m "mls/6(low-high)" -f ${mactest_conf} rename ${n2} ${n1} - echo -n "pid = -1 mac_test_check_vnode_lookup:" >> ${mactest_conf} - echo "biba/high(low-high),mls/6(low-high) biba/high,mls/6" >> ${mactest_conf} - echo -n "pid = -1 mac_test_check_vnode_rename_to:" >> ${mactest_conf} - echo "biba/high(low-high),mls/6(low-high) biba/high,mls/6 NULL" >> ${mactest_conf} - mactestexpect "" 0 -m "mls/6(low-high)" -f ${mactest_conf} rename ${n2} ${n1} +#setfmac 6: set the mac label + truncate -s 0 ${mactest_conf} + mactestexpect "" "" -m "mls/7(low-high)" -f ${mactest_conf} system setfmac "mls/5" ${n1} -############################################################# -#setfmac, the hooks already got checked - rm ${mactest_conf} - touch ${mactest_conf} - mactestexpect "" "" -m "mls/7(low-high)" -f ${mactest_conf} system setfmac "mls/5" ${n1} -############################################################# -#the mls requirement for rename is very strict :-) +#case 7: the mls requirement for rename is very strict :-) #the process mls label must dominate parent dir's label for lookup - echo -n "pid = -1 mac_test_check_vnode_lookup:" > ${mactest_conf} - echo "biba/high(low-high),mls/5(low-high) biba/high,mls/6" >> ${mactest_conf} - mactestexpect "" EACCES -m "mls/5(low-high)" -f ${mactest_conf} rename ${n1} ${n0} + echo -n "pid = -1 vnode_check_lookup:" > ${mactest_conf} + echo "biba/high(low-high),mls/5(low-high) biba/high,mls/6" >> ${mactest_conf} + mactestexpect "" EACCES -m "mls/5(low-high)" -f ${mactest_conf} rename ${n1} ${n0} -#both parent dir's label and object's label must dominate +#case 8: both parent dir's label and object's label must dominate #process's label - echo -n "pid = -1 mac_test_check_vnode_rename_from:" > ${mactest_conf} - echo "biba/high(low-high),mls/6(low-high) biba/high,mls/6 biba/high,mls/5" >> ${mactest_conf} - mactestexpect "" EACCES -m "mls/6(low-high)" -f ${mactest_conf} rename ${n1} ${n0} + echo -n "pid = -1 vnode_check_rename_from:" > ${mactest_conf} + echo "biba/high(low-high),mls/6(low-high) biba/high,mls/6 biba/high,mls/5" >> ${mactest_conf} + mactestexpect "" EACCES -m "mls/6(low-high)" -f ${mactest_conf} rename ${n1} ${n0} + #cleanup: - t=`sysctl security.mac.mls.enabled=0` - echo "disabling mac/mls!" - cd .. - rm -fr ${n3} - rm ${mactest_conf} -fi - + sysctl security.mac.mls.enabled=0 >/dev/null + sysctl security.mac.biba.enabled=0 > /dev/null + rm -fr ${n3} + rm ${mactest_conf} + fi + ;; +*) + quick_exit + ;; +esac From owner-p4-projects@FreeBSD.ORG Mon Jan 14 07:21:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E84E916A420; Mon, 14 Jan 2008 07:21:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ADF2216A418 for ; Mon, 14 Jan 2008 07:21:28 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A920113C44B for ; Mon, 14 Jan 2008 07:21:28 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0E7LS8s061622 for ; Mon, 14 Jan 2008 07:21:28 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0E7LSo5061619 for perforce@freebsd.org; Mon, 14 Jan 2008 07:21:28 GMT (envelope-from sephe@FreeBSD.org) Date: Mon, 14 Jan 2008 07:21:28 GMT Message-Id: <200801140721.m0E7LSo5061619@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 133244 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 07:21:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=133244 Change 133244 by sephe@sephe_zealot:sam_wifi on 2008/01/14 07:20:31 - Correct control rate index mapping in turbog rate table - ieee80211_compute_duration() needs 802.11 rate code instead of rate table's rate index Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_phy.c#4 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_phy.c#4 (text+ko) ==== @@ -204,8 +204,8 @@ /* short ctrl */ /* Preamble dot11Rate Rate */ /* 6 Mb */ { TURBO, 6000, 0x00, (0x80|12), 0 }, -/* 12 Mb */ { TURBO, 12000, 0x00, (0x80|24), 2 }, -/* 18 Mb */ { TURBO, 18000, 0x00, 36, 2 }, +/* 12 Mb */ { TURBO, 12000, 0x00, (0x80|24), 1 }, +/* 18 Mb */ { TURBO, 18000, 0x00, 36, 1 }, /* 24 Mb */ { TURBO, 24000, 0x00, (0x80|48), 3 }, /* 36 Mb */ { TURBO, 36000, 0x00, 72, 3 }, /* 48 Mb */ { TURBO, 48000, 0x00, 96, 3 }, @@ -288,6 +288,7 @@ for (i = 0; i < rt->rateCount; i++) { uint8_t code = rt->info[i].dot11Rate; uint8_t cix = rt->info[i].ctlRateIndex; + uint8_t ctl_rate = rt->info[cix].dot11Rate; rt->rateCodeToIndex[code] = i; if (code & IEEE80211_RATE_BASIC) { @@ -303,11 +304,15 @@ * depends on whether they are marked as basic rates; * the static tables are setup with an 11b-compatible * 2Mb/s rate which will work but is suboptimal + * + * NB: Control rate is always less than or equal to the + * current rate, so control rate's reverse lookup entry + * has been installed and following call is safe. */ rt->info[i].lpAckDuration = ieee80211_compute_duration(rt, - WLAN_CTRL_FRAME_SIZE, cix, 0); + WLAN_CTRL_FRAME_SIZE, ctl_rate, 0); rt->info[i].spAckDuration = ieee80211_compute_duration(rt, - WLAN_CTRL_FRAME_SIZE, cix, IEEE80211_F_SHPREAMBLE); + WLAN_CTRL_FRAME_SIZE, ctl_rate, IEEE80211_F_SHPREAMBLE); } #undef WLAN_CTRL_FRAME_SIZE From owner-p4-projects@FreeBSD.ORG Mon Jan 14 16:29:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF46316A469; Mon, 14 Jan 2008 16:29:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 848EA16A418 for ; Mon, 14 Jan 2008 16:29:39 +0000 (UTC) (envelope-from rpaulo@gmail.com) Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.156]) by mx1.freebsd.org (Postfix) with ESMTP id A7BDF13C458 for ; Mon, 14 Jan 2008 16:29:38 +0000 (UTC) (envelope-from rpaulo@gmail.com) Received: by fg-out-1718.google.com with SMTP id 16so2556799fgg.35 for ; Mon, 14 Jan 2008 08:29:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:message-id:from:to:cc:subject:in-reply-to:references:user-agent:mime-version:content-type:sender; bh=loxiuLm1WhgKNC0J6oSd4h+zRRUZYVUBf5RoVPmvGio=; b=LbgelGTxjUspF+J2W8ONacKnQNkC1oz2hJsDdPi44jdBeIAjh6Wp/G2uDIPrGtgc1845d8uQwYGa3hwTglt3UaLvUZAVHmK5ZkCagfv/Kp5zkzi/8fGKClhfpIAzjgnFwQXTPikYMZUPdNu8rRtsgL9xlZaDRoQNNTv37lOnGYs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:message-id:from:to:cc:subject:in-reply-to:references:user-agent:mime-version:content-type:sender; b=lFaIiSrifFf1oK91KmLJVTVLJIbub3c+DYhlBegVFA2lZD+/+I8o5NHLFGQZg1No5402tkP2afS9LCzPgeN85LZQZT8cI2lzPMS8ufd/kBoognE9xpROS/+XLK/prb5oSMliM0TK6zhDV+I1xt6CxAnDhbceKwBOlqnj6SvUbSM= Received: by 10.82.146.14 with SMTP id t14mr11275366bud.9.1200328176823; Mon, 14 Jan 2008 08:29:36 -0800 (PST) Received: from epsilon.local.gmail.com ( [193.126.199.121]) by mx.google.com with ESMTPS id n3sm5373448gvf.16.2008.01.14.08.29.35 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 14 Jan 2008 08:29:36 -0800 (PST) Date: Mon, 14 Jan 2008 16:29:16 +0000 Message-ID: <863at0jrqb.wl%rpaulo@fnop.net> From: Rui Paulo To: John Baldwin In-Reply-To: <200801101655.m0AGtZqn043424@repoman.freebsd.org> References: <200801101655.m0AGtZqn043424@repoman.freebsd.org> User-Agent: Wanderlust/2.15.5 (Almost Unreal) Emacs/22.1 Mule/5.0 (SAKAKI) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: Rui Paulo Cc: Perforce Change Reviews Subject: Re: PERFORCE change 132974 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 16:29:40 -0000 At Thu, 10 Jan 2008 16:55:35 GMT, John Baldwin wrote: > > http://perforce.freebsd.org/chv.cgi?CH=132974 > > Change 132974 by jhb@jhb_zion on 2008/01/10 16:54:55 > > Update. > > Affected files ... > > .. //depot/projects/power/notes#12 edit > > Differences ... > > ==== //depot/projects/power/notes#12 (text+ko) ==== > > @@ -69,3 +69,15 @@ > The second stage will be to make the powering off of devices more automated. > This is still in early design stage. It may involve a powerd, it may > involve intelligence in the kernel. > + > +Other stuff: > + > +- Make the DPMS support in acpi_video a separate driver that attaches to > + vgapci0 > +- Automated idle device power management > + - Basic idea is that when a device is idle for a specified amount of time, > + it should power down into D1 or D2. For example, NICs can power down > + when they have no link until they get link. Audio controllers can power > + down when they aren't open, etc. > + - Want to avoid having lots of scaffolding in device drivers. So we need > + to come up with some models for some frameworks. Cool, thanks for working on this. I had this in my mind since forever.. -- Rui Paulo From owner-p4-projects@FreeBSD.ORG Mon Jan 14 18:22:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9937916A421; Mon, 14 Jan 2008 18:22:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 42E1616A41A for ; Mon, 14 Jan 2008 18:22:31 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0A1B713C442 for ; Mon, 14 Jan 2008 18:22:31 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0EIMVwB007280 for ; Mon, 14 Jan 2008 18:22:31 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0EIMKhr007203 for perforce@freebsd.org; Mon, 14 Jan 2008 18:22:20 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 14 Jan 2008 18:22:20 GMT Message-Id: <200801141822.m0EIMKhr007203@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 133261 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 18:22:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=133261 Change 133261 by zec@zec_tpx32 on 2008/01/14 18:22:14 IFC Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/exception.S#4 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#8 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/mp_watchdog.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#11 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/vimage/src/sys/amd64/amd64/trap.c#7 integrate .. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#12 integrate .. //depot/projects/vimage/src/sys/amd64/conf/NOTES#8 integrate .. //depot/projects/vimage/src/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/specialreg.h#6 integrate .. //depot/projects/vimage/src/sys/amd64/include/stack.h#1 branch .. //depot/projects/vimage/src/sys/amd64/include/vmparam.h#6 integrate .. //depot/projects/vimage/src/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/pmap.c#10 integrate .. //depot/projects/vimage/src/sys/arm/arm/stack_machdep.c#1 branch .. //depot/projects/vimage/src/sys/arm/at91/at91.c#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/if_ate.c#6 integrate .. //depot/projects/vimage/src/sys/arm/at91/kb920x_machdep.c#7 integrate .. //depot/projects/vimage/src/sys/arm/at91/uart_dev_at91usart.c#5 integrate .. //depot/projects/vimage/src/sys/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/vimage/src/sys/arm/include/stack.h#1 branch .. //depot/projects/vimage/src/sys/arm/include/vmparam.h#5 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/boot2/bwct_board.c#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/spi_flash.c#4 integrate .. //depot/projects/vimage/src/sys/boot/forth/support.4th#2 integrate .. //depot/projects/vimage/src/sys/boot/powerpc/Makefile#2 integrate .. //depot/projects/vimage/src/sys/boot/powerpc/loader/Makefile#2 delete .. //depot/projects/vimage/src/sys/boot/powerpc/loader/conf.c#2 delete .. //depot/projects/vimage/src/sys/boot/powerpc/loader/help.ofw#2 delete .. //depot/projects/vimage/src/sys/boot/powerpc/loader/ldscript.powerpc#2 delete .. //depot/projects/vimage/src/sys/boot/powerpc/loader/metadata.c#2 delete .. //depot/projects/vimage/src/sys/boot/powerpc/loader/start.c#2 delete .. //depot/projects/vimage/src/sys/boot/powerpc/loader/version#2 delete .. //depot/projects/vimage/src/sys/boot/powerpc/ofw/Makefile#1 branch .. //depot/projects/vimage/src/sys/boot/powerpc/ofw/conf.c#1 branch .. //depot/projects/vimage/src/sys/boot/powerpc/ofw/help.ofw#1 branch .. //depot/projects/vimage/src/sys/boot/powerpc/ofw/ldscript.powerpc#1 branch .. //depot/projects/vimage/src/sys/boot/powerpc/ofw/metadata.c#1 branch .. //depot/projects/vimage/src/sys/boot/powerpc/ofw/start.c#1 branch .. //depot/projects/vimage/src/sys/boot/powerpc/ofw/version#1 branch .. //depot/projects/vimage/src/sys/cam/cam_xpt.c#11 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_da.c#11 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_low.h#2 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_file.c#8 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_stats.c#5 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_ndis.c#5 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_ntoskrnl.c#6 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/vimage/src/sys/conf/Makefile.amd64#3 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#19 integrate .. //depot/projects/vimage/src/sys/conf/files#22 integrate .. //depot/projects/vimage/src/sys/conf/files.amd64#9 integrate .. //depot/projects/vimage/src/sys/conf/files.arm#5 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#9 integrate .. //depot/projects/vimage/src/sys/conf/files.ia64#5 integrate .. //depot/projects/vimage/src/sys/conf/files.pc98#7 integrate .. //depot/projects/vimage/src/sys/conf/files.powerpc#7 integrate .. //depot/projects/vimage/src/sys/conf/files.sparc64#7 integrate .. //depot/projects/vimage/src/sys/conf/files.sun4v#6 integrate .. //depot/projects/vimage/src/sys/conf/options#21 integrate .. //depot/projects/vimage/src/sys/conf/options.powerpc#2 integrate .. //depot/projects/vimage/src/sys/ddb/db_capture.c#1 branch .. //depot/projects/vimage/src/sys/ddb/db_command.c#4 integrate .. //depot/projects/vimage/src/sys/ddb/db_command.h#2 integrate .. //depot/projects/vimage/src/sys/ddb/db_input.c#2 integrate .. //depot/projects/vimage/src/sys/ddb/db_lex.c#2 integrate .. //depot/projects/vimage/src/sys/ddb/db_lex.h#2 integrate .. //depot/projects/vimage/src/sys/ddb/db_main.c#2 integrate .. //depot/projects/vimage/src/sys/ddb/db_output.c#2 integrate .. //depot/projects/vimage/src/sys/ddb/db_script.c#1 branch .. //depot/projects/vimage/src/sys/ddb/db_textdump.c#1 add .. //depot/projects/vimage/src/sys/ddb/ddb.h#2 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac.c#5 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac_cam.c#6 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac_pci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/aac/aacvar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/acpica/Osd/OsdDebug.c#3 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_thermal.c#4 integrate .. //depot/projects/vimage/src/sys/dev/amr/amr.c#3 integrate .. //depot/projects/vimage/src/sys/dev/amr/amr_cam.c#5 integrate .. //depot/projects/vimage/src/sys/dev/amr/amr_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/arcmsr/arcmsr.c#8 integrate .. //depot/projects/vimage/src/sys/dev/arcmsr/arcmsr.h#4 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-all.h#6 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-chipset.c#11 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-disk.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-dma.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-lowlevel.c#4 integrate .. //depot/projects/vimage/src/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/vimage/src/sys/dev/atkbdc/atkbd_atkbdc.c#3 integrate .. //depot/projects/vimage/src/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/vimage/src/sys/dev/bge/if_bgereg.h#8 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_adapter.h#8 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_config.h#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_include.h#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_l2t.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_l2t.h#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#9 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_offload.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_offload.h#5 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_osdep.h#6 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_sge.c#9 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/sys/cxgb_support.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/sys/mbufq.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/sys/mvec.h#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/t3cdev.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/toecore/toedev.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/toecore/toedev.h#2 delete .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#1 add .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_tcp.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_subr.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_usrreq.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_tom.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#1 branch .. //depot/projects/vimage/src/sys/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed_rtl80x9.c#2 integrate .. //depot/projects/vimage/src/sys/dev/fb/creator.c#5 integrate .. //depot/projects/vimage/src/sys/dev/fb/fb.c#2 integrate .. //depot/projects/vimage/src/sys/dev/fb/fbreg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/fb/machfb.c#3 integrate .. //depot/projects/vimage/src/sys/dev/fb/splash_bmp.c#3 integrate .. //depot/projects/vimage/src/sys/dev/fb/splash_pcx.c#2 integrate .. //depot/projects/vimage/src/sys/dev/fb/vga.c#2 integrate .. //depot/projects/vimage/src/sys/dev/gem/if_gem.c#7 integrate .. //depot/projects/vimage/src/sys/dev/gem/if_gem_pci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/gem/if_gemreg.h#4 integrate .. //depot/projects/vimage/src/sys/dev/gem/if_gemvar.h#6 integrate .. //depot/projects/vimage/src/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/vimage/src/sys/dev/hptrr/array.h#1 branch .. //depot/projects/vimage/src/sys/dev/hptrr/him.h#1 branch .. //depot/projects/vimage/src/sys/dev/hptrr/himfuncs.h#1 branch .. //depot/projects/vimage/src/sys/dev/hptrr/hptintf.h#1 branch .. //depot/projects/vimage/src/sys/dev/hptrr/hptrr_config.c#1 branch .. //depot/projects/vimage/src/sys/dev/hptrr/hptrr_config.h#1 branch .. //depot/projects/vimage/src/sys/dev/hptrr/hptrr_os_bsd.c#1 branch .. //depot/projects/vimage/src/sys/dev/hptrr/hptrr_osm_bsd.c#1 branch .. //depot/projects/vimage/src/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/vimage/src/sys/dev/hptrr/ldm.h#1 branch .. //depot/projects/vimage/src/sys/dev/hptrr/list.h#1 branch .. //depot/projects/vimage/src/sys/dev/hptrr/os_bsd.h#1 branch .. //depot/projects/vimage/src/sys/dev/hptrr/osm.h#1 branch .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_arm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_ia64.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_logging.c#4 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_mod.c#5 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_piv.c#3 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_powerpc.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_sparc64.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_x86.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ichwd/ichwd.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ichwd/ichwd.h#4 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#8 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/ipw/if_ipw.c#8 integrate .. //depot/projects/vimage/src/sys/dev/iwi/if_iwi.c#9 integrate .. //depot/projects/vimage/src/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/vimage/src/sys/dev/kbd/kbdreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/vimage/src/sys/dev/le/am7990.c#3 integrate .. //depot/projects/vimage/src/sys/dev/le/am79900.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfi.c#8 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfi_pci.c#6 integrate .. //depot/projects/vimage/src/sys/dev/msk/if_msk.c#10 integrate .. //depot/projects/vimage/src/sys/dev/msk/if_mskreg.h#6 integrate .. //depot/projects/vimage/src/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ofw/openpromio.c#2 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci_user.c#4 integrate .. //depot/projects/vimage/src/sys/dev/powermac_nvram/powermac_nvram.c#2 integrate .. //depot/projects/vimage/src/sys/dev/re/if_re.c#13 integrate .. //depot/projects/vimage/src/sys/dev/sio/sio.c#4 integrate .. //depot/projects/vimage/src/sys/dev/snp/snp.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#15 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/ich.c#8 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/maestro.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/channel.c#5 integrate .. //depot/projects/vimage/src/sys/dev/streams/streams.c#4 integrate .. //depot/projects/vimage/src/sys/dev/syscons/blank/blank_saver.c#2 integrate .. //depot/projects/vimage/src/sys/dev/syscons/daemon/daemon_saver.c#2 integrate .. //depot/projects/vimage/src/sys/dev/syscons/dragon/dragon_saver.c#2 integrate .. //depot/projects/vimage/src/sys/dev/syscons/fade/fade_saver.c#2 integrate .. //depot/projects/vimage/src/sys/dev/syscons/fire/fire_saver.c#3 integrate .. //depot/projects/vimage/src/sys/dev/syscons/green/green_saver.c#2 integrate .. //depot/projects/vimage/src/sys/dev/syscons/logo/logo_saver.c#3 integrate .. //depot/projects/vimage/src/sys/dev/syscons/rain/rain_saver.c#3 integrate .. //depot/projects/vimage/src/sys/dev/syscons/scgfbrndr.c#3 integrate .. //depot/projects/vimage/src/sys/dev/syscons/scvgarndr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/vimage/src/sys/dev/syscons/snake/snake_saver.c#2 integrate .. //depot/projects/vimage/src/sys/dev/syscons/star/star_saver.c#2 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/vimage/src/sys/dev/syscons/warp/warp_saver.c#3 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_core.c#3 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_cpu_powerpc.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/ukbd.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/umass.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/ums.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/uplcom.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#16 integrate .. //depot/projects/vimage/src/sys/dev/utopia/utopia.c#3 integrate .. //depot/projects/vimage/src/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#9 integrate .. //depot/projects/vimage/src/sys/fs/fifofs/fifo_vnops.c#6 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_subr.c#6 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vfsops.c#8 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vnops.c#8 integrate .. //depot/projects/vimage/src/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_subr.c#9 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_vnops.c#8 integrate .. //depot/projects/vimage/src/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/vimage/src/sys/geom/geom_bsd_enc.c#2 integrate .. //depot/projects/vimage/src/sys/geom/geom_dev.c#4 integrate .. //depot/projects/vimage/src/sys/geom/geom_io.c#5 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part.c#6 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part.h#5 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_bsd.c#1 branch .. //depot/projects/vimage/src/sys/i386/bios/apm.c#4 integrate .. //depot/projects/vimage/src/sys/i386/conf/GENERIC#14 integrate .. //depot/projects/vimage/src/sys/i386/conf/GENERIC.hints#6 integrate .. //depot/projects/vimage/src/sys/i386/conf/NOTES#13 integrate .. //depot/projects/vimage/src/sys/i386/conf/PAE#8 integrate .. //depot/projects/vimage/src/sys/i386/i386/db_trace.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/exception.s#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/machdep.c#10 integrate .. //depot/projects/vimage/src/sys/i386/i386/mp_watchdog.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/pmap.c#11 integrate .. //depot/projects/vimage/src/sys/i386/i386/stack_machdep.c#1 branch .. //depot/projects/vimage/src/sys/i386/i386/trap.c#8 integrate .. //depot/projects/vimage/src/sys/i386/include/pmc_mdep.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/stack.h#1 branch .. //depot/projects/vimage/src/sys/i386/include/vmparam.h#6 integrate .. //depot/projects/vimage/src/sys/i386/pci/pci_pir.c#2 integrate .. //depot/projects/vimage/src/sys/i386/xbox/xboxfb.c#3 integrate .. //depot/projects/vimage/src/sys/ia64/conf/DEFAULTS#4 integrate .. //depot/projects/vimage/src/sys/ia64/conf/GENERIC#6 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/db_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/machdep.c#10 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/pmap.c#8 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/stack_machdep.c#1 branch .. //depot/projects/vimage/src/sys/ia64/include/pmc_mdep.h#2 integrate .. //depot/projects/vimage/src/sys/ia64/include/vmparam.h#6 integrate .. //depot/projects/vimage/src/sys/isa/vga_isa.c#2 integrate .. //depot/projects/vimage/src/sys/kern/Makefile#3 integrate .. //depot/projects/vimage/src/sys/kern/imgact_elf.c#5 integrate .. //depot/projects/vimage/src/sys/kern/init_main.c#16 integrate .. //depot/projects/vimage/src/sys/kern/kern_clock.c#14 integrate .. //depot/projects/vimage/src/sys/kern/kern_conf.c#7 integrate .. //depot/projects/vimage/src/sys/kern/kern_descrip.c#11 integrate .. //depot/projects/vimage/src/sys/kern/kern_event.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_exec.c#8 integrate .. //depot/projects/vimage/src/sys/kern/kern_lock.c#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_mbuf.c#7 integrate .. //depot/projects/vimage/src/sys/kern/kern_mib.c#8 integrate .. //depot/projects/vimage/src/sys/kern/kern_module.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_mutex.c#10 integrate .. //depot/projects/vimage/src/sys/kern/kern_pmc.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_proc.c#7 integrate .. //depot/projects/vimage/src/sys/kern/kern_resource.c#10 integrate .. //depot/projects/vimage/src/sys/kern/kern_rwlock.c#9 integrate .. //depot/projects/vimage/src/sys/kern/kern_shutdown.c#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_sig.c#8 integrate .. //depot/projects/vimage/src/sys/kern/kern_sx.c#10 integrate .. //depot/projects/vimage/src/sys/kern/kern_tc.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_thread.c#11 integrate .. //depot/projects/vimage/src/sys/kern/kern_umtx.c#7 integrate .. //depot/projects/vimage/src/sys/kern/sched_4bsd.c#18 integrate .. //depot/projects/vimage/src/sys/kern/sched_ule.c#19 integrate .. //depot/projects/vimage/src/sys/kern/subr_bus.c#6 integrate .. //depot/projects/vimage/src/sys/kern/subr_kdb.c#3 integrate .. //depot/projects/vimage/src/sys/kern/subr_lock.c#9 integrate .. //depot/projects/vimage/src/sys/kern/subr_smp.c#7 integrate .. //depot/projects/vimage/src/sys/kern/subr_stack.c#3 integrate .. //depot/projects/vimage/src/sys/kern/subr_trap.c#8 integrate .. //depot/projects/vimage/src/sys/kern/subr_witness.c#8 integrate .. //depot/projects/vimage/src/sys/kern/sys_generic.c#8 integrate .. //depot/projects/vimage/src/sys/kern/sys_pipe.c#6 integrate .. //depot/projects/vimage/src/sys/kern/tty_cons.c#3 integrate .. //depot/projects/vimage/src/sys/kern/uipc_debug.c#3 integrate .. //depot/projects/vimage/src/sys/kern/uipc_mqueue.c#5 integrate .. //depot/projects/vimage/src/sys/kern/uipc_sockbuf.c#7 integrate .. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#15 integrate .. //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#13 integrate .. //depot/projects/vimage/src/sys/kern/vfs_bio.c#10 integrate .. //depot/projects/vimage/src/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/vimage/src/sys/kern/vfs_subr.c#9 integrate .. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#11 integrate .. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#7 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#15 integrate .. //depot/projects/vimage/src/sys/modules/amr/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/cxgb/Makefile#6 integrate .. //depot/projects/vimage/src/sys/modules/cxgb/cxgb/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/cxgb/toecore/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/cxgb/tom/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/hptrr/Makefile#1 branch .. //depot/projects/vimage/src/sys/net/bpf.c#17 integrate .. //depot/projects/vimage/src/sys/net/bpf.h#4 integrate .. //depot/projects/vimage/src/sys/net/bpf_filter.c#3 integrate .. //depot/projects/vimage/src/sys/net/bridgestp.c#8 integrate .. //depot/projects/vimage/src/sys/net/bridgestp.h#5 integrate .. //depot/projects/vimage/src/sys/net/ieee8023ad_lacp.c#8 integrate .. //depot/projects/vimage/src/sys/net/ieee8023ad_lacp.h#6 integrate .. //depot/projects/vimage/src/sys/net/if.h#5 integrate .. //depot/projects/vimage/src/sys/net/if_bridge.c#10 integrate .. //depot/projects/vimage/src/sys/net/if_enc.c#4 integrate .. //depot/projects/vimage/src/sys/net/if_lagg.c#13 integrate .. //depot/projects/vimage/src/sys/net/if_var.h#12 integrate .. //depot/projects/vimage/src/sys/net/netisr.h#2 integrate .. //depot/projects/vimage/src/sys/net/route.c#12 integrate .. //depot/projects/vimage/src/sys/net/route.h#2 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211.c#10 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_output.c#9 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_radiotap.h#5 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#24 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_car.c#4 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_car.h#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_l2tp.c#4 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_pppoe.c#4 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_pppoe.h#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_socket.c#4 integrate .. //depot/projects/vimage/src/sys/netinet/if_ether.c#16 integrate .. //depot/projects/vimage/src/sys/netinet/if_ether.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#19 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.h#12 integrate .. //depot/projects/vimage/src/sys/netinet/ip_dummynet.c#8 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#29 integrate .. //depot/projects/vimage/src/sys/netinet/libalias/alias_util.c#4 integrate .. //depot/projects/vimage/src/sys/netinet/sctp.h#11 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_bsd_addr.c#11 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#22 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_structs.h#16 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#23 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#23 integrate .. //depot/projects/vimage/src/sys/netinet/tcp.h#6 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_offload.c#1 branch .. //depot/projects/vimage/src/sys/netinet/tcp_offload.h#1 branch .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#38 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#24 edit .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#8 edit .. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#16 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_var.h#19 integrate .. //depot/projects/vimage/src/sys/netinet/toedev.h#1 branch .. //depot/projects/vimage/src/sys/netinet6/dest6.c#5 integrate .. //depot/projects/vimage/src/sys/netinet6/frag6.c#11 integrate .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#20 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.c#14 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.h#7 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_cksum.c#4 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_gif.c#8 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_gif.h#2 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#15 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.h#2 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#14 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.h#3 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#22 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#9 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_src.c#14 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_var.h#5 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_ecn.h#2 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_forward.c#10 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_id.c#3 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#25 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_ipsec.c#7 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_ipsec.h#3 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#12 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.h#4 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#13 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_var.h#9 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6protosw.h#3 integrate .. //depot/projects/vimage/src/sys/netinet6/mld6.c#9 integrate .. //depot/projects/vimage/src/sys/netinet6/mld6_var.h#2 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.c#24 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.h#6 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#13 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#11 integrate .. //depot/projects/vimage/src/sys/netinet6/pim6.h#2 integrate .. //depot/projects/vimage/src/sys/netinet6/pim6_var.h#2 integrate .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#15 integrate .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.h#2 integrate .. //depot/projects/vimage/src/sys/netinet6/route6.c#6 integrate .. //depot/projects/vimage/src/sys/netinet6/scope6.c#12 integrate .. //depot/projects/vimage/src/sys/netinet6/scope6_var.h#2 integrate .. //depot/projects/vimage/src/sys/netinet6/sctp6_usrreq.c#20 integrate .. //depot/projects/vimage/src/sys/netinet6/sctp6_var.h#8 integrate .. //depot/projects/vimage/src/sys/netinet6/tcp6_var.h#2 integrate .. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#20 integrate .. //depot/projects/vimage/src/sys/netinet6/udp6_var.h#4 integrate .. //depot/projects/vimage/src/sys/netncp/ncp_rq.c#2 integrate .. //depot/projects/vimage/src/sys/netncp/ncp_sock.c#4 integrate .. //depot/projects/vimage/src/sys/netncp/ncp_sock.h#2 integrate .. //depot/projects/vimage/src/sys/netsmb/smb_trantcp.c#3 integrate .. //depot/projects/vimage/src/sys/opencrypto/cryptodev.c#6 integrate .. //depot/projects/vimage/src/sys/pc98/cbus/gdc.c#2 integrate .. //depot/projects/vimage/src/sys/pc98/cbus/pckbd.c#3 integrate .. //depot/projects/vimage/src/sys/pc98/cbus/scgdcrndr.c#2 integrate .. //depot/projects/vimage/src/sys/pc98/cbus/sio.c#5 integrate .. //depot/projects/vimage/src/sys/pc98/conf/GENERIC#8 integrate .. //depot/projects/vimage/src/sys/pc98/include/stack.h#1 branch .. //depot/projects/vimage/src/sys/pc98/pc98/machdep.c#8 integrate .. //depot/projects/vimage/src/sys/pci/if_rlreg.h#8 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/clock.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/aim/copyinout.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/aim/interrupt.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/aim/locore.S#1 branch .. //depot/projects/vimage/src/sys/powerpc/aim/machdep.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/aim/mmu_oea.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/aim/nexus.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/aim/ofw_machdep.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/aim/ofwmagic.S#1 branch .. //depot/projects/vimage/src/sys/powerpc/aim/swtch.S#1 branch .. //depot/projects/vimage/src/sys/powerpc/aim/trap.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/aim/trap_subr.S#1 branch .. //depot/projects/vimage/src/sys/powerpc/aim/uio_machdep.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/aim/uma_machdep.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/aim/vm_machdep.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#7 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/NOTES#5 integrate .. //depot/projects/vimage/src/sys/powerpc/include/_bus.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/include/bus.h#3 integrate .. //depot/projects/vimage/src/sys/powerpc/include/fpu.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/include/pmc_mdep.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/include/stack.h#1 branch .. //depot/projects/vimage/src/sys/powerpc/include/vmparam.h#5 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/grackle.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/pswitch.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/uninorth.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/bus_machdep.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/powerpc/clock.c#4 delete .. //depot/projects/vimage/src/sys/powerpc/powerpc/copyinout.c#2 delete .. //depot/projects/vimage/src/sys/powerpc/powerpc/db_memrw.c#2 delete .. //depot/projects/vimage/src/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/interrupt.c#4 delete .. //depot/projects/vimage/src/sys/powerpc/powerpc/locore.S#2 delete .. //depot/projects/vimage/src/sys/powerpc/powerpc/machdep.c#8 delete .. //depot/projects/vimage/src/sys/powerpc/powerpc/mmu_oea.c#5 delete .. //depot/projects/vimage/src/sys/powerpc/powerpc/nexus.c#5 delete .. //depot/projects/vimage/src/sys/powerpc/powerpc/ofw_machdep.c#3 delete .. //depot/projects/vimage/src/sys/powerpc/powerpc/ofwmagic.S#2 delete .. //depot/projects/vimage/src/sys/powerpc/powerpc/pmap_dispatch.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/stack_machdep.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/powerpc/swtch.S#3 delete .. //depot/projects/vimage/src/sys/powerpc/powerpc/trap.c#7 delete .. //depot/projects/vimage/src/sys/powerpc/powerpc/trap_subr.S#2 delete .. //depot/projects/vimage/src/sys/powerpc/powerpc/uio_machdep.c#4 delete .. //depot/projects/vimage/src/sys/powerpc/powerpc/uma_machdep.c#3 delete .. //depot/projects/vimage/src/sys/powerpc/powerpc/vm_machdep.c#5 delete .. //depot/projects/vimage/src/sys/powerpc/psim/iobus.c#2 integrate .. //depot/projects/vimage/src/sys/security/audit/audit.c#8 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_pipe.c#5 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_posix_sem.c#5 integrate .. //depot/projects/vimage/src/sys/security/mac_test/mac_test.c#8 integrate .. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#7 integrate .. //depot/projects/vimage/src/sys/sparc64/include/pmc_mdep.h#2 integrate .. //depot/projects/vimage/src/sys/sparc64/include/stack.h#1 branch .. //depot/projects/vimage/src/sys/sparc64/include/vmparam.h#6 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/psycho.c#10 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/machdep.c#8 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/pmap.c#7 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/stack_machdep.c#1 branch .. //depot/projects/vimage/src/sys/sparc64/sparc64/trap.c#4 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/tsb.c#3 integrate .. //depot/projects/vimage/src/sys/sun4v/conf/GENERIC#8 integrate .. //depot/projects/vimage/src/sys/sun4v/include/pmc_mdep.h#2 integrate .. //depot/projects/vimage/src/sys/sun4v/include/stack.h#1 branch .. //depot/projects/vimage/src/sys/sun4v/include/vmparam.h#6 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/db_trace.c#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/hvcons.c#3 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/machdep.c#6 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/pmap.c#8 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/stack_machdep.c#1 branch .. //depot/projects/vimage/src/sys/sun4v/sun4v/trap.c#6 integrate .. //depot/projects/vimage/src/sys/sys/_lock.h#2 integrate .. //depot/projects/vimage/src/sys/sys/ata.h#5 integrate .. //depot/projects/vimage/src/sys/sys/cdefs.h#2 integrate .. //depot/projects/vimage/src/sys/sys/copyright.h#4 integrate .. //depot/projects/vimage/src/sys/sys/disklabel.h#2 integrate .. //depot/projects/vimage/src/sys/sys/file.h#3 integrate .. //depot/projects/vimage/src/sys/sys/kdb.h#2 integrate .. //depot/projects/vimage/src/sys/sys/kernel.h#9 integrate .. //depot/projects/vimage/src/sys/sys/kerneldump.h#2 integrate .. //depot/projects/vimage/src/sys/sys/lock_profile.h#8 integrate .. //depot/projects/vimage/src/sys/sys/lockmgr.h#4 integrate .. //depot/projects/vimage/src/sys/sys/mbuf.h#10 integrate .. //depot/projects/vimage/src/sys/sys/param.h#14 integrate .. //depot/projects/vimage/src/sys/sys/pcpu.h#6 integrate .. //depot/projects/vimage/src/sys/sys/pmc.h#2 integrate .. //depot/projects/vimage/src/sys/sys/pmckern.h#2 integrate .. //depot/projects/vimage/src/sys/sys/pmclog.h#2 integrate .. //depot/projects/vimage/src/sys/sys/priv.h#7 integrate .. //depot/projects/vimage/src/sys/sys/proc.h#15 integrate .. //depot/projects/vimage/src/sys/sys/selinfo.h#2 integrate .. //depot/projects/vimage/src/sys/sys/socket.h#5 integrate .. //depot/projects/vimage/src/sys/sys/socketvar.h#6 integrate .. //depot/projects/vimage/src/sys/sys/stack.h#3 integrate .. //depot/projects/vimage/src/sys/sys/sx.h#8 integrate .. //depot/projects/vimage/src/sys/sys/sysctl.h#14 integrate .. //depot/projects/vimage/src/sys/sys/systm.h#9 integrate .. //depot/projects/vimage/src/sys/sys/tree.h#3 integrate .. //depot/projects/vimage/src/sys/sys/tty.h#2 integrate .. //depot/projects/vimage/src/sys/sys/ucred.h#6 integrate .. //depot/projects/vimage/src/sys/sys/unpcb.h#4 integrate .. //depot/projects/vimage/src/sys/sys/user.h#4 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_balloc.c#3 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vnops.c#8 integrate .. //depot/projects/vimage/src/sys/vm/pmap.h#3 integrate .. //depot/projects/vimage/src/sys/vm/vm.h#2 integrate .. //depot/projects/vimage/src/sys/vm/vm_fault.c#10 integrate .. //depot/projects/vimage/src/sys/vm/vm_kern.c#6 integrate .. //depot/projects/vimage/src/sys/vm/vm_map.c#9 integrate .. //depot/projects/vimage/src/sys/vm/vm_object.c#11 integrate .. //depot/projects/vimage/src/sys/vm/vm_object.h#3 integrate .. //depot/projects/vimage/src/sys/vm/vm_page.c#13 integrate .. //depot/projects/vimage/src/sys/vm/vm_phys.c#4 integrate .. //depot/projects/vimage/src/sys/vm/vm_phys.h#4 integrate .. //depot/projects/vimage/src/sys/vm/vm_reserv.c#1 branch .. //depot/projects/vimage/src/sys/vm/vm_reserv.h#1 branch Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/db_trace.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.81 2007/11/15 22:00:56 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.82 2007/12/02 20:40:30 rwatson Exp $"); #include #include @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -177,18 +178,6 @@ return (1); } -/* - * Stack trace. - */ -#define INKERNEL(va) (((va) >= DMAP_MIN_ADDRESS && (va) < DMAP_MAX_ADDRESS) \ - || ((va) >= KERNBASE && (va) < VM_MAX_KERNEL_ADDRESS)) - -struct amd64_frame { - struct amd64_frame *f_frame; - long f_retaddr; - long f_arg0; -}; - #define NORMAL 0 #define TRAP 1 #define INTERRUPT 2 @@ -505,32 +494,6 @@ ctx->pcb_rip, count)); } -void -stack_save(struct stack *st) -{ - struct amd64_frame *frame; - vm_offset_t callpc; - register_t rbp; - - stack_zero(st); - __asm __volatile("movq %%rbp,%0" : "=r" (rbp)); - frame = (struct amd64_frame *)rbp; - while (1) { - if (!INKERNEL((long)frame)) - break; - callpc = frame->f_retaddr; - if (!INKERNEL(callpc)) - break; - if (stack_put(st, callpc) == -1) - break; - if (frame->f_frame <= frame || - (vm_offset_t)frame->f_frame >= - (vm_offset_t)rbp + KSTACK_PAGES * PAGE_SIZE) - break; - frame = frame->f_frame; - } -} - int amd64_set_watch(watchnum, watchaddr, size, access, d) int watchnum; ==== //depot/projects/vimage/src/sys/amd64/amd64/exception.S#4 (text+ko) ==== @@ -1,8 +1,12 @@ /*- * Copyright (c) 1989, 1990 William F. Jolitz. * Copyright (c) 1990 The Regents of the University of California. + * Copyright (c) 2007 The FreeBSD Foundation * All rights reserved. * + * Portions of this software were developed by A. Joseph Koshy under + * sponsorship from the FreeBSD Foundation and Google, Inc. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -27,11 +31,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.130 2007/11/15 22:00:56 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.131 2007/12/07 08:20:15 jkoshy Exp $ */ #include "opt_atpic.h" #include "opt_compat.h" +#include "opt_hwpmc_hooks.h" #include #include @@ -40,6 +45,9 @@ #include "assym.s" .text +#ifdef HWPMC_HOOKS + ENTRY(start_exceptions) +#endif /*****************************************************************************/ /* Trap handling */ @@ -348,6 +356,9 @@ * execute the NMI handler with interrupts disabled to prevent a * nested interrupt from executing an 'iretq' instruction and * inadvertently taking the processor out of NMI mode. + * + * Third, the NMI handler runs on its own stack (tss_ist1), shared + * with the double fault handler. */ IDTVEC(nmi) @@ -386,6 +397,61 @@ movq %rsp, %rdi call trap MEXITCOUNT +#ifdef HWPMC_HOOKS + /* + * Check if the current trap was from user mode and if so + * whether the current thread needs a user call chain to be + * captured. We are still in NMI mode at this point. + */ + testb $SEL_RPL_MASK,TF_CS(%rsp) + jz nocallchain + movq PCPU(CURTHREAD),%rax /* curthread present? */ + orq %rax,%rax + jz nocallchain + testl $TDP_CALLCHAIN,TD_PFLAGS(%rax) /* flagged for capture? */ + jz nocallchain + /* + * A user callchain is to be captured, so: + * - Move execution to the regular kernel stack, to allow for + * nested NMI interrupts. + * - Take the processor out of "NMI" mode by faking an "iret". + * - Enable interrupts, so that copyin() can work. + */ + movq %rsp,%rsi /* source stack pointer */ + movq $TF_SIZE,%rcx + movq PCPU(RSP0),%rbx + subq %rcx,%rbx + movq %rbx,%rdi /* destination stack pointer */ + + shrq $3,%rcx /* trap frame size in long words */ + cld + rep + movsq /* copy trapframe */ + + movl %ss,%eax + pushq %rax /* tf_ss */ + pushq %rbx /* tf_rsp (on kernel stack) */ + pushfq /* tf_rflags */ + movl %cs,%eax + pushq %rax /* tf_cs */ + pushq $outofnmi /* tf_rip */ + iretq +outofnmi: + /* + * At this point the processor has exited NMI mode and is running + * with interrupts turned off on the normal kernel stack. + * We turn interrupts back on, and take the usual 'doreti' exit + * path. + * + * If a pending NMI gets recognized at or after this point, it + * will cause a kernel callchain to be traced. Since this path + * is only taken for NMI interrupts from user space, our `swapgs' + * state is correct for taking the doreti path. + */ + sti + jmp doreti +nocallchain: +#endif testl %ebx,%ebx jz nmi_restoreregs swapgs @@ -556,3 +622,6 @@ movq $0,TF_ADDR(%rsp) FAKE_MCOUNT(TF_RIP(%rsp)) jmp calltrap +#ifdef HWPMC_HOOKS + ENTRY(end_exceptions) +#endif ==== //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.154 2007/05/30 14:23:26 des Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.155 2007/12/08 21:13:01 alc Exp $"); #include "opt_cpu.h" @@ -294,7 +294,7 @@ "\030" /* Same */ "\031" /* Same */ "\032FFXSR" /* Fast FXSAVE/FXRSTOR */ - "\033" /* Undefined */ + "\033Page1GB" /* 1-GB large page support */ "\034RDTSCP" /* RDTSCP */ "\035" /* Undefined */ "\036LM" /* 64 bit long mode */ ==== //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#8 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.678 2007/11/15 22:00:57 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.680 2007/12/25 17:51:55 rwatson Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -155,6 +155,10 @@ extern vm_offset_t ksym_start, ksym_end; #endif +/* Intel ICH registers */ +#define ICH_PMBASE 0x400 +#define ICH_SMI_EN ICH_PMBASE + 0x30 + int _udatasel, _ucodesel, _ucode32sel; int cold = 1; @@ -192,6 +196,27 @@ cpu_startup(dummy) void *dummy; { + char *sysenv; + + /* + * On MacBooks, we need to disallow the legacy USB circuit to + * generate an SMI# because this can cause several problems, + * namely: incorrect CPU frequency detection and failure to + * start the APs. + * We do this by disabling a bit in the SMI_EN (SMI Control and + * Enable register) of the Intel ICH LPC Interface Bridge. + */ + sysenv = getenv("smbios.system.product"); + if (sysenv != NULL) { + if (strncmp(sysenv, "MacBook", 7) == 0) { + if (bootverbose) + printf("Disabling LEGACY_USB_EN bit on " + "Intel ICH.\n"); + outl(ICH_SMI_EN, inl(ICH_SMI_EN) & ~0x8); + } + freeenv(sysenv); + } + /* * Good {morning,afternoon,evening,night}. */ @@ -1252,7 +1277,8 @@ #ifdef KDB if (boothowto & RB_KDB) - kdb_enter("Boot flags requested debugger"); + kdb_enter(KDB_WHY_BOOTFLAGS, + "Boot flags requested debugger"); #endif identify_cpu(); /* Final stage of CPU initialization */ ==== //depot/projects/vimage/src/sys/amd64/amd64/mp_watchdog.c#3 (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.5 2007/06/04 23:56:33 jeff Exp $ + * $FreeBSD: src/sys/amd64/amd64/mp_watchdog.c,v 1.6 2007/12/25 17:51:55 rwatson Exp $ */ #include "opt_mp_watchdog.h" @@ -203,7 +203,7 @@ if (watchdog_nmi) watchdog_ipi_nmi(); else - kdb_enter("mp_watchdog"); + kdb_enter(KDB_WHY_WATCHDOG, "mp_watchdog"); } } bcopy(old_pcomm, p->p_comm, MAXCOMLEN + 1); ==== //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#11 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.596 2007/11/30 07:14:42 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.601 2008/01/03 07:34:32 alc Exp $"); /* * Manages physical address maps. @@ -154,7 +154,7 @@ #endif #if !defined(PMAP_DIAGNOSTIC) -#define PMAP_INLINE __inline +#define PMAP_INLINE __gnu89_inline #else #define PMAP_INLINE #endif @@ -422,7 +422,8 @@ if (ndmpdp < 4) /* Minimum 4GB of dirmap */ ndmpdp = 4; DMPDPphys = allocpages(firstaddr, NDMPML4E); - DMPDphys = allocpages(firstaddr, ndmpdp); + if ((amd_feature & AMDID_PAGE1GB) == 0) + DMPDphys = allocpages(firstaddr, ndmpdp); dmaplimit = (vm_paddr_t)ndmpdp << PDPSHIFT; /* Fill in the underlying page table pages */ @@ -448,21 +449,31 @@ /* And connect up the PD to the PDP */ for (i = 0; i < NKPDPE; i++) { - ((pdp_entry_t *)KPDPphys)[i + KPDPI] = KPDphys + (i << PAGE_SHIFT); + ((pdp_entry_t *)KPDPphys)[i + KPDPI] = KPDphys + + (i << PAGE_SHIFT); ((pdp_entry_t *)KPDPphys)[i + KPDPI] |= PG_RW | PG_V | PG_U; } - - /* Now set up the direct map space using 2MB pages */ - for (i = 0; i < NPDEPG * ndmpdp; i++) { - ((pd_entry_t *)DMPDphys)[i] = (vm_paddr_t)i << PDRSHIFT; - ((pd_entry_t *)DMPDphys)[i] |= PG_RW | PG_V | PG_PS | PG_G; - } - - /* And the direct map space's PDP */ - for (i = 0; i < ndmpdp; i++) { - ((pdp_entry_t *)DMPDPphys)[i] = DMPDphys + (i << PAGE_SHIFT); - ((pdp_entry_t *)DMPDPphys)[i] |= PG_RW | PG_V | PG_U; + /* Now set up the direct map space using either 2MB or 1GB pages */ + if ((amd_feature & AMDID_PAGE1GB) == 0) { + for (i = 0; i < NPDEPG * ndmpdp; i++) { + ((pd_entry_t *)DMPDphys)[i] = (vm_paddr_t)i << PDRSHIFT; + ((pd_entry_t *)DMPDphys)[i] |= PG_RW | PG_V | PG_PS | + PG_G; + } + /* And the direct map space's PDP */ + for (i = 0; i < ndmpdp; i++) { + ((pdp_entry_t *)DMPDPphys)[i] = DMPDphys + + (i << PAGE_SHIFT); + ((pdp_entry_t *)DMPDPphys)[i] |= PG_RW | PG_V | PG_U; + } + } else { + for (i = 0; i < ndmpdp; i++) { + ((pdp_entry_t *)DMPDPphys)[i] = + (vm_paddr_t)i << PDPSHIFT; + ((pdp_entry_t *)DMPDPphys)[i] |= PG_RW | PG_V | PG_PS | + PG_G; + } } /* And recursively map PML4 to itself in order to get PTmap */ @@ -1083,7 +1094,7 @@ /*************************************************** * Page table page management routines..... ***************************************************/ -static PMAP_INLINE void +static __inline void pmap_free_zero_pages(vm_page_t free) { vm_page_t m; @@ -1099,7 +1110,7 @@ * This routine unholds page table pages, and if the hold count * drops to zero, then it decrements the wire count. */ -static PMAP_INLINE int +static __inline int pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t *free) { @@ -1430,9 +1441,9 @@ * This supports switching from a 2MB page to a * normal 4K page. */ - if (pd != 0 && (*pd & (PG_PS | PG_V)) == (PG_PS | PG_V)) { + if (pd != NULL && (*pd & (PG_PS | PG_V)) == (PG_PS | PG_V)) { *pd = 0; - pd = 0; + pd = NULL; pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE; free = NULL; pmap_unuse_pt(pmap, va, *pmap_pdpe(pmap, va), &free); @@ -1444,7 +1455,7 @@ * If the page table page is mapped, we just increment the * hold count, and activate it. */ - if (pd != 0 && (*pd & PG_V) != 0) { + if (pd != NULL && (*pd & PG_V) != 0) { m = PHYS_TO_VM_PAGE(*pd & PG_FRAME); m->wire_count++; } else { @@ -1543,7 +1554,7 @@ /* We need a new PDP entry */ nkpg = vm_page_alloc(NULL, nkpt, VM_ALLOC_NOOBJ | VM_ALLOC_SYSTEM | VM_ALLOC_WIRED); - if (!nkpg) + if (nkpg == NULL) panic("pmap_growkernel: no memory to grow kernel"); pmap_zero_page(nkpg); paddr = VM_PAGE_TO_PHYS(nkpg); @@ -1561,12 +1572,9 @@ continue; } - /* - * This index is bogus, but out of the way - */ - nkpg = vm_page_alloc(NULL, nkpt, + nkpg = vm_page_alloc(NULL, pmap_pde_pindex(kernel_vm_end), VM_ALLOC_NOOBJ | VM_ALLOC_SYSTEM | VM_ALLOC_WIRED); - if (!nkpg) + if (nkpg == NULL) panic("pmap_growkernel: no memory to grow kernel"); nkpt++; @@ -2242,8 +2250,8 @@ * insert this page into the given map NOW. */ void -pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, - boolean_t wired) +pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m, + vm_prot_t prot, boolean_t wired) { vm_paddr_t pa; pd_entry_t *pde; ==== //depot/projects/vimage/src/sys/amd64/amd64/trap.c#7 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 14 19:16:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A080916A41A; Mon, 14 Jan 2008 19:16:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 65CC716A418 for ; Mon, 14 Jan 2008 19:16:35 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4C07113C45A for ; Mon, 14 Jan 2008 19:16:35 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0EJGYbj018392 for ; Mon, 14 Jan 2008 19:16:34 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0EJGYuf018387 for perforce@freebsd.org; Mon, 14 Jan 2008 19:16:34 GMT (envelope-from swise@FreeBSD.org) Date: Mon, 14 Jan 2008 19:16:34 GMT Message-Id: <200801141916.m0EJGYuf018387@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 133266 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 19:16:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=133266 Change 133266 by swise@swise:vic10:iwarp on 2008/01/14 19:16:04 Fixed iwch_post_terminate(). - set sgl and sgllen correctly - allocate pkthdr mbuf. Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_qp.c#4 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_qp.c#4 (text+ko) ==== @@ -665,7 +665,7 @@ struct mbuf *m; PDBG("%s %d\n", __FUNCTION__, __LINE__); - m = m_get(MT_DATA, M_NOWAIT); + m = m_gethdr(MT_DATA, M_NOWAIT); if (!m) { log(LOG_ERR, "%s cannot send TERMINATE!\n", __FUNCTION__); return (-ENOMEM); @@ -685,6 +685,8 @@ wqe->send.wrh.gen_tid_len = cpu_to_be32(V_FW_RIWR_TID(qhp->ep->hwtid)); m_set_priority(m, CPL_PRIORITY_DATA); + m_set_sgl(m, NULL); + m_set_sgllen(m, 0); return cxgb_ofld_send(qhp->rhp->rdev.t3cdev_p, m); } From owner-p4-projects@FreeBSD.ORG Mon Jan 14 20:32:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6610116A41A; Mon, 14 Jan 2008 20:32:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 28FC716A418 for ; Mon, 14 Jan 2008 20:32:00 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0E39413C44B for ; Mon, 14 Jan 2008 20:32:00 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0EKVxA0032852 for ; Mon, 14 Jan 2008 20:32:00 GMT (envelope-from delphij@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0EKVTrh032730 for perforce@freebsd.org; Mon, 14 Jan 2008 20:31:29 GMT (envelope-from delphij@freebsd.org) Date: Mon, 14 Jan 2008 20:31:29 GMT Message-Id: <200801142031.m0EKVTrh032730@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to delphij@freebsd.org using -f From: Xin LI To: Perforce Change Reviews Cc: Subject: PERFORCE change 133272 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 20:32:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=133272 Change 133272 by delphij@charlie on 2008/01/14 20:31:29 IFC Affected files ... .. //depot/projects/delphij_fork/ObsoleteFiles.inc#16 integrate .. //depot/projects/delphij_fork/contrib/cvs/AUTHORS#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/BUGS#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/ChangeLog#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/FAQ#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/FREEBSD-Xlist#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/FREEBSD-upgrade#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/HACKING#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/INSTALL#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/NEWS#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/README#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/TESTS#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/TODO#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/acinclude.m4#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/aclocal.m4#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/config.h.in#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/configure#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/configure.in#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/contrib/ChangeLog#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/contrib/Makefile.am#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/contrib/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/contrib/README#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/contrib/clmerge.in#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/contrib/cln_hist.in#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/contrib/commit_prep.in#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/contrib/cvs2vendor.sh#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/contrib/cvs_acls.html#1 branch .. //depot/projects/delphij_fork/contrib/cvs/contrib/cvs_acls.in#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/contrib/cvscheck.sh#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/contrib/debug_check_log.sh#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/contrib/descend.sh#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/contrib/log.in#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/contrib/log_accum.in#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/contrib/mfpipe.in#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/contrib/pvcs2rcs.in#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/contrib/rcs-to-cvs.sh#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/contrib/rcs2log.sh#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/contrib/rcs2sccs.sh#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/contrib/rcslock.in#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/contrib/sccs2rcs.in#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/diff/ChangeLog#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/diff/Makefile.am#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/diff/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/doc/ChangeLog#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/doc/Makefile.am#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/doc/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/doc/cvs.1#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/doc/cvs.man.footer#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/doc/cvs.man.header#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/doc/cvs.texinfo#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/doc/cvsclient.texi#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/doc/mkman.in#2 delete .. //depot/projects/delphij_fork/contrib/cvs/doc/mkman.pl#1 branch .. //depot/projects/delphij_fork/contrib/cvs/doc/stamp-1#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/doc/stamp-vti#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/doc/version-client.texi#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/doc/version.texi#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/lib/ChangeLog#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/lib/Makefile.am#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/lib/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/lib/fncase.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/lib/getdate#1 branch .. //depot/projects/delphij_fork/contrib/cvs/lib/getpass.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/lib/regex.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/lib/system.h#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/lib/test-getdate.sh#1 branch .. //depot/projects/delphij_fork/contrib/cvs/lib/xtime.h#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/man/ChangeLog#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/man/Makefile.am#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/man/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/man/cvs.1#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/ChangeLog#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/Makefile.am#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/add.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/admin.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/annotate.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/buffer.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/buffer.h#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/checkin.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/checkout.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/classify.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/client.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/client.h#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/commit.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/create_adm.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/cvs.h#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/cvsrc.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/diff.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/edit.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/entries.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/expand_path.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/fileattr.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/filesubr.c#3 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/find_names.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/hardlink.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/hardlink.h#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/hash.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/hash.h#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/history.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/history.h#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/ignore.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/import.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/lock.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/log.c#2 edit .. //depot/projects/delphij_fork/contrib/cvs/src/login.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/logmsg.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/main.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/mkmodules.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/modules.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/myndbm.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/myndbm.h#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/no_diff.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/parseinfo.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/patch.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/rcs.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/rcs.h#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/rcscmds.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/recurse.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/release.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/remove.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/repos.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/root.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/root.h#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/run.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/sanity.sh#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/server.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/server.h#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/stack.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/stack.h#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/status.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/subr.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/tag.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/update.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/vers_ts.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/version.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/watch.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/wrapper.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/zlib.c#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/tools/ChangeLog#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/tools/Makefile.am#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/tools/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/tools/README#2 integrate .. //depot/projects/delphij_fork/contrib/file/ChangeLog#2 integrate .. //depot/projects/delphij_fork/contrib/file/Magdir/acorn#2 integrate .. //depot/projects/delphij_fork/contrib/file/Magdir/animation#2 integrate .. //depot/projects/delphij_fork/contrib/file/Magdir/apple#2 integrate .. //depot/projects/delphij_fork/contrib/file/Magdir/archive#2 integrate .. //depot/projects/delphij_fork/contrib/file/Magdir/audio#2 integrate .. //depot/projects/delphij_fork/contrib/file/Magdir/blender#2 integrate .. //depot/projects/delphij_fork/contrib/file/Magdir/commands#2 integrate .. //depot/projects/delphij_fork/contrib/file/Magdir/console#2 integrate .. //depot/projects/delphij_fork/contrib/file/Magdir/database#2 integrate .. //depot/projects/delphij_fork/contrib/file/Magdir/efi#1 branch .. //depot/projects/delphij_fork/contrib/file/Magdir/elf#2 integrate .. //depot/projects/delphij_fork/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/delphij_fork/contrib/file/Magdir/fortran#1 branch .. //depot/projects/delphij_fork/contrib/file/Magdir/java#2 integrate .. //depot/projects/delphij_fork/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/delphij_fork/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/delphij_fork/contrib/file/Magdir/pdf#2 integrate .. //depot/projects/delphij_fork/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/delphij_fork/contrib/file/Makefile.am#2 integrate .. //depot/projects/delphij_fork/contrib/file/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/file/acinclude.m4#2 integrate .. //depot/projects/delphij_fork/contrib/file/aclocal.m4#2 integrate .. //depot/projects/delphij_fork/contrib/file/apprentice.c#2 integrate .. //depot/projects/delphij_fork/contrib/file/ascmagic.c#2 integrate .. //depot/projects/delphij_fork/contrib/file/compress.c#2 integrate .. //depot/projects/delphij_fork/contrib/file/config.h.in#2 integrate .. //depot/projects/delphij_fork/contrib/file/configure#2 integrate .. //depot/projects/delphij_fork/contrib/file/configure.in#2 integrate .. //depot/projects/delphij_fork/contrib/file/file.c#2 integrate .. //depot/projects/delphij_fork/contrib/file/file.h#2 integrate .. //depot/projects/delphij_fork/contrib/file/file.man#2 integrate .. //depot/projects/delphij_fork/contrib/file/file_opts.h#1 branch .. //depot/projects/delphij_fork/contrib/file/fsmagic.c#2 integrate .. //depot/projects/delphij_fork/contrib/file/funcs.c#2 integrate .. //depot/projects/delphij_fork/contrib/file/install-sh#2 integrate .. //depot/projects/delphij_fork/contrib/file/is_tar.c#2 integrate .. //depot/projects/delphij_fork/contrib/file/libmagic.man#2 integrate .. //depot/projects/delphij_fork/contrib/file/magic.c#2 integrate .. //depot/projects/delphij_fork/contrib/file/magic.h#2 integrate .. //depot/projects/delphij_fork/contrib/file/magic.man#2 integrate .. //depot/projects/delphij_fork/contrib/file/magic.mime#2 integrate .. //depot/projects/delphij_fork/contrib/file/mkinstalldirs#2 integrate .. //depot/projects/delphij_fork/contrib/file/names.h#2 integrate .. //depot/projects/delphij_fork/contrib/file/patchlevel.h#2 integrate .. //depot/projects/delphij_fork/contrib/file/print.c#2 integrate .. //depot/projects/delphij_fork/contrib/file/readelf.c#2 integrate .. //depot/projects/delphij_fork/contrib/file/readelf.h#2 integrate .. //depot/projects/delphij_fork/contrib/file/softmagic.c#2 integrate .. //depot/projects/delphij_fork/contrib/libiberty/cp-demangle.c#1 branch .. //depot/projects/delphij_fork/contrib/top/top.c#2 integrate .. //depot/projects/delphij_fork/crypto/openssl/crypto/engine/eng_cryptodev.c#2 integrate .. //depot/projects/delphij_fork/etc/defaults/periodic.conf#4 integrate .. //depot/projects/delphij_fork/etc/defaults/rc.conf#6 integrate .. //depot/projects/delphij_fork/etc/namedb/named.conf#4 integrate .. //depot/projects/delphij_fork/etc/periodic/daily/460.status-mail-rejects#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/jail#4 integrate .. //depot/projects/delphij_fork/etc/rc.firewall#2 integrate .. //depot/projects/delphij_fork/etc/rc.firewall6#2 integrate .. //depot/projects/delphij_fork/games/fortune/datfiles/fortunes#8 integrate .. //depot/projects/delphij_fork/games/fortune/datfiles/limerick#4 integrate .. //depot/projects/delphij_fork/gnu/usr.bin/Makefile#2 integrate .. //depot/projects/delphij_fork/gnu/usr.bin/cvs/Makefile#2 integrate .. //depot/projects/delphij_fork/gnu/usr.bin/cvs/contrib/Makefile#2 integrate .. //depot/projects/delphij_fork/include/unistd.h#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_read_support_format_tar.c#7 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_read_format_tar.c#3 integrate .. //depot/projects/delphij_fork/lib/libc/gen/Makefile.inc#4 integrate .. //depot/projects/delphij_fork/lib/libc/gen/feature_present.3#1 branch .. //depot/projects/delphij_fork/lib/libc/gen/feature_present.c#1 branch .. //depot/projects/delphij_fork/lib/libc/gen/posixshm.c#2 delete .. //depot/projects/delphij_fork/lib/libc/gen/shm_open.3#2 delete .. //depot/projects/delphij_fork/lib/libc/stdlib/heapsort.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/stdlib/qsort.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/sys/Makefile.inc#4 integrate .. //depot/projects/delphij_fork/lib/libc/sys/shm_open.2#1 branch .. //depot/projects/delphij_fork/lib/libkvm/kvm.c#2 integrate .. //depot/projects/delphij_fork/lib/libmagic/config.h#2 integrate .. //depot/projects/delphij_fork/lib/libthr/thread/thr_sem.c#3 integrate .. //depot/projects/delphij_fork/lib/msun/Makefile#3 integrate .. //depot/projects/delphij_fork/lib/msun/Symbol.map#3 integrate .. //depot/projects/delphij_fork/lib/msun/amd64/Makefile.inc#3 integrate .. //depot/projects/delphij_fork/lib/msun/amd64/s_llrintl.S#1 branch .. //depot/projects/delphij_fork/lib/msun/amd64/s_lrintl.S#1 branch .. //depot/projects/delphij_fork/lib/msun/amd64/s_rintl.S#1 branch .. //depot/projects/delphij_fork/lib/msun/i387/Makefile.inc#3 integrate .. //depot/projects/delphij_fork/lib/msun/i387/s_llrintl.S#1 branch .. //depot/projects/delphij_fork/lib/msun/i387/s_lrintl.S#1 branch .. //depot/projects/delphij_fork/lib/msun/i387/s_rintl.S#1 branch .. //depot/projects/delphij_fork/lib/msun/man/lrint.3#2 integrate .. //depot/projects/delphij_fork/lib/msun/man/rint.3#2 integrate .. //depot/projects/delphij_fork/lib/msun/src/math.h#3 integrate .. //depot/projects/delphij_fork/lib/msun/src/s_csqrt.c#2 integrate .. //depot/projects/delphij_fork/lib/msun/src/s_csqrtf.c#2 integrate .. //depot/projects/delphij_fork/lib/msun/src/s_llrintl.c#1 branch .. //depot/projects/delphij_fork/lib/msun/src/s_lrintl.c#1 branch .. //depot/projects/delphij_fork/lib/msun/src/s_nearbyint.c#2 integrate .. //depot/projects/delphij_fork/lib/msun/src/s_rint.c#2 integrate .. //depot/projects/delphij_fork/lib/msun/src/s_rintl.c#1 branch .. //depot/projects/delphij_fork/sbin/fsck_msdosfs/boot.c#2 integrate .. //depot/projects/delphij_fork/sbin/setkey/parse.y#3 integrate .. //depot/projects/delphij_fork/share/man/man4/ipmi.4#4 integrate .. //depot/projects/delphij_fork/share/man/man4/lagg.4#3 integrate .. //depot/projects/delphij_fork/share/man/man4/ng_pppoe.4#3 integrate .. //depot/projects/delphij_fork/share/man/man4/pci.4#4 integrate .. //depot/projects/delphij_fork/share/man/man4/pcib.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/textdump.4#2 integrate .. //depot/projects/delphij_fork/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/delphij_fork/share/man/man7/bsd.snmpmod.mk.7#2 integrate .. //depot/projects/delphij_fork/share/man/man9/VOP_LOCK.9#3 integrate .. //depot/projects/delphij_fork/share/man/man9/lock.9#3 integrate .. //depot/projects/delphij_fork/share/man/man9/mbuf_tags.9#2 integrate .. //depot/projects/delphij_fork/share/misc/committers-ports.dot#4 integrate .. //depot/projects/delphij_fork/share/misc/committers-src.dot#5 integrate .. //depot/projects/delphij_fork/share/mk/bsd.snmpmod.mk#2 integrate .. //depot/projects/delphij_fork/share/termcap/termcap.src#3 integrate .. //depot/projects/delphij_fork/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/delphij_fork/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/delphij_fork/sys/amd64/include/ieeefp.h#2 integrate .. //depot/projects/delphij_fork/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/delphij_fork/sys/arm/arm/support.S#3 integrate .. //depot/projects/delphij_fork/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/delphij_fork/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/delphij_fork/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/delphij_fork/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/delphij_fork/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/delphij_fork/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/delphij_fork/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/delphij_fork/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/delphij_fork/sys/compat/linux/linux_file.c#5 integrate .. //depot/projects/delphij_fork/sys/compat/linux/linux_getcwd.c#3 integrate .. //depot/projects/delphij_fork/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/delphij_fork/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/delphij_fork/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/delphij_fork/sys/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/delphij_fork/sys/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/delphij_fork/sys/compat/pecoff/imgact_pecoff.c#4 integrate .. //depot/projects/delphij_fork/sys/compat/svr4/imgact_svr4.c#3 integrate .. //depot/projects/delphij_fork/sys/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/delphij_fork/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/delphij_fork/sys/conf/NOTES#15 integrate .. //depot/projects/delphij_fork/sys/conf/files#16 integrate .. //depot/projects/delphij_fork/sys/conf/options#10 integrate .. //depot/projects/delphij_fork/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/delphij_fork/sys/ddb/db_textdump.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/coretemp/coretemp.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/common/cxgb_t3_cpl.h#4 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_adapter.h#9 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_main.c#9 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_multiq.c#1 branch .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_osdep.h#5 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_sge.c#9 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/sys/mvec.h#4 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/fdc/fdc.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/ichwd/ichwd.c#5 integrate .. //depot/projects/delphij_fork/sys/dev/ichwd/ichwd.h#5 integrate .. //depot/projects/delphij_fork/sys/dev/iir/iir.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/md/md.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/ppbus/ppbconf.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/stge/if_stge.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/stge/if_stgereg.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/streams/streams.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/usb/if_rum.c#5 integrate .. //depot/projects/delphij_fork/sys/dev/usb/if_udav.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/usb/if_zyd.c#7 integrate .. //depot/projects/delphij_fork/sys/dev/usb/usbdevs#13 integrate .. //depot/projects/delphij_fork/sys/fs/cd9660/cd9660_lookup.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/delphij_fork/sys/fs/coda/coda_vfsops.c#4 integrate .. //depot/projects/delphij_fork/sys/fs/coda/coda_vnops.c#3 integrate .. //depot/projects/delphij_fork/sys/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/delphij_fork/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/delphij_fork/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate .. //depot/projects/delphij_fork/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/fifofs/fifo_vnops.c#4 integrate .. //depot/projects/delphij_fork/sys/fs/hpfs/hpfs_subr.h#2 integrate .. //depot/projects/delphij_fork/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/delphij_fork/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/msdosfs/msdosfs_lookup.c#5 integrate .. //depot/projects/delphij_fork/sys/fs/msdosfs/msdosfs_vfsops.c#14 integrate .. //depot/projects/delphij_fork/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate .. //depot/projects/delphij_fork/sys/fs/ntfs/ntfs_subr.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/ntfs/ntfs_vfsops.c#5 integrate .. //depot/projects/delphij_fork/sys/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/nullfs/null_subr.c#3 integrate .. //depot/projects/delphij_fork/sys/fs/nullfs/null_vfsops.c#3 integrate .. //depot/projects/delphij_fork/sys/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/delphij_fork/sys/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/nwfs/nwfs_vfsops.c#3 integrate .. //depot/projects/delphij_fork/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/portalfs/portal_vfsops.c#3 integrate .. //depot/projects/delphij_fork/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/procfs/procfs.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/procfs/procfs_map.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate .. //depot/projects/delphij_fork/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/smbfs/smbfs_vfsops.c#3 integrate .. //depot/projects/delphij_fork/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs_subr.c#8 integrate .. //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs_vfsops.c#11 integrate .. //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs_vnops.c#8 integrate .. //depot/projects/delphij_fork/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/delphij_fork/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/unionfs/union_subr.c#4 integrate .. //depot/projects/delphij_fork/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/delphij_fork/sys/fs/unionfs/union_vnops.c#4 integrate .. //depot/projects/delphij_fork/sys/gnu/fs/ext2fs/ext2_lookup.c#2 integrate .. //depot/projects/delphij_fork/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate .. //depot/projects/delphij_fork/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/delphij_fork/sys/gnu/fs/ext2fs/fs.h#2 integrate .. //depot/projects/delphij_fork/sys/gnu/fs/reiserfs/reiserfs_inode.c#2 integrate .. //depot/projects/delphij_fork/sys/gnu/fs/reiserfs/reiserfs_namei.c#2 integrate .. //depot/projects/delphij_fork/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/delphij_fork/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#2 integrate .. //depot/projects/delphij_fork/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate .. //depot/projects/delphij_fork/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/delphij_fork/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate .. //depot/projects/delphij_fork/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/delphij_fork/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/delphij_fork/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/delphij_fork/sys/i386/ibcs2/ibcs2_misc.c#3 integrate .. //depot/projects/delphij_fork/sys/i386/ibcs2/imgact_coff.c#3 integrate .. //depot/projects/delphij_fork/sys/i386/include/ieeefp.h#2 integrate .. //depot/projects/delphij_fork/sys/i386/include/pmap.h#3 integrate .. //depot/projects/delphij_fork/sys/i386/linux/imgact_linux.c#3 integrate .. //depot/projects/delphij_fork/sys/ia64/conf/GENERIC#4 integrate .. //depot/projects/delphij_fork/sys/kern/imgact_aout.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/imgact_elf.c#6 integrate .. //depot/projects/delphij_fork/sys/kern/imgact_gzip.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/init_main.c#7 integrate .. //depot/projects/delphij_fork/sys/kern/init_sysent.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/kern_acct.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/kern_alq.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/kern_event.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/kern_exec.c#9 integrate .. //depot/projects/delphij_fork/sys/kern/kern_exit.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/kern_jail.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/kern_ktrace.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/kern_linker.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/kern_lock.c#6 integrate .. //depot/projects/delphij_fork/sys/kern/kern_proc.c#8 integrate .. //depot/projects/delphij_fork/sys/kern/kern_resource.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/kern_sig.c#6 integrate .. //depot/projects/delphij_fork/sys/kern/kern_synch.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/link_elf.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/link_elf_obj.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/subr_lock.c#6 integrate .. //depot/projects/delphij_fork/sys/kern/sys_generic.c#6 integrate .. //depot/projects/delphij_fork/sys/kern/sys_pipe.c#6 integrate .. //depot/projects/delphij_fork/sys/kern/sys_socket.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/syscalls.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/syscalls.master#5 integrate .. //depot/projects/delphij_fork/sys/kern/systrace_args.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/tty.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/tty_cons.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/uipc_sem.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/uipc_shm.c#1 branch .. //depot/projects/delphij_fork/sys/kern/uipc_syscalls.c#6 integrate .. //depot/projects/delphij_fork/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_acl.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_aio.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_bio.c#7 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_cache.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_default.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_extattr.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_mount.c#10 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_syscalls.c#7 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/vnode_if.src#2 integrate .. //depot/projects/delphij_fork/sys/modules/cxgb/cxgb/Makefile#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/frag6.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet6/icmp6.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6.c#5 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_pcb.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_rmx.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet6/ip6_mroute.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet6/ip6_output.c#5 integrate .. //depot/projects/delphij_fork/sys/netinet6/mld6.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet6/nd6.c#5 integrate .. //depot/projects/delphij_fork/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet6/nd6_rtr.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet6/raw_ip6.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet6/udp6_usrreq.c#9 integrate .. //depot/projects/delphij_fork/sys/nfs4client/nfs4_vfsops.c#3 integrate .. //depot/projects/delphij_fork/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/delphij_fork/sys/nfsclient/nfs_socket.c#4 integrate .. //depot/projects/delphij_fork/sys/nfsclient/nfs_subs.c#3 integrate .. //depot/projects/delphij_fork/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/delphij_fork/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/delphij_fork/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/delphij_fork/sys/nfsserver/nfs_srvsubs.c#5 integrate .. //depot/projects/delphij_fork/sys/opencrypto/cryptodev.c#4 integrate .. //depot/projects/delphij_fork/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/delphij_fork/sys/powerpc/conf/GENERIC#6 integrate .. //depot/projects/delphij_fork/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/delphij_fork/sys/security/audit/audit_bsm_klib.c#3 integrate .. //depot/projects/delphij_fork/sys/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/delphij_fork/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/delphij_fork/sys/security/mac/mac_framework.h#4 integrate .. //depot/projects/delphij_fork/sys/security/mac/mac_policy.h#5 integrate .. //depot/projects/delphij_fork/sys/security/mac/mac_posix_shm.c#1 branch .. //depot/projects/delphij_fork/sys/security/mac/mac_process.c#3 integrate .. //depot/projects/delphij_fork/sys/security/mac/mac_syscalls.c#4 integrate .. //depot/projects/delphij_fork/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/delphij_fork/sys/security/mac_test/mac_test.c#5 integrate .. //depot/projects/delphij_fork/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/delphij_fork/sys/sys/buf.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/fcntl.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/file.h#3 integrate .. //depot/projects/delphij_fork/sys/sys/lockmgr.h#4 integrate .. //depot/projects/delphij_fork/sys/sys/mbuf.h#5 integrate .. //depot/projects/delphij_fork/sys/sys/mman.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/param.h#8 integrate .. //depot/projects/delphij_fork/sys/sys/pmc.h#3 integrate .. //depot/projects/delphij_fork/sys/sys/proc.h#11 integrate .. //depot/projects/delphij_fork/sys/sys/syscall.h#4 integrate .. //depot/projects/delphij_fork/sys/sys/syscall.mk#4 integrate .. //depot/projects/delphij_fork/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/sysproto.h#4 integrate .. //depot/projects/delphij_fork/sys/sys/vnode.h#3 integrate .. //depot/projects/delphij_fork/sys/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/delphij_fork/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/delphij_fork/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/delphij_fork/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/delphij_fork/sys/ufs/ffs/ffs_vnops.c#5 integrate .. //depot/projects/delphij_fork/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/delphij_fork/sys/ufs/ufs/ufs_lookup.c#3 integrate .. //depot/projects/delphij_fork/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/delphij_fork/sys/ufs/ufs/ufs_vnops.c#4 integrate .. //depot/projects/delphij_fork/sys/vm/swap_pager.c#5 integrate .. //depot/projects/delphij_fork/sys/vm/vm_contig.c#5 integrate .. //depot/projects/delphij_fork/sys/vm/vm_kern.c#4 integrate .. //depot/projects/delphij_fork/sys/vm/vm_mmap.c#5 integrate .. //depot/projects/delphij_fork/sys/vm/vm_object.c#6 integrate .. //depot/projects/delphij_fork/sys/vm/vnode_pager.c#5 integrate .. //depot/projects/delphij_fork/tools/regression/lib/msun/test-lrint.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/usr.bin/Makefile#2 integrate .. //depot/projects/delphij_fork/tools/regression/usr.bin/tr/Makefile#1 branch .. //depot/projects/delphij_fork/tools/regression/usr.bin/tr/regress.00.out#1 branch .. //depot/projects/delphij_fork/tools/regression/usr.bin/tr/regress.01.out#1 branch .. //depot/projects/delphij_fork/tools/regression/usr.bin/tr/regress.02.out#1 branch .. //depot/projects/delphij_fork/tools/regression/usr.bin/tr/regress.03.out#1 branch .. //depot/projects/delphij_fork/tools/regression/usr.bin/tr/regress.04.out#1 branch .. //depot/projects/delphij_fork/tools/regression/usr.bin/tr/regress.05.out#1 branch .. //depot/projects/delphij_fork/tools/regression/usr.bin/tr/regress.06.out#1 branch .. //depot/projects/delphij_fork/tools/regression/usr.bin/tr/regress.07.out#1 branch .. //depot/projects/delphij_fork/tools/regression/usr.bin/tr/regress.08.out#1 branch .. //depot/projects/delphij_fork/tools/regression/usr.bin/tr/regress.09.out#1 branch .. //depot/projects/delphij_fork/tools/regression/usr.bin/tr/regress.0a.out#1 branch .. //depot/projects/delphij_fork/tools/regression/usr.bin/tr/regress.0b.out#1 branch .. //depot/projects/delphij_fork/tools/regression/usr.bin/tr/regress.in#1 branch .. //depot/projects/delphij_fork/tools/regression/usr.bin/tr/regress.sh#1 branch .. //depot/projects/delphij_fork/tools/regression/usr.bin/tr/regress.t#1 branch .. //depot/projects/delphij_fork/tools/regression/usr.bin/tr/regress2.in#1 branch .. //depot/projects/delphij_fork/tools/sched/schedgraph.py#4 integrate .. //depot/projects/delphij_fork/tools/tools/nanobsd/nanobsd.sh#4 integrate .. //depot/projects/delphij_fork/usr.bin/file/config.h#2 integrate .. //depot/projects/delphij_fork/usr.bin/kdump/kdump.c#5 integrate .. //depot/projects/delphij_fork/usr.bin/netstat/route.c#4 integrate .. //depot/projects/delphij_fork/usr.bin/systat/ifstat.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/top/machine.c#4 integrate .. //depot/projects/delphij_fork/usr.bin/unzip/Makefile#1 branch .. //depot/projects/delphij_fork/usr.bin/unzip/unzip.1#1 branch .. //depot/projects/delphij_fork/usr.bin/unzip/unzip.c#1 branch .. //depot/projects/delphij_fork/usr.sbin/arp/arp.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/config/main.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/gstat/gstat.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/inetd/inetd.8#2 integrate .. //depot/projects/delphij_fork/usr.sbin/iostat/iostat.c#4 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/add/pkg_add.1#5 integrate .. //depot/projects/delphij_fork/usr.sbin/pmcstat/pmcstat.c#3 integrate .. //depot/user/howardsu/truss/ObsoleteFiles.inc#31 integrate .. //depot/user/howardsu/truss/contrib/cvs/AUTHORS#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/BUGS#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/ChangeLog#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/FAQ#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/FREEBSD-Xlist#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/FREEBSD-upgrade#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/HACKING#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/INSTALL#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/Makefile.in#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/NEWS#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/README#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/TESTS#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/TODO#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/acinclude.m4#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/aclocal.m4#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/config.h.in#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/configure#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/configure.in#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/contrib/ChangeLog#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/contrib/Makefile.am#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/contrib/Makefile.in#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/contrib/README#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/contrib/clmerge.in#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/contrib/cln_hist.in#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/contrib/commit_prep.in#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/contrib/cvs2vendor.sh#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/contrib/cvs_acls.html#1 branch .. //depot/user/howardsu/truss/contrib/cvs/contrib/cvs_acls.in#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/contrib/cvscheck.sh#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/contrib/debug_check_log.sh#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/contrib/descend.sh#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/contrib/log.in#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/contrib/log_accum.in#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/contrib/mfpipe.in#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/contrib/pvcs2rcs.in#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/contrib/rcs-to-cvs.sh#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/contrib/rcs2log.sh#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/contrib/rcs2sccs.sh#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/contrib/rcslock.in#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/contrib/sccs2rcs.in#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/diff/ChangeLog#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/diff/Makefile.am#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/diff/Makefile.in#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/doc/ChangeLog#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/doc/Makefile.am#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/doc/Makefile.in#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/doc/cvs.1#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/doc/cvs.man.footer#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/doc/cvs.man.header#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/doc/cvs.texinfo#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/doc/cvsclient.texi#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/doc/mkman.in#2 delete .. //depot/user/howardsu/truss/contrib/cvs/doc/mkman.pl#1 branch .. //depot/user/howardsu/truss/contrib/cvs/doc/stamp-1#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/doc/stamp-vti#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/doc/version-client.texi#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/doc/version.texi#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/lib/ChangeLog#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/lib/Makefile.am#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/lib/Makefile.in#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/lib/fncase.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/lib/getdate#1 branch .. //depot/user/howardsu/truss/contrib/cvs/lib/getpass.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/lib/regex.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/lib/system.h#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/lib/test-getdate.sh#1 branch .. //depot/user/howardsu/truss/contrib/cvs/lib/xtime.h#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/man/ChangeLog#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/man/Makefile.am#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/man/Makefile.in#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/man/cvs.1#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/ChangeLog#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/Makefile.am#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/Makefile.in#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/add.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/admin.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/annotate.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/buffer.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/buffer.h#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/checkin.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/checkout.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/classify.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/client.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/client.h#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/commit.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/create_adm.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/cvs.h#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/cvsrc.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/diff.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/edit.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/entries.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/expand_path.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/fileattr.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/filesubr.c#3 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/find_names.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/hardlink.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/hardlink.h#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/hash.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/hash.h#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/history.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/history.h#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/ignore.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/import.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/lock.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/log.c#3 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/login.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/logmsg.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/main.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/mkmodules.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/modules.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/myndbm.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/myndbm.h#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/no_diff.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/parseinfo.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/patch.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/rcs.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/rcs.h#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/rcscmds.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/recurse.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/release.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/remove.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/repos.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/root.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/root.h#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/run.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/sanity.sh#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/server.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/server.h#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/stack.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/stack.h#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/status.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/subr.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/tag.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/update.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/vers_ts.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/version.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/watch.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/wrapper.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/zlib.c#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/tools/ChangeLog#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/tools/Makefile.am#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/tools/Makefile.in#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/tools/README#2 integrate .. //depot/user/howardsu/truss/contrib/file/ChangeLog#3 integrate .. //depot/user/howardsu/truss/contrib/file/Magdir/acorn#2 integrate .. //depot/user/howardsu/truss/contrib/file/Magdir/animation#3 integrate .. //depot/user/howardsu/truss/contrib/file/Magdir/apple#2 integrate .. //depot/user/howardsu/truss/contrib/file/Magdir/archive#3 integrate .. //depot/user/howardsu/truss/contrib/file/Magdir/audio#3 integrate .. //depot/user/howardsu/truss/contrib/file/Magdir/blender#2 integrate .. //depot/user/howardsu/truss/contrib/file/Magdir/commands#3 integrate .. //depot/user/howardsu/truss/contrib/file/Magdir/console#3 integrate .. //depot/user/howardsu/truss/contrib/file/Magdir/database#3 integrate .. //depot/user/howardsu/truss/contrib/file/Magdir/efi#1 branch .. //depot/user/howardsu/truss/contrib/file/Magdir/elf#3 integrate .. //depot/user/howardsu/truss/contrib/file/Magdir/filesystems#3 integrate .. //depot/user/howardsu/truss/contrib/file/Magdir/fortran#1 branch .. //depot/user/howardsu/truss/contrib/file/Magdir/java#3 integrate .. //depot/user/howardsu/truss/contrib/file/Magdir/macintosh#2 integrate .. //depot/user/howardsu/truss/contrib/file/Magdir/msdos#3 integrate .. //depot/user/howardsu/truss/contrib/file/Magdir/pdf#2 integrate .. //depot/user/howardsu/truss/contrib/file/Magdir/sgi#2 integrate .. //depot/user/howardsu/truss/contrib/file/Makefile.am#3 integrate .. //depot/user/howardsu/truss/contrib/file/Makefile.in#3 integrate .. //depot/user/howardsu/truss/contrib/file/acinclude.m4#2 integrate .. //depot/user/howardsu/truss/contrib/file/aclocal.m4#2 integrate .. //depot/user/howardsu/truss/contrib/file/apprentice.c#3 integrate .. //depot/user/howardsu/truss/contrib/file/ascmagic.c#3 integrate .. //depot/user/howardsu/truss/contrib/file/compress.c#3 integrate .. //depot/user/howardsu/truss/contrib/file/config.h.in#3 integrate .. //depot/user/howardsu/truss/contrib/file/configure#3 integrate .. //depot/user/howardsu/truss/contrib/file/configure.in#3 integrate .. //depot/user/howardsu/truss/contrib/file/file.c#3 integrate .. //depot/user/howardsu/truss/contrib/file/file.h#3 integrate .. //depot/user/howardsu/truss/contrib/file/file.man#2 integrate .. //depot/user/howardsu/truss/contrib/file/file_opts.h#1 branch .. //depot/user/howardsu/truss/contrib/file/fsmagic.c#3 integrate .. //depot/user/howardsu/truss/contrib/file/funcs.c#3 integrate .. //depot/user/howardsu/truss/contrib/file/install-sh#3 integrate .. //depot/user/howardsu/truss/contrib/file/is_tar.c#3 integrate .. //depot/user/howardsu/truss/contrib/file/libmagic.man#2 integrate .. //depot/user/howardsu/truss/contrib/file/magic.c#3 integrate .. //depot/user/howardsu/truss/contrib/file/magic.h#3 integrate .. //depot/user/howardsu/truss/contrib/file/magic.man#2 integrate .. //depot/user/howardsu/truss/contrib/file/magic.mime#3 integrate .. //depot/user/howardsu/truss/contrib/file/mkinstalldirs#3 integrate .. //depot/user/howardsu/truss/contrib/file/names.h#3 integrate .. //depot/user/howardsu/truss/contrib/file/patchlevel.h#3 integrate .. //depot/user/howardsu/truss/contrib/file/print.c#3 integrate .. //depot/user/howardsu/truss/contrib/file/readelf.c#3 integrate .. //depot/user/howardsu/truss/contrib/file/readelf.h#2 integrate .. //depot/user/howardsu/truss/contrib/file/softmagic.c#3 integrate .. //depot/user/howardsu/truss/contrib/libiberty/cp-demangle.c#1 branch .. //depot/user/howardsu/truss/contrib/top/top.c#6 integrate .. //depot/user/howardsu/truss/crypto/openssl/crypto/engine/eng_cryptodev.c#2 integrate .. //depot/user/howardsu/truss/etc/defaults/periodic.conf#7 integrate .. //depot/user/howardsu/truss/etc/defaults/rc.conf#13 integrate .. //depot/user/howardsu/truss/etc/namedb/named.conf#5 integrate .. //depot/user/howardsu/truss/etc/periodic/daily/460.status-mail-rejects#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/jail#4 integrate .. //depot/user/howardsu/truss/etc/rc.firewall#5 integrate .. //depot/user/howardsu/truss/etc/rc.firewall6#2 integrate .. //depot/user/howardsu/truss/games/fortune/datfiles/fortunes#12 integrate .. //depot/user/howardsu/truss/games/fortune/datfiles/limerick#5 integrate .. //depot/user/howardsu/truss/gnu/usr.bin/Makefile#3 integrate .. //depot/user/howardsu/truss/gnu/usr.bin/cvs/Makefile#2 integrate .. //depot/user/howardsu/truss/gnu/usr.bin/cvs/contrib/Makefile#2 integrate .. //depot/user/howardsu/truss/include/unistd.h#3 integrate .. //depot/user/howardsu/truss/lib/libarchive/archive_read_support_format_tar.c#12 integrate .. //depot/user/howardsu/truss/lib/libarchive/test/test_read_format_tar.c#3 integrate .. //depot/user/howardsu/truss/lib/libc/gen/Makefile.inc#5 integrate .. //depot/user/howardsu/truss/lib/libc/gen/feature_present.3#1 branch .. //depot/user/howardsu/truss/lib/libc/gen/feature_present.c#1 branch .. //depot/user/howardsu/truss/lib/libc/gen/posixshm.c#2 delete .. //depot/user/howardsu/truss/lib/libc/gen/shm_open.3#2 delete .. //depot/user/howardsu/truss/lib/libc/stdlib/heapsort.c#3 integrate .. //depot/user/howardsu/truss/lib/libc/stdlib/qsort.c#3 integrate .. //depot/user/howardsu/truss/lib/libc/sys/Makefile.inc#7 integrate .. //depot/user/howardsu/truss/lib/libc/sys/shm_open.2#1 branch .. //depot/user/howardsu/truss/lib/libkvm/kvm.c#4 integrate .. //depot/user/howardsu/truss/lib/libmagic/config.h#3 integrate .. //depot/user/howardsu/truss/lib/libthr/thread/thr_sem.c#4 integrate .. //depot/user/howardsu/truss/lib/msun/Makefile#6 integrate .. //depot/user/howardsu/truss/lib/msun/Symbol.map#5 integrate .. //depot/user/howardsu/truss/lib/msun/amd64/Makefile.inc#3 integrate .. //depot/user/howardsu/truss/lib/msun/amd64/s_llrintl.S#1 branch .. //depot/user/howardsu/truss/lib/msun/amd64/s_lrintl.S#1 branch .. //depot/user/howardsu/truss/lib/msun/amd64/s_rintl.S#1 branch .. //depot/user/howardsu/truss/lib/msun/i387/Makefile.inc#3 integrate .. //depot/user/howardsu/truss/lib/msun/i387/s_llrintl.S#1 branch .. //depot/user/howardsu/truss/lib/msun/i387/s_lrintl.S#1 branch .. //depot/user/howardsu/truss/lib/msun/i387/s_rintl.S#1 branch .. //depot/user/howardsu/truss/lib/msun/man/lrint.3#2 integrate .. //depot/user/howardsu/truss/lib/msun/man/rint.3#3 integrate .. //depot/user/howardsu/truss/lib/msun/src/math.h#4 integrate .. //depot/user/howardsu/truss/lib/msun/src/s_csqrt.c#2 integrate .. //depot/user/howardsu/truss/lib/msun/src/s_csqrtf.c#2 integrate .. //depot/user/howardsu/truss/lib/msun/src/s_llrintl.c#1 branch .. //depot/user/howardsu/truss/lib/msun/src/s_lrintl.c#1 branch .. //depot/user/howardsu/truss/lib/msun/src/s_nearbyint.c#2 integrate .. //depot/user/howardsu/truss/lib/msun/src/s_rint.c#2 integrate .. //depot/user/howardsu/truss/lib/msun/src/s_rintl.c#1 branch .. //depot/user/howardsu/truss/sbin/fsck_msdosfs/boot.c#2 integrate .. //depot/user/howardsu/truss/sbin/setkey/parse.y#4 integrate .. //depot/user/howardsu/truss/share/man/man4/ipmi.4#5 integrate .. //depot/user/howardsu/truss/share/man/man4/lagg.4#3 integrate .. //depot/user/howardsu/truss/share/man/man4/ng_pppoe.4#4 integrate .. //depot/user/howardsu/truss/share/man/man4/pci.4#5 integrate .. //depot/user/howardsu/truss/share/man/man4/pcib.4#2 integrate .. //depot/user/howardsu/truss/share/man/man4/textdump.4#2 integrate .. //depot/user/howardsu/truss/share/man/man5/rc.conf.5#10 integrate .. //depot/user/howardsu/truss/share/man/man7/bsd.snmpmod.mk.7#2 integrate .. //depot/user/howardsu/truss/share/man/man9/VOP_LOCK.9#3 integrate .. //depot/user/howardsu/truss/share/man/man9/lock.9#6 integrate .. //depot/user/howardsu/truss/share/man/man9/mbuf_tags.9#2 integrate .. //depot/user/howardsu/truss/share/misc/committers-ports.dot#14 integrate .. //depot/user/howardsu/truss/share/misc/committers-src.dot#12 integrate .. //depot/user/howardsu/truss/share/mk/bsd.snmpmod.mk#2 integrate .. //depot/user/howardsu/truss/share/termcap/termcap.src#3 integrate .. //depot/user/howardsu/truss/sys/amd64/amd64/pmap.c#16 integrate .. //depot/user/howardsu/truss/sys/amd64/conf/GENERIC#14 integrate .. //depot/user/howardsu/truss/sys/amd64/include/ieeefp.h#2 integrate .. //depot/user/howardsu/truss/sys/amd64/include/pmap.h#3 integrate .. //depot/user/howardsu/truss/sys/arm/arm/support.S#4 integrate .. //depot/user/howardsu/truss/sys/arm/at91/if_ate.c#6 integrate .. //depot/user/howardsu/truss/sys/cam/scsi/scsi_da.c#15 integrate .. //depot/user/howardsu/truss/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/user/howardsu/truss/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/user/howardsu/truss/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/user/howardsu/truss/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/user/howardsu/truss/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/user/howardsu/truss/sys/compat/linprocfs/linprocfs.c#13 integrate .. //depot/user/howardsu/truss/sys/compat/linux/linux_file.c#9 integrate .. //depot/user/howardsu/truss/sys/compat/linux/linux_getcwd.c#4 integrate .. //depot/user/howardsu/truss/sys/compat/linux/linux_misc.c#8 integrate .. //depot/user/howardsu/truss/sys/compat/ndis/subr_ndis.c#5 integrate .. //depot/user/howardsu/truss/sys/compat/opensolaris/kern/opensolaris_kobj.c#5 integrate .. //depot/user/howardsu/truss/sys/compat/opensolaris/kern/opensolaris_vfs.c#8 integrate .. //depot/user/howardsu/truss/sys/compat/opensolaris/sys/vnode.h#4 integrate .. //depot/user/howardsu/truss/sys/compat/pecoff/imgact_pecoff.c#4 integrate .. //depot/user/howardsu/truss/sys/compat/svr4/imgact_svr4.c#3 integrate .. //depot/user/howardsu/truss/sys/compat/svr4/svr4_fcntl.c#5 integrate .. //depot/user/howardsu/truss/sys/compat/svr4/svr4_misc.c#8 integrate .. //depot/user/howardsu/truss/sys/conf/NOTES#36 integrate .. //depot/user/howardsu/truss/sys/conf/files#41 integrate .. //depot/user/howardsu/truss/sys/conf/options#26 integrate .. //depot/user/howardsu/truss/sys/contrib/dev/acpica/evgpe.c#3 integrate .. //depot/user/howardsu/truss/sys/contrib/opensolaris/uts/common/fs/gfs.c#4 integrate .. //depot/user/howardsu/truss/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 integrate .. //depot/user/howardsu/truss/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#4 integrate .. //depot/user/howardsu/truss/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#10 integrate .. //depot/user/howardsu/truss/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 integrate .. //depot/user/howardsu/truss/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#8 integrate .. //depot/user/howardsu/truss/sys/ddb/db_textdump.c#2 integrate .. //depot/user/howardsu/truss/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate .. //depot/user/howardsu/truss/sys/dev/coretemp/coretemp.c#4 integrate .. //depot/user/howardsu/truss/sys/dev/cxgb/common/cxgb_t3_cpl.h#6 integrate .. //depot/user/howardsu/truss/sys/dev/cxgb/cxgb_adapter.h#13 integrate .. //depot/user/howardsu/truss/sys/dev/cxgb/cxgb_main.c#15 integrate .. //depot/user/howardsu/truss/sys/dev/cxgb/cxgb_multiq.c#1 branch .. //depot/user/howardsu/truss/sys/dev/cxgb/cxgb_osdep.h#8 integrate .. //depot/user/howardsu/truss/sys/dev/cxgb/cxgb_sge.c#17 integrate .. //depot/user/howardsu/truss/sys/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/user/howardsu/truss/sys/dev/cxgb/sys/mvec.h#6 integrate .. //depot/user/howardsu/truss/sys/dev/cxgb/sys/uipc_mvec.c#7 integrate .. //depot/user/howardsu/truss/sys/dev/fdc/fdc.c#4 integrate .. //depot/user/howardsu/truss/sys/dev/hwpmc/hwpmc_mod.c#6 integrate .. //depot/user/howardsu/truss/sys/dev/ichwd/ichwd.c#7 integrate .. //depot/user/howardsu/truss/sys/dev/ichwd/ichwd.h#5 integrate .. //depot/user/howardsu/truss/sys/dev/iir/iir.c#5 integrate .. //depot/user/howardsu/truss/sys/dev/md/md.c#6 integrate .. //depot/user/howardsu/truss/sys/dev/ppbus/ppbconf.c#3 integrate .. //depot/user/howardsu/truss/sys/dev/ppbus/ppbconf.h#2 integrate .. //depot/user/howardsu/truss/sys/dev/puc/pucdata.c#3 integrate .. //depot/user/howardsu/truss/sys/dev/stge/if_stge.c#5 integrate .. //depot/user/howardsu/truss/sys/dev/stge/if_stgereg.h#3 integrate .. //depot/user/howardsu/truss/sys/dev/streams/streams.c#5 integrate .. //depot/user/howardsu/truss/sys/dev/usb/ehci.c#7 integrate .. //depot/user/howardsu/truss/sys/dev/usb/if_rum.c#10 integrate .. //depot/user/howardsu/truss/sys/dev/usb/if_udav.c#9 integrate .. //depot/user/howardsu/truss/sys/dev/usb/if_zyd.c#6 integrate .. //depot/user/howardsu/truss/sys/dev/usb/usbdevs#23 integrate .. //depot/user/howardsu/truss/sys/fs/cd9660/cd9660_lookup.c#2 integrate .. //depot/user/howardsu/truss/sys/fs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/user/howardsu/truss/sys/fs/coda/coda_vfsops.c#4 integrate .. //depot/user/howardsu/truss/sys/fs/coda/coda_vnops.c#3 integrate .. //depot/user/howardsu/truss/sys/fs/devfs/devfs_devs.c#5 integrate .. //depot/user/howardsu/truss/sys/fs/devfs/devfs_vfsops.c#3 integrate .. //depot/user/howardsu/truss/sys/fs/devfs/devfs_vnops.c#13 integrate .. //depot/user/howardsu/truss/sys/fs/fdescfs/fdesc_vfsops.c#4 integrate .. //depot/user/howardsu/truss/sys/fs/fdescfs/fdesc_vnops.c#4 integrate .. //depot/user/howardsu/truss/sys/fs/fifofs/fifo_vnops.c#7 integrate .. //depot/user/howardsu/truss/sys/fs/hpfs/hpfs_subr.h#2 integrate .. //depot/user/howardsu/truss/sys/fs/hpfs/hpfs_vfsops.c#4 integrate .. //depot/user/howardsu/truss/sys/fs/hpfs/hpfs_vnops.c#3 integrate .. //depot/user/howardsu/truss/sys/fs/msdosfs/msdosfs_lookup.c#5 integrate .. //depot/user/howardsu/truss/sys/fs/msdosfs/msdosfs_vfsops.c#12 integrate .. //depot/user/howardsu/truss/sys/fs/msdosfs/msdosfs_vnops.c#8 integrate .. //depot/user/howardsu/truss/sys/fs/ntfs/ntfs_subr.c#3 integrate .. //depot/user/howardsu/truss/sys/fs/ntfs/ntfs_vfsops.c#6 integrate .. //depot/user/howardsu/truss/sys/fs/ntfs/ntfs_vnops.c#3 integrate .. //depot/user/howardsu/truss/sys/fs/nullfs/null_subr.c#4 integrate .. //depot/user/howardsu/truss/sys/fs/nullfs/null_vfsops.c#6 integrate .. //depot/user/howardsu/truss/sys/fs/nullfs/null_vnops.c#6 integrate .. //depot/user/howardsu/truss/sys/fs/nwfs/nwfs_node.c#3 integrate .. //depot/user/howardsu/truss/sys/fs/nwfs/nwfs_vfsops.c#4 integrate .. //depot/user/howardsu/truss/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/user/howardsu/truss/sys/fs/portalfs/portal_vfsops.c#4 integrate .. //depot/user/howardsu/truss/sys/fs/portalfs/portal_vnops.c#3 integrate .. //depot/user/howardsu/truss/sys/fs/procfs/procfs.c#3 integrate .. //depot/user/howardsu/truss/sys/fs/procfs/procfs_map.c#4 integrate .. //depot/user/howardsu/truss/sys/fs/pseudofs/pseudofs_vncache.c#5 integrate .. //depot/user/howardsu/truss/sys/fs/pseudofs/pseudofs_vnops.c#5 integrate .. //depot/user/howardsu/truss/sys/fs/smbfs/smbfs_io.c#5 integrate .. //depot/user/howardsu/truss/sys/fs/smbfs/smbfs_node.c#5 integrate .. //depot/user/howardsu/truss/sys/fs/smbfs/smbfs_vfsops.c#4 integrate .. //depot/user/howardsu/truss/sys/fs/smbfs/smbfs_vnops.c#4 integrate .. //depot/user/howardsu/truss/sys/fs/tmpfs/tmpfs_subr.c#79 integrate .. //depot/user/howardsu/truss/sys/fs/tmpfs/tmpfs_vfsops.c#57 integrate .. //depot/user/howardsu/truss/sys/fs/tmpfs/tmpfs_vnops.c#77 integrate .. //depot/user/howardsu/truss/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/user/howardsu/truss/sys/fs/udf/udf_vnops.c#4 integrate .. //depot/user/howardsu/truss/sys/fs/unionfs/union_subr.c#8 integrate .. //depot/user/howardsu/truss/sys/fs/unionfs/union_vfsops.c#4 integrate .. //depot/user/howardsu/truss/sys/fs/unionfs/union_vnops.c#7 integrate .. //depot/user/howardsu/truss/sys/gnu/fs/ext2fs/ext2_lookup.c#2 integrate .. //depot/user/howardsu/truss/sys/gnu/fs/ext2fs/ext2_vfsops.c#7 integrate .. //depot/user/howardsu/truss/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate .. //depot/user/howardsu/truss/sys/gnu/fs/ext2fs/fs.h#2 integrate .. //depot/user/howardsu/truss/sys/gnu/fs/reiserfs/reiserfs_inode.c#3 integrate .. //depot/user/howardsu/truss/sys/gnu/fs/reiserfs/reiserfs_namei.c#3 integrate .. //depot/user/howardsu/truss/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#5 integrate .. //depot/user/howardsu/truss/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#3 integrate .. //depot/user/howardsu/truss/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#5 integrate .. //depot/user/howardsu/truss/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#3 integrate .. //depot/user/howardsu/truss/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate .. //depot/user/howardsu/truss/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#3 integrate .. //depot/user/howardsu/truss/sys/i386/conf/GENERIC#15 integrate .. //depot/user/howardsu/truss/sys/i386/i386/pmap.c#15 integrate .. //depot/user/howardsu/truss/sys/i386/ibcs2/ibcs2_misc.c#5 integrate .. //depot/user/howardsu/truss/sys/i386/ibcs2/imgact_coff.c#4 integrate .. //depot/user/howardsu/truss/sys/i386/include/ieeefp.h#2 integrate .. //depot/user/howardsu/truss/sys/i386/include/pmap.h#6 integrate .. //depot/user/howardsu/truss/sys/i386/linux/imgact_linux.c#4 integrate .. //depot/user/howardsu/truss/sys/ia64/conf/GENERIC#8 integrate .. //depot/user/howardsu/truss/sys/kern/imgact_aout.c#3 integrate .. //depot/user/howardsu/truss/sys/kern/imgact_elf.c#8 integrate .. //depot/user/howardsu/truss/sys/kern/imgact_gzip.c#3 integrate .. //depot/user/howardsu/truss/sys/kern/init_main.c#13 integrate .. //depot/user/howardsu/truss/sys/kern/init_sysent.c#5 integrate .. //depot/user/howardsu/truss/sys/kern/kern_acct.c#9 integrate .. //depot/user/howardsu/truss/sys/kern/kern_alq.c#5 integrate .. //depot/user/howardsu/truss/sys/kern/kern_descrip.c#12 integrate .. //depot/user/howardsu/truss/sys/kern/kern_event.c#7 integrate .. //depot/user/howardsu/truss/sys/kern/kern_exec.c#13 integrate .. //depot/user/howardsu/truss/sys/kern/kern_exit.c#9 integrate .. //depot/user/howardsu/truss/sys/kern/kern_jail.c#7 integrate .. //depot/user/howardsu/truss/sys/kern/kern_ktrace.c#10 integrate .. //depot/user/howardsu/truss/sys/kern/kern_linker.c#8 integrate .. //depot/user/howardsu/truss/sys/kern/kern_lock.c#9 integrate .. //depot/user/howardsu/truss/sys/kern/kern_proc.c#13 integrate .. //depot/user/howardsu/truss/sys/kern/kern_resource.c#12 integrate .. //depot/user/howardsu/truss/sys/kern/kern_sig.c#13 integrate .. //depot/user/howardsu/truss/sys/kern/kern_synch.c#10 integrate .. //depot/user/howardsu/truss/sys/kern/link_elf.c#5 integrate .. //depot/user/howardsu/truss/sys/kern/link_elf_obj.c#5 integrate .. //depot/user/howardsu/truss/sys/kern/subr_lock.c#9 integrate .. //depot/user/howardsu/truss/sys/kern/sys_generic.c#9 integrate .. //depot/user/howardsu/truss/sys/kern/sys_pipe.c#7 integrate .. //depot/user/howardsu/truss/sys/kern/sys_socket.c#5 integrate .. //depot/user/howardsu/truss/sys/kern/syscalls.c#5 integrate .. //depot/user/howardsu/truss/sys/kern/syscalls.master#7 integrate .. //depot/user/howardsu/truss/sys/kern/systrace_args.c#6 integrate .. //depot/user/howardsu/truss/sys/kern/tty.c#7 integrate .. //depot/user/howardsu/truss/sys/kern/tty_cons.c#5 integrate .. //depot/user/howardsu/truss/sys/kern/uipc_mqueue.c#9 integrate .. //depot/user/howardsu/truss/sys/kern/uipc_sem.c#4 integrate .. //depot/user/howardsu/truss/sys/kern/uipc_shm.c#1 branch .. //depot/user/howardsu/truss/sys/kern/uipc_syscalls.c#14 integrate .. //depot/user/howardsu/truss/sys/kern/uipc_usrreq.c#10 integrate .. //depot/user/howardsu/truss/sys/kern/vfs_acl.c#3 integrate .. //depot/user/howardsu/truss/sys/kern/vfs_aio.c#7 integrate .. //depot/user/howardsu/truss/sys/kern/vfs_bio.c#13 integrate .. //depot/user/howardsu/truss/sys/kern/vfs_cache.c#9 integrate .. //depot/user/howardsu/truss/sys/kern/vfs_default.c#4 integrate .. //depot/user/howardsu/truss/sys/kern/vfs_extattr.c#3 integrate .. //depot/user/howardsu/truss/sys/kern/vfs_lookup.c#8 integrate .. //depot/user/howardsu/truss/sys/kern/vfs_mount.c#18 integrate .. //depot/user/howardsu/truss/sys/kern/vfs_subr.c#17 integrate .. //depot/user/howardsu/truss/sys/kern/vfs_syscalls.c#12 integrate .. //depot/user/howardsu/truss/sys/kern/vfs_vnops.c#8 integrate .. //depot/user/howardsu/truss/sys/kern/vnode_if.src#5 integrate .. //depot/user/howardsu/truss/sys/modules/cxgb/cxgb/Makefile#2 integrate .. //depot/user/howardsu/truss/sys/netinet6/frag6.c#6 integrate .. //depot/user/howardsu/truss/sys/netinet6/icmp6.c#8 integrate .. //depot/user/howardsu/truss/sys/netinet6/in6.c#8 integrate .. //depot/user/howardsu/truss/sys/netinet6/in6_ifattach.c#8 integrate .. //depot/user/howardsu/truss/sys/netinet6/in6_pcb.c#11 integrate .. //depot/user/howardsu/truss/sys/netinet6/in6_proto.c#9 integrate .. //depot/user/howardsu/truss/sys/netinet6/in6_rmx.c#4 integrate .. //depot/user/howardsu/truss/sys/netinet6/in6_src.c#8 integrate .. //depot/user/howardsu/truss/sys/netinet6/ip6_input.c#8 integrate .. //depot/user/howardsu/truss/sys/netinet6/ip6_mroute.c#5 integrate .. //depot/user/howardsu/truss/sys/netinet6/ip6_output.c#8 integrate .. //depot/user/howardsu/truss/sys/netinet6/mld6.c#5 integrate .. //depot/user/howardsu/truss/sys/netinet6/nd6.c#10 integrate .. //depot/user/howardsu/truss/sys/netinet6/nd6_nbr.c#7 integrate .. //depot/user/howardsu/truss/sys/netinet6/nd6_rtr.c#5 integrate .. //depot/user/howardsu/truss/sys/netinet6/raw_ip6.c#9 integrate .. //depot/user/howardsu/truss/sys/netinet6/udp6_usrreq.c#14 integrate .. //depot/user/howardsu/truss/sys/nfs4client/nfs4_vfsops.c#5 integrate .. //depot/user/howardsu/truss/sys/nfs4client/nfs4_vnops.c#4 integrate .. //depot/user/howardsu/truss/sys/nfsclient/nfs_socket.c#6 integrate .. //depot/user/howardsu/truss/sys/nfsclient/nfs_subs.c#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 14 23:09:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A69216A55A; Mon, 14 Jan 2008 23:09:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D2FD716A473 for ; Mon, 14 Jan 2008 23:09:47 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B9F3513C44B for ; Mon, 14 Jan 2008 23:09:47 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0EN9l78069572 for ; Mon, 14 Jan 2008 23:09:47 GMT (envelope-from andre@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0EN9lF2069569 for perforce@freebsd.org; Mon, 14 Jan 2008 23:09:47 GMT (envelope-from andre@freebsd.org) Date: Mon, 14 Jan 2008 23:09:47 GMT Message-Id: <200801142309.m0EN9lF2069569@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andre@freebsd.org using -f From: Andre Oppermann To: Perforce Change Reviews Cc: Subject: PERFORCE change 133280 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 23:09:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=133280 Change 133280 by andre@andre_flirtbox on 2008/01/14 23:09:09 Change reassembly queue size limiting from number of mbufs to gross mbuf space used in queue. This is more natural as it reflects the actual amount of kernel memory used. It properly accounts for the mbuf storage size, be it normal mbuf, cluster or jumbo mbuf. The upper limit is the remaining space in the socket buffer. This effectively prevents mbuf exhaustion due to pathological traffic (one byte segments with a hole each time) on a single connection. The maximal possible mbuf usage is now equivalent to an unserviced filled up socket buffer. Accounting for the gross mbuf space underestimates the effective free space in the socket buffer vs. actual real data with 2k clusters and 1500 byte packets. This shouldn't be too much of a problem though. This edge case will be solved later when mbuf chain compacting is done. Reassembly specific sysctls are now unused. Update all tcp statistics. Add new statistic for reassembly queue overflows. Affected files ... .. //depot/projects/tcp_reass/netinet/tcp_reass.c#4 edit .. //depot/projects/tcp_reass/netinet/tcp_usrreq.c#3 edit .. //depot/projects/tcp_reass/netinet/tcp_var.h#3 edit Differences ... ==== //depot/projects/tcp_reass/netinet/tcp_reass.c#4 (text+ko) ==== @@ -103,18 +103,20 @@ static int tcp_reass_maxseg = 0; SYSCTL_INT(_net_inet_tcp_reass, OID_AUTO, maxsegments, CTLFLAG_RDTUN, &tcp_reass_maxseg, 0, - "Global maximum number of TCP Segments in Reassembly Queue"); + "Global maximum number of TCP Segment Blocks in Reassembly Queue"); int tcp_reass_qsize = 0; SYSCTL_INT(_net_inet_tcp_reass, OID_AUTO, cursegments, CTLFLAG_RD, &tcp_reass_qsize, 0, - "Global number of TCP Segments currently in Reassembly Queue"); + "Global number of TCP Segment Blocks currently in Reassembly Queue"); +/* XXX: unused. */ static int tcp_reass_maxqlen = 48; SYSCTL_INT(_net_inet_tcp_reass, OID_AUTO, maxqlen, CTLFLAG_RW, &tcp_reass_maxqlen, 0, "Maximum number of TCP Segments per individual Reassembly Queue"); +/* XXX: unused, moved to tcpstat. */ static int tcp_reass_overflows = 0; SYSCTL_INT(_net_inet_tcp_reass, OID_AUTO, overflows, CTLFLAG_RD, &tcp_reass_overflows, 0, @@ -135,6 +137,7 @@ tcp_reass_init(void) { + /* XXX: nmbclusters may be zero. */ tcp_reass_maxseg = nmbclusters / 16; TUNABLE_INT_FETCH("net.inet.tcp.reass.maxsegments", &tcp_reass_maxseg); @@ -151,7 +154,7 @@ struct trq *tqe, *tqen; struct socket *so = tp->t_inpcb->inp_socket; struct mbuf *n; - int i, flags = 0, segs = 0; + int i, flags = 0, mcnt = 0; INP_LOCK_ASSERT(tp->t_inpcb); @@ -162,31 +165,39 @@ if (th == NULL) goto present; + KASSERT(SEQ_LEQ(tp->rcv_nxt, th->th_seq), + ("%s: sequence number below rcv_nxt", __func__)); + /* * Limit the number of segments in the reassembly queue to prevent * holding on to too many segments (and thus running out of mbufs). * Make sure to let the missing segment through which caused this - * queue. Always keep one global queue entry spare to be able to - * process the missing segment. + * queue. + * Count the gross space used by the mbufs in the reassembly queue + * and limit it to the free space in the socket buffer. This way + * the reassembly queue can never consume more mbuf space than the + * socket buffer got allocated anyway and it reflects the actual + * amount of kernel memory used. This effectively prevents mbuf + * exhaustion due to pathological traffic (one byte segments with + * a hole each time) on a single connection. + * Counting the gross mbuf space effectively sets the net data + * limit lower than the socket buffer would allow. + * It underestimates the effective free space in the socket buffer + * vs. actual real data with 2k clusters and 1500 byte packets. + * This shouldn't be too much of a problem though. */ if (th->th_seq != tp->rcv_nxt && - (tcp_reass_qsize + 1 >= tcp_reass_maxseg || - tp->t_trqlen >= tcp_reass_maxqlen)) { - tcp_reass_overflows++; + tp->t_trqmcnt > sbspace(&so->so_rcv)) { + tcpstat.tcps_rcvreassoverflow++; tcpstat.tcps_rcvmemdrop++; m_freem(m); *tlenp = 0; return (0); } - /* Accounting. */ - tcpstat.tcps_rcvoopack++; - tcpstat.tcps_rcvoobyte += *tlenp; /* NB: m_adj(m, -i) may free mbufs at the tail of a chain. */ for (n = m; n; n = n->m_next) - segs++; - tp->t_trqlen += segs; - tcp_reass_qsize += segs; + mcnt += (n->m_flags & M_EXT) ? n->m_ext.ext_size : MSIZE; /* Get rid of packet header and mtags. */ m_demote(m, 1); @@ -195,9 +206,13 @@ tqe = TAILQ_LAST(&tp->t_trq, trq_head); if (tqe && tqe->trq_seq + tqe->trq_len == th->th_seq) { tqe->trq_len += *tlenp; - tqe->trq_segs += segs; + tqe->trq_mcnt += mcnt; + tp->t_trqmcnt += mcnt; tqe->trq_ml->m_next = m; tqe->trq_ml = m_last(m); + /* TCP statistics. */ + tcpstat.tcps_rcvoopack++; + tcpstat.tcps_rcvoobyte += *tlenp; return (0); } @@ -207,24 +222,24 @@ KASSERT(tqe != NULL, ("%s: missing segment but nothing in queue", __func__)); KASSERT(SEQ_GT(tqe->trq_seq, th->th_seq), - ("%s: first block already contains missing segment", __func__)); + ("%s: first block starts below missing segment", __func__)); if (SEQ_LT(tqe->trq_seq, th->th_seq + *tlenp)) { /* Trim tail of segment. */ if ((i = tqe->trq_seq - (th->th_seq + *tlenp))) { m_adj(m, i); - *tlenp -= i; - /* tcpstat */ + *tlenp += i; /* NB: i is negative */ + /* TCP statistics. */ + tcpstat.tcps_rcvpartduppack++; + tcpstat.tcps_rcvpartdupbyte -= i; /* Update accounting. */ - if (segs > 1) { - for (n = m; n; n = n->m_next) - segs--; - tp->t_trqlen -= segs; - tcp_reass_qsize -= segs; - } + for (n = m; n; n = n->m_next) + mcnt += (n->m_flags & M_EXT) ? + n->m_ext.ext_size : MSIZE; } /* Segment prepends first block. */ tqe->trq_len += *tlenp; - tqe->trq_segs += segs; + tqe->trq_mcnt += mcnt; + tp->t_trqmcnt += mcnt; tqe->trq_seq = th->th_seq; n = m_last(m); n->m_next = tqe->trq_m; @@ -234,6 +249,10 @@ goto insert; } + /* TCP statistics. */ + tcpstat.tcps_rcvoopack++; + tcpstat.tcps_rcvoobyte += *tlenp; + /* See where it fits. */ TAILQ_FOREACH(tqe, &tp->t_trq, trq_q) { /* Segment is after this blocks coverage. */ @@ -248,8 +267,6 @@ tcpstat.tcps_rcvduppack++; tcpstat.tcps_rcvdupbyte += *tlenp; m_freem(m); - tp->t_trqlen -= segs; - tcp_reass_qsize -= segs; *tlenp = 0; return (0); } @@ -259,10 +276,14 @@ if ((i = tqe->trq_seq + tqe->trq_len - th->th_seq)) { m_adj(m, i); *tlenp -= i; - /* tcpstat */ + /* TCP Statistics. */ + tcpstat.tcps_rcvpartduppack++; + tcpstat.tcps_rcvpartdupbyte += i; + /* XXX dupes */ } tqe->trq_len += *tlenp; - tqe->trq_segs += segs; + tqe->trq_mcnt += mcnt; + tp->t_trqmcnt += mcnt; tqe->trq_ml->m_next = m; tqe->trq_ml = m_last(m); /* Check if segment bridges two blocks to merge. */ @@ -274,14 +295,17 @@ tqen->trq_seq)) { m_adj(tqen->trq_m, i); tqen->trq_len -= i; - /* tcpstat */ + /* TCP statistics. */ + tcpstat.tcps_rcvpartduppack++; + tcpstat.tcps_rcvpartdupbyte += i; } tqe->trq_len += tqen->trq_len; - tqe->trq_segs += tqen->trq_segs; + tqe->trq_mcnt += tqen->trq_mcnt; tqe->trq_ml->m_next = tqen->trq_m; tqe->trq_ml = tqen->trq_ml; TAILQ_REMOVE(&tp->t_trq, tqen, trq_q); uma_zfree(tcp_reass_zone, tqen); + tcp_reass_qsize--; } return (0); } @@ -290,17 +314,18 @@ /* Trim tail of segment. */ if ((i = tqe->trq_seq - (th->th_seq + *tlenp))) { m_adj(m, i); - *tlenp -= i; + *tlenp += i; /* NB: i is negative */ + /* TCP statistics. */ + tcpstat.tcps_rcvpartduppack++; + tcpstat.tcps_rcvpartdupbyte -= i; /* Update accounting. */ - if (segs > 1) { - for (n = m; n; n = n->m_next) - segs--; - tp->t_trqlen -= segs; - tcp_reass_qsize -= segs; - } + for (n = m; n; n = n->m_next) + mcnt += (n->m_flags & M_EXT) ? + n->m_ext.ext_size : MSIZE; } tqe->trq_len += *tlenp; - tqe->trq_segs += segs; + tqe->trq_mcnt += mcnt; + tp->t_trqmcnt += mcnt; tqe->trq_seq = th->th_seq; n = m_last(m); n->m_next = tqe->trq_m; @@ -318,9 +343,11 @@ *tlenp = 0; return (0); } + tcp_reass_qsize++; tqen->trq_seq = th->th_seq; tqen->trq_len = *tlenp; - tqen->trq_segs = segs; + tqen->trq_mcnt = mcnt; + tp->t_trqmcnt += mcnt; tqen->trq_m = m; tqen->trq_ml = m_last(m); @@ -345,6 +372,7 @@ return (0); SOCKBUF_LOCK(&so->so_rcv); TAILQ_FOREACH_SAFE(tqe, &tp->t_trq, trq_q, tqen) { + /* We can never go more than one round. */ if (tqe->trq_seq != tp->rcv_nxt) break; #if 1 @@ -356,12 +384,10 @@ m_freem(tqe->trq_m); else sbappendstream_locked(&so->so_rcv, tqe->trq_m); - KASSERT(tp->t_trqlen >= tqe->trq_segs, - ("%s: t_trqlen incorrect", __func__)); - tp->t_trqlen -= tqe->trq_segs; - tcp_reass_qsize -= tqe->trq_segs; + tp->t_trqmcnt -= tqe->trq_mcnt; TAILQ_REMOVE(&tp->t_trq, tqe, trq_q); uma_zfree(tcp_reass_zone, tqe); + tcp_reass_qsize--; } /* NB: sorwakeup_locked() does an implicit socket buffer unlock. */ sorwakeup_locked(so); @@ -384,11 +410,11 @@ TAILQ_FOREACH_SAFE(tqe, &tp->t_trq, trq_q, tqen) { m_freem(tqe->trq_m); - KASSERT(tp->t_trqlen >= tqe->trq_segs, - ("%s: t_trqlen incorrect", __func__)); - tp->t_trqlen -= tqe->trq_segs; - tcp_reass_qsize -= tqe->trq_segs; + KASSERT(tp->t_trqmcnt >= tqe->trq_mcnt, + ("%s: t_trqmcnt incorrect", __func__)); + tp->t_trqmcnt -= tqe->trq_mcnt; TAILQ_REMOVE(&tp->t_trq, tqe, trq_q); uma_zfree(tcp_reass_zone, tqe); + tcp_reass_qsize--; } } ==== //depot/projects/tcp_reass/netinet/tcp_usrreq.c#3 (text+ko) ==== @@ -1744,8 +1744,8 @@ indent += 2; db_print_indent(indent); - db_printf("t_segq first: %p t_segqlen: %d t_dupacks: %d\n", - TAILQ_FIRST(&tp->t_trq), tp->t_trqlen, tp->t_dupacks); + db_printf("t_trq first: %p t_trqmcnt: %d t_dupacks: %d\n", + TAILQ_FIRST(&tp->t_trq), tp->t_trqmcnt, tp->t_dupacks); db_print_indent(indent); db_printf("tt_rexmt: %p tt_persist: %p tt_keep: %p\n", ==== //depot/projects/tcp_reass/netinet/tcp_var.h#3 (text+ko) ==== @@ -40,12 +40,12 @@ */ extern int tcp_do_rfc1323; -/* TCP reassembly queue segment entry. */ +/* TCP reassembly queue segment block entry. */ struct trq { TAILQ_ENTRY(trq) trq_q; - tcp_seq trq_seq; /* start of segment */ - int trq_len; /* length of segment */ - int trq_segs; /* number of mbufs */ + tcp_seq trq_seq; /* start of block */ + int trq_len; /* length of block */ + int trq_mcnt; /* gross mbuf size of block */ int trq_flags; /* flags for segment chain */ #define TRQ_FIN 0x01 /* FIN was on last segment */ struct mbuf *trq_m; /* mbuf chain of data */ @@ -97,7 +97,7 @@ */ struct tcpcb { struct trq_head t_trq; /* segment reassembly queue */ - int t_trqlen; /* segment reassembly queue length */ + int t_trqmcnt; /* segment reassembly queue gross usage */ int t_dupacks; /* consecutive dup acks recd */ struct tcp_timer *t_timers; /* All the TCP timers in one struct */ @@ -384,6 +384,7 @@ u_long tcps_rcvpartdupbyte; /* dup. bytes in part-dup. packets */ u_long tcps_rcvoopack; /* out-of-order packets received */ u_long tcps_rcvoobyte; /* out-of-order bytes received */ + u_long tcps_rcvreassoverflow; /* reassembly queue overflows */ u_long tcps_rcvpackafterwin; /* packets with data after window */ u_long tcps_rcvbyteafterwin; /* bytes rcvd after window */ u_long tcps_rcvafterclose; /* packets rcvd after "close" */ From owner-p4-projects@FreeBSD.ORG Mon Jan 14 23:10:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 508C616A740; Mon, 14 Jan 2008 23:10:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1667C16A71D for ; Mon, 14 Jan 2008 23:10:49 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F30BC13C478 for ; Mon, 14 Jan 2008 23:10:48 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0ENAmJq069907 for ; Mon, 14 Jan 2008 23:10:48 GMT (envelope-from andre@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ENAmFA069904 for perforce@freebsd.org; Mon, 14 Jan 2008 23:10:48 GMT (envelope-from andre@freebsd.org) Date: Mon, 14 Jan 2008 23:10:48 GMT Message-Id: <200801142310.m0ENAmFA069904@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andre@freebsd.org using -f From: Andre Oppermann To: Perforce Change Reviews Cc: Subject: PERFORCE change 133281 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 23:10:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=133281 Change 133281 by andre@andre_flirtbox on 2008/01/14 23:10:34 Remove unused sysctls. Affected files ... .. //depot/projects/tcp_reass/netinet/tcp_reass.c#5 edit Differences ... ==== //depot/projects/tcp_reass/netinet/tcp_reass.c#5 (text+ko) ==== @@ -110,18 +110,6 @@ &tcp_reass_qsize, 0, "Global number of TCP Segment Blocks currently in Reassembly Queue"); -/* XXX: unused. */ -static int tcp_reass_maxqlen = 48; -SYSCTL_INT(_net_inet_tcp_reass, OID_AUTO, maxqlen, CTLFLAG_RW, - &tcp_reass_maxqlen, 0, - "Maximum number of TCP Segments per individual Reassembly Queue"); - -/* XXX: unused, moved to tcpstat. */ -static int tcp_reass_overflows = 0; -SYSCTL_INT(_net_inet_tcp_reass, OID_AUTO, overflows, CTLFLAG_RD, - &tcp_reass_overflows, 0, - "Global number of TCP Segment Reassembly Queue Overflows"); - /* Initialize TCP reassembly queue */ static void tcp_reass_zone_change(void *tag) From owner-p4-projects@FreeBSD.ORG Mon Jan 14 23:16:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 71C9616A46B; Mon, 14 Jan 2008 23:16:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3616716A419 for ; Mon, 14 Jan 2008 23:16:56 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1DC6113C459 for ; Mon, 14 Jan 2008 23:16:56 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0ENGumL071114 for ; Mon, 14 Jan 2008 23:16:56 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ENGtOr071111 for perforce@freebsd.org; Mon, 14 Jan 2008 23:16:55 GMT (envelope-from sephe@FreeBSD.org) Date: Mon, 14 Jan 2008 23:16:55 GMT Message-Id: <200801142316.m0ENGtOr071111@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 133282 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 23:16:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=133282 Change 133282 by sephe@sephe_zealot:sam_wifi on 2008/01/14 23:16:28 - Expose ieee80211_{ack_duration,compute_duration,rate2phytype}(), add more assertion in ieee80211_{ack_duration,rate2phytype}() - Use these functions in rt2661 part of ral(4) - Adjust indentation style in ieee80211_phy.h according to the rest of header files in sys/net80211 Affected files ... .. //depot/projects/wifi/sys/dev/ral/rt2661.c#22 edit .. //depot/projects/wifi/sys/net80211/ieee80211_phy.c#5 edit .. //depot/projects/wifi/sys/net80211/ieee80211_phy.h#2 edit Differences ... ==== //depot/projects/wifi/sys/dev/ral/rt2661.c#22 (text) ==== @@ -55,6 +55,7 @@ #include #include #include +#include #include #include @@ -106,11 +107,9 @@ static void rt2661_mcu_beacon_expire(struct rt2661_softc *); static void rt2661_mcu_wakeup(struct rt2661_softc *); static void rt2661_mcu_cmd_intr(struct rt2661_softc *); -static int rt2661_ack_rate(struct ieee80211com *, int); static void rt2661_scan_start(struct ieee80211com *); static void rt2661_scan_end(struct ieee80211com *); static void rt2661_set_channel(struct ieee80211com *); -static uint16_t rt2661_txtime(int, int, uint32_t); static uint8_t rt2661_rxrate(struct rt2661_rx_desc *); static uint8_t rt2661_plcp_signal(int); static void rt2661_setup_tx_desc(struct rt2661_softc *, @@ -1266,14 +1265,6 @@ RAL_UNLOCK(sc); } -/* quickly determine if a given rate is CCK or OFDM */ -#define RAL_RATE_IS_OFDM(rate) ((rate) >= 12 && (rate) != 22) - -#define RAL_ACK_SIZE 14 /* 10 + 4(FCS) */ -#define RAL_CTS_SIZE 14 /* 10 + 4(FCS) */ - -#define RAL_SIFS 10 /* us */ - /* * This function is only used by the Rx radiotap code. It returns the rate at * which a given frame was received. @@ -1306,66 +1297,6 @@ return 2; /* should not get there */ } -/* - * Return the expected ack rate for a frame transmitted at rate `rate'. - * XXX: this should depend on the destination node basic rate set. - */ -static int -rt2661_ack_rate(struct ieee80211com *ic, int rate) -{ - switch (rate) { - /* CCK rates */ - case 2: - return 2; - case 4: - case 11: - case 22: - return (ic->ic_curmode == IEEE80211_MODE_11B) ? 4 : rate; - - /* OFDM rates */ - case 12: - case 18: - return 12; - case 24: - case 36: - return 24; - case 48: - case 72: - case 96: - case 108: - return 48; - } - - /* default to 1Mbps */ - return 2; -} - -/* - * Compute the duration (in us) needed to transmit `len' bytes at rate `rate'. - * The function automatically determines the operating mode depending on the - * given rate. `flags' indicates whether short preamble is in use or not. - */ -static uint16_t -rt2661_txtime(int len, int rate, uint32_t flags) -{ - uint16_t txtime; - - if (RAL_RATE_IS_OFDM(rate)) { - /* IEEE Std 802.11a-1999, pp. 37 */ - txtime = (8 + 4 * len + 3 + rate - 1) / rate; - txtime = 16 + 4 + 4 * txtime + 6; - } else { - /* IEEE Std 802.11b-1999, pp. 28 */ - txtime = (16 * len + rate - 1) / rate; - if (rate != 2 && (flags & IEEE80211_F_SHPREAMBLE)) - txtime += 72 + 24; - else - txtime += 144 + 48; - } - - return txtime; -} - static uint8_t rt2661_plcp_signal(int rate) { @@ -1425,7 +1356,8 @@ desc->plcp_service = 4; len += IEEE80211_CRC_LEN; - if (RAL_RATE_IS_OFDM(rate)) { + if (ieee80211_rate2phytype(ic->ic_curchan->ic_rt, rate) == + IEEE80211_T_OFDM) { desc->flags |= htole32(RT2661_TX_OFDM); plcp_length = len & 0xfff; @@ -1511,8 +1443,8 @@ if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) { flags |= RT2661_TX_NEED_ACK; - dur = rt2661_txtime(RAL_ACK_SIZE, rate, ic->ic_flags) + - RAL_SIFS; + dur = ieee80211_ack_duration(ic->ic_curchan->ic_rt, + rate, ic->ic_flags); *(uint16_t *)wh->i_dur = htole16(dur); /* tell hardware to add timestamp in probe responses */ @@ -1632,16 +1564,17 @@ m0->m_pkthdr.len > ic->ic_rtsthreshold) { struct mbuf *m; uint16_t dur; - int rtsrate, ackrate; + int rtsrate; rtsrate = IEEE80211_IS_CHAN_5GHZ(ic->ic_curchan) ? 12 : 2; - ackrate = rt2661_ack_rate(ic, rate); - dur = rt2661_txtime(m0->m_pkthdr.len + 4, rate, ic->ic_flags) + - rt2661_txtime(RAL_CTS_SIZE, rtsrate, ic->ic_flags) + - /* XXX: noack (QoS)? */ - rt2661_txtime(RAL_ACK_SIZE, ackrate, ic->ic_flags) + - 3 * RAL_SIFS; + dur = ieee80211_ack_duration(ic->ic_curchan->ic_rt, + rtsrate, ic->ic_flags) + + ieee80211_compute_duration(ic->ic_curchan->ic_rt, + m0->m_pkthdr.len + IEEE80211_CRC_LEN, rate, + ic->ic_flags) + + ieee80211_ack_duration(ic->ic_curchan->ic_rt, + rate, ic->ic_flags); m = rt2661_get_rts(sc, wh, dur); @@ -1744,8 +1677,8 @@ if (!noack && !IEEE80211_IS_MULTICAST(wh->i_addr1)) { flags |= RT2661_TX_NEED_ACK; - dur = rt2661_txtime(RAL_ACK_SIZE, rt2661_ack_rate(ic, rate), - ic->ic_flags) + RAL_SIFS; + dur = ieee80211_ack_duration(ic->ic_curchan->ic_rt, rate, + ic->ic_flags); *(uint16_t *)wh->i_dur = htole16(dur); } ==== //depot/projects/wifi/sys/net80211/ieee80211_phy.c#5 (text+ko) ==== @@ -98,8 +98,6 @@ #ifdef notyet uint8_t ieee80211_plcp2rate(uint8_t, int); -enum ieee80211_phytype ieee80211_rate2phytype( - const struct ieee80211_rate_table *, uint8_t rate); uint8_t ieee80211_ack_rate(const struct ieee80211_rate_table *, uint8_t rate); #endif /* notyet */ @@ -236,8 +234,6 @@ #undef XR static void ieee80211_setup_ratetable(struct ieee80211_rate_table *); -static uint16_t ieee80211_compute_duration(const struct ieee80211_rate_table *, - uint32_t frameLen, uint16_t rate, int flags); /* Setup all rate tables */ void @@ -394,12 +390,6 @@ return 0; } -enum ieee80211_phytype -ieee80211_rate2phytype(const struct ieee80211_rate_table *rt, uint8_t rate) -{ - return rt->info[rt->rateCodeToIndex[rate]].phy; -} - uint8_t ieee80211_ack_rate(const struct ieee80211_rate_table *rt, uint8_t rate) { @@ -409,12 +399,45 @@ #endif /* notyet */ +enum ieee80211_phytype +ieee80211_rate2phytype(const struct ieee80211_rate_table *rt, uint8_t rate) +{ + uint8_t rix = rt->rateCodeToIndex[rate]; + + KASSERT(rix != (uint8_t)-1, ("rate %d has no info", rate)); + return rt->info[rix].phy; +} + /* + * Calculate duration field for + * o non-fragment data frames + * o management frames + * sent using rate, phy and short preamble setting. + */ +uint16_t +ieee80211_ack_duration(const struct ieee80211_rate_table *rt, + uint8_t rate, int flags) +{ + uint8_t rix = rt->rateCodeToIndex[rate]; + + KASSERT(rix != (uint8_t)-1, ("rate %d has no info", rate)); + if (flags & IEEE80211_F_SHPREAMBLE) { + KASSERT(rt->info[rix].spAckDuration != 0, + ("shpreamble ack dur is not computed!\n")); + return rt->info[rix].spAckDuration; + } else { + KASSERT(rt->info[rix].lpAckDuration != 0, + ("lgpreamble ack dur is not computed!\n")); + return rt->info[rix].lpAckDuration; + } +} + +/* * Compute the time to transmit a frame of length frameLen bytes * using the specified rate, phy, and short preamble setting. * SIFS is included. */ -static uint16_t +uint16_t ieee80211_compute_duration(const struct ieee80211_rate_table *rt, uint32_t frameLen, uint16_t rate, int flags) { ==== //depot/projects/wifi/sys/net80211/ieee80211_phy.h#2 (text+ko) ==== @@ -33,9 +33,17 @@ struct ieee80211_rate_table; struct ieee80211_channel; +/* Initialization functions */ void ieee80211_phy_init(void); -const struct ieee80211_rate_table * - ieee80211_get_ratetable(struct ieee80211_channel *); +const struct ieee80211_rate_table *ieee80211_get_ratetable( + struct ieee80211_channel *); + +uint16_t ieee80211_ack_duration(const struct ieee80211_rate_table *, + uint8_t, int); +uint16_t ieee80211_compute_duration(const struct ieee80211_rate_table *, + uint32_t, uint16_t, int); +enum ieee80211_phytype ieee80211_rate2phytype( + const struct ieee80211_rate_table *, uint8_t); #endif /* _KERNEL */ From owner-p4-projects@FreeBSD.ORG Mon Jan 14 23:38:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51AEC16A468; Mon, 14 Jan 2008 23:38:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EF82A16A418 for ; Mon, 14 Jan 2008 23:38:18 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D7C0613C468 for ; Mon, 14 Jan 2008 23:38:18 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0ENcISx074151 for ; Mon, 14 Jan 2008 23:38:18 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ENcISN074148 for perforce@freebsd.org; Mon, 14 Jan 2008 23:38:18 GMT (envelope-from sephe@FreeBSD.org) Date: Mon, 14 Jan 2008 23:38:18 GMT Message-Id: <200801142338.m0ENcISN074148@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 133285 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 23:38:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=133285 Change 133285 by sephe@sephe_zealot:sam_wifi on 2008/01/14 23:37:36 Pass ieee80211_channel to various ieee80211_phy functions, handy for the callers. Affected files ... .. //depot/projects/wifi/sys/dev/ral/rt2661.c#23 edit .. //depot/projects/wifi/sys/net80211/ieee80211.c#60 edit .. //depot/projects/wifi/sys/net80211/ieee80211_phy.c#6 edit .. //depot/projects/wifi/sys/net80211/ieee80211_phy.h#3 edit Differences ... ==== //depot/projects/wifi/sys/dev/ral/rt2661.c#23 (text) ==== @@ -1356,8 +1356,7 @@ desc->plcp_service = 4; len += IEEE80211_CRC_LEN; - if (ieee80211_rate2phytype(ic->ic_curchan->ic_rt, rate) == - IEEE80211_T_OFDM) { + if (ieee80211_rate2phytype(ic->ic_curchan, rate) == IEEE80211_T_OFDM) { desc->flags |= htole32(RT2661_TX_OFDM); plcp_length = len & 0xfff; @@ -1443,7 +1442,7 @@ if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) { flags |= RT2661_TX_NEED_ACK; - dur = ieee80211_ack_duration(ic->ic_curchan->ic_rt, + dur = ieee80211_ack_duration(ic->ic_curchan, rate, ic->ic_flags); *(uint16_t *)wh->i_dur = htole16(dur); @@ -1568,12 +1567,12 @@ rtsrate = IEEE80211_IS_CHAN_5GHZ(ic->ic_curchan) ? 12 : 2; - dur = ieee80211_ack_duration(ic->ic_curchan->ic_rt, + dur = ieee80211_ack_duration(ic->ic_curchan, rtsrate, ic->ic_flags) - + ieee80211_compute_duration(ic->ic_curchan->ic_rt, + + ieee80211_compute_duration(ic->ic_curchan, m0->m_pkthdr.len + IEEE80211_CRC_LEN, rate, ic->ic_flags) - + ieee80211_ack_duration(ic->ic_curchan->ic_rt, + + ieee80211_ack_duration(ic->ic_curchan, rate, ic->ic_flags); m = rt2661_get_rts(sc, wh, dur); @@ -1677,7 +1676,7 @@ if (!noack && !IEEE80211_IS_MULTICAST(wh->i_addr1)) { flags |= RT2661_TX_NEED_ACK; - dur = ieee80211_ack_duration(ic->ic_curchan->ic_rt, rate, + dur = ieee80211_ack_duration(ic->ic_curchan, rate, ic->ic_flags); *(uint16_t *)wh->i_dur = htole16(dur); } ==== //depot/projects/wifi/sys/net80211/ieee80211.c#60 (text+ko) ==== @@ -183,8 +183,7 @@ if (IEEE80211_IS_CHAN_HTG(c)) setbit(ic->ic_modecaps, IEEE80211_MODE_11NG); - c->ic_rt = ieee80211_get_ratetable(c); - KASSERT(c->ic_rt != NULL, ("no channel rate table\n")); + ieee80211_set_ratetable(c); } /* initialize candidate channels to all available */ memcpy(ic->ic_chan_active, ic->ic_chan_avail, ==== //depot/projects/wifi/sys/net80211/ieee80211_phy.c#6 (text+ko) ==== @@ -234,6 +234,8 @@ #undef XR static void ieee80211_setup_ratetable(struct ieee80211_rate_table *); +static uint16_t ieee80211_compute_dur(const struct ieee80211_rate_table *, + uint32_t, uint16_t, int); /* Setup all rate tables */ void @@ -305,9 +307,9 @@ * current rate, so control rate's reverse lookup entry * has been installed and following call is safe. */ - rt->info[i].lpAckDuration = ieee80211_compute_duration(rt, + rt->info[i].lpAckDuration = ieee80211_compute_dur(rt, WLAN_CTRL_FRAME_SIZE, ctl_rate, 0); - rt->info[i].spAckDuration = ieee80211_compute_duration(rt, + rt->info[i].spAckDuration = ieee80211_compute_dur(rt, WLAN_CTRL_FRAME_SIZE, ctl_rate, IEEE80211_F_SHPREAMBLE); } @@ -315,10 +317,10 @@ #undef N } -const struct ieee80211_rate_table * -ieee80211_get_ratetable(struct ieee80211_channel *c) +void +ieee80211_set_ratetable(struct ieee80211_channel *c) { - struct ieee80211_rate_table *rt; + const struct ieee80211_rate_table *rt; /* XXX HT */ if (IEEE80211_IS_CHAN_HALF(c)) @@ -346,7 +348,7 @@ panic("%s: no rate table for channel; freq %u flags 0x%x\n", __func__, c->ic_freq, c->ic_flags); } - return rt; + c->ic_rt = rt; } #ifdef notyet @@ -400,8 +402,9 @@ #endif /* notyet */ enum ieee80211_phytype -ieee80211_rate2phytype(const struct ieee80211_rate_table *rt, uint8_t rate) +ieee80211_rate2phytype(const struct ieee80211_channel *c, uint8_t rate) { + const struct ieee80211_rate_table *rt = c->ic_rt; uint8_t rix = rt->rateCodeToIndex[rate]; KASSERT(rix != (uint8_t)-1, ("rate %d has no info", rate)); @@ -415,9 +418,10 @@ * sent using rate, phy and short preamble setting. */ uint16_t -ieee80211_ack_duration(const struct ieee80211_rate_table *rt, +ieee80211_ack_duration(const struct ieee80211_channel *c, uint8_t rate, int flags) { + const struct ieee80211_rate_table *rt = c->ic_rt; uint8_t rix = rt->rateCodeToIndex[rate]; KASSERT(rix != (uint8_t)-1, ("rate %d has no info", rate)); @@ -432,13 +436,20 @@ } } +uint16_t +ieee80211_compute_duration(const struct ieee80211_channel *c, + uint32_t frameLen, uint16_t rate, int flags) +{ + return ieee80211_compute_dur(c->ic_rt, frameLen, rate, flags); +} + /* * Compute the time to transmit a frame of length frameLen bytes * using the specified rate, phy, and short preamble setting. * SIFS is included. */ -uint16_t -ieee80211_compute_duration(const struct ieee80211_rate_table *rt, +static uint16_t +ieee80211_compute_dur(const struct ieee80211_rate_table *rt, uint32_t frameLen, uint16_t rate, int flags) { uint8_t rix = rt->rateCodeToIndex[rate]; ==== //depot/projects/wifi/sys/net80211/ieee80211_phy.h#3 (text+ko) ==== @@ -30,20 +30,18 @@ #ifdef _KERNEL -struct ieee80211_rate_table; struct ieee80211_channel; /* Initialization functions */ void ieee80211_phy_init(void); -const struct ieee80211_rate_table *ieee80211_get_ratetable( - struct ieee80211_channel *); +void ieee80211_set_ratetable(struct ieee80211_channel *); -uint16_t ieee80211_ack_duration(const struct ieee80211_rate_table *, +uint16_t ieee80211_ack_duration(const struct ieee80211_channel *, uint8_t, int); -uint16_t ieee80211_compute_duration(const struct ieee80211_rate_table *, +uint16_t ieee80211_compute_duration(const struct ieee80211_channel *, uint32_t, uint16_t, int); enum ieee80211_phytype ieee80211_rate2phytype( - const struct ieee80211_rate_table *, uint8_t); + const struct ieee80211_channel *, uint8_t); #endif /* _KERNEL */ From owner-p4-projects@FreeBSD.ORG Mon Jan 14 23:45:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11EA616A418; Mon, 14 Jan 2008 23:45:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA90316A420 for ; Mon, 14 Jan 2008 23:45:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 92DD913C45B for ; Mon, 14 Jan 2008 23:45:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0ENjQiE075494 for ; Mon, 14 Jan 2008 23:45:26 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ENjQhG075491 for perforce@freebsd.org; Mon, 14 Jan 2008 23:45:26 GMT (envelope-from sam@freebsd.org) Date: Mon, 14 Jan 2008 23:45:26 GMT Message-Id: <200801142345.m0ENjQhG075491@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133287 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 23:45:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=133287 Change 133287 by sam@sam_ebb on 2008/01/14 23:44:51 use per-vap tx seq# space for beacon+probe respones frames; will need this also for buffered mcast frames but those aren't visible to net80211 just now Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_output.c#21 edit .. //depot/projects/vap/sys/net80211/ieee80211_var.h#23 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_output.c#21 (text+ko) ==== @@ -392,11 +392,10 @@ const uint8_t bssid[IEEE80211_ADDR_LEN]) { #define WH4(wh) ((struct ieee80211_frame_addr4 *)wh) + struct ieee80211vap *vap = ni->ni_vap; wh->i_fc[0] = IEEE80211_FC0_VERSION_0 | type; if ((type & IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_DATA) { - struct ieee80211vap *vap = ni->ni_vap; - switch (vap->iv_opmode) { case IEEE80211_M_STA: wh->i_fc[1] = IEEE80211_FC1_DIR_TODS; @@ -434,11 +433,18 @@ IEEE80211_ADDR_COPY(wh->i_addr3, bssid); } *(uint16_t *)&wh->i_dur[0] = 0; - /* XXX probe response use per-vap seq#? */ - /* NB: use non-QoS tid */ - *(uint16_t *)&wh->i_seq[0] = - htole16(ni->ni_txseqs[IEEE80211_NONQOS_TID] << IEEE80211_SEQ_SEQ_SHIFT); - ni->ni_txseqs[IEEE80211_NONQOS_TID]++; + if ((type & IEEE80211_FC0_SUBTYPE_MASK) == IEEE80211_FC0_SUBTYPE_PROBE_RESP) { + /* NB: use per-vap seq# space */ + *(uint16_t *)&wh->i_seq[0] = + htole16(vap->iv_txseq << IEEE80211_SEQ_SEQ_SHIFT); + vap->iv_txseq++; + } else { + /* NB: use non-QoS tid */ + *(uint16_t *)&wh->i_seq[0] = + htole16(ni->ni_txseqs[IEEE80211_NONQOS_TID] << + IEEE80211_SEQ_SEQ_SHIFT); + ni->ni_txseqs[IEEE80211_NONQOS_TID]++; + } #undef WH4 } @@ -2413,6 +2419,9 @@ uint16_t capinfo; IEEE80211_LOCK(ic); + *(uint16_t *)&mtod(m, struct ieee80211_frame *)->i_seq[0] = + htole16(vap->iv_txseq << IEEE80211_SEQ_SEQ_SHIFT); + vap->iv_txseq++; /* * Handle 11h channel change when we've reached the count. * We must recalculate the beacon frame contents to account ==== //depot/projects/vap/sys/net80211/ieee80211_var.h#23 (text+ko) ==== @@ -331,8 +331,9 @@ uint16_t iv_sta_assoc; /* stations associated */ uint16_t iv_ps_sta; /* stations in power save */ uint16_t iv_ps_pending; /* ps sta's w/ pending frames */ + uint16_t iv_txseq; /* mcast xmit seq# space */ + uint16_t iv_tim_len; /* ic_tim_bitmap size (bytes) */ uint8_t *iv_tim_bitmap; /* power-save stations w/ data*/ - uint16_t iv_tim_len; /* ic_tim_bitmap size (bytes) */ uint8_t iv_dtim_period; /* DTIM period */ uint8_t iv_dtim_count; /* DTIM count from last bcn */ /* set/unset aid pwrsav state */ From owner-p4-projects@FreeBSD.ORG Mon Jan 14 23:49:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FB0016A420; Mon, 14 Jan 2008 23:49:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 539D316A417 for ; Mon, 14 Jan 2008 23:49:31 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3C1C613C46A for ; Mon, 14 Jan 2008 23:49:31 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0ENnVGN075658 for ; Mon, 14 Jan 2008 23:49:31 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ENnVZC075655 for perforce@freebsd.org; Mon, 14 Jan 2008 23:49:31 GMT (envelope-from sam@freebsd.org) Date: Mon, 14 Jan 2008 23:49:31 GMT Message-Id: <200801142349.m0ENnVZC075655@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133289 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 23:49:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=133289 Change 133289 by sam@sam_ebb on 2008/01/14 23:49:03 make ProbeResp check more conservative Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_output.c#22 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_output.c#22 (text+ko) ==== @@ -392,6 +392,9 @@ const uint8_t bssid[IEEE80211_ADDR_LEN]) { #define WH4(wh) ((struct ieee80211_frame_addr4 *)wh) +#define PROBE_RESP \ + ((IEEE80211_FC0_TYPE_MGT << IEEE80211_FC0_TYPE_SHIFT) | \ + (IEEE80211_FC0_SUBTYPE_PROBE_RESP << IEEE80211_FC0_SUBTYPE_SHIFT)) struct ieee80211vap *vap = ni->ni_vap; wh->i_fc[0] = IEEE80211_FC0_VERSION_0 | type; @@ -433,7 +436,7 @@ IEEE80211_ADDR_COPY(wh->i_addr3, bssid); } *(uint16_t *)&wh->i_dur[0] = 0; - if ((type & IEEE80211_FC0_SUBTYPE_MASK) == IEEE80211_FC0_SUBTYPE_PROBE_RESP) { + if (type == PROBE_RESP) { /* NB: use per-vap seq# space */ *(uint16_t *)&wh->i_seq[0] = htole16(vap->iv_txseq << IEEE80211_SEQ_SEQ_SHIFT); @@ -445,6 +448,7 @@ IEEE80211_SEQ_SEQ_SHIFT); ni->ni_txseqs[IEEE80211_NONQOS_TID]++; } +#undef PROBE_RESP #undef WH4 } From owner-p4-projects@FreeBSD.ORG Tue Jan 15 00:03:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BED5216A41A; Tue, 15 Jan 2008 00:03:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8376816A417 for ; Tue, 15 Jan 2008 00:03:46 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6A6C013C457 for ; Tue, 15 Jan 2008 00:03:46 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0F03kvo079693 for ; Tue, 15 Jan 2008 00:03:46 GMT (envelope-from andre@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0F03k85079690 for perforce@freebsd.org; Tue, 15 Jan 2008 00:03:46 GMT (envelope-from andre@freebsd.org) Date: Tue, 15 Jan 2008 00:03:46 GMT Message-Id: <200801150003.m0F03k85079690@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andre@freebsd.org using -f From: Andre Oppermann To: Perforce Change Reviews Cc: Subject: PERFORCE change 133290 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 00:03:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=133290 Change 133290 by andre@andre_flirtbox on 2008/01/15 00:03:16 Fix mbuf accounting. Affected files ... .. //depot/projects/tcp_reass/netinet/tcp_reass.c#6 edit Differences ... ==== //depot/projects/tcp_reass/netinet/tcp_reass.c#6 (text+ko) ==== @@ -142,7 +142,7 @@ struct trq *tqe, *tqen; struct socket *so = tp->t_inpcb->inp_socket; struct mbuf *n; - int i, flags = 0, mcnt = 0; + int i, flags = 0, mcnt; INP_LOCK_ASSERT(tp->t_inpcb); @@ -184,7 +184,7 @@ } /* NB: m_adj(m, -i) may free mbufs at the tail of a chain. */ - for (n = m; n; n = n->m_next) + for (mcnt = 0, n = m; n; n = n->m_next) mcnt += (n->m_flags & M_EXT) ? n->m_ext.ext_size : MSIZE; /* Get rid of packet header and mtags. */ @@ -220,7 +220,7 @@ tcpstat.tcps_rcvpartduppack++; tcpstat.tcps_rcvpartdupbyte -= i; /* Update accounting. */ - for (n = m; n; n = n->m_next) + for (mcnt = 0, n = m; n; n = n->m_next) mcnt += (n->m_flags & M_EXT) ? n->m_ext.ext_size : MSIZE; } @@ -307,7 +307,7 @@ tcpstat.tcps_rcvpartduppack++; tcpstat.tcps_rcvpartdupbyte -= i; /* Update accounting. */ - for (n = m; n; n = n->m_next) + for (mcnt = 0, n = m; n; n = n->m_next) mcnt += (n->m_flags & M_EXT) ? n->m_ext.ext_size : MSIZE; } From owner-p4-projects@FreeBSD.ORG Tue Jan 15 00:15:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6774816A46E; Tue, 15 Jan 2008 00:15:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 29DE516A4A1 for ; Tue, 15 Jan 2008 00:15:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 08D9A13C46E for ; Tue, 15 Jan 2008 00:15:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0F0F4TK081311 for ; Tue, 15 Jan 2008 00:15:04 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0F0EwQQ081274 for perforce@freebsd.org; Tue, 15 Jan 2008 00:14:58 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Jan 2008 00:14:58 GMT Message-Id: <200801150014.m0F0EwQQ081274@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133291 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 00:15:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=133291 Change 133291 by jb@jb_freebsd1 on 2008/01/15 00:13:59 IFC Affected files ... .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/faq/book.sgml#11 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/Makefile#7 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/book.sgml#8 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#11 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#11 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#8 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#11 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#8 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/porters-handbook/book.sgml#5 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/flyer/flyer.tex#5 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/Makefile#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/Makefile#5 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/Makefile.inc#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/formatting-media/Makefile#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/freebsd-questions/article.sgml#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/greek-language-support/article.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/laptop/Makefile#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/laptop/article.sgml#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/multi-os/Makefile#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/multi-os/article.sgml#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/new-users/Makefile#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/new-users/article.sgml#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/problem-reports/Makefile#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/problem-reports/article.sgml#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng-packages/Makefile#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng-packages/article.sgml#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng-packages/extra.css#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng/Makefile#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng/article.sgml#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng/extra.css#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/Makefile#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/Makefile.inc#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/Makefile#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/appendix.decl#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/audit/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir1.dot#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir2.dot#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir3.dot#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir4.dot#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir5.dot#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/bibliography/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/book.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/boot/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/chapter.decl#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/chapters.ent#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/colophon.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/disks/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/eresources/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/firewalls/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/geom/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/install/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/install/example-dir1.dot#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/install/example-dir2.dot#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/install/example-dir3.dot#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/install/example-dir4.dot#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/install/example-dir5.dot#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/jails/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/mac/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/mail/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/network-servers/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/ports/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/preface/preface.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/security/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/serialcomms/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/txtfiles.ent#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/users/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/vinum/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/virtualization/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/mk/doc.local.mk#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/articles.ent#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/bookinfo.ent#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/books.ent#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/catalog#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/freebsd.ent#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/l10n.ent#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/legalnotice.sgml#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/newsgroups.ent#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/teams.ent#5 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/trademarks.ent#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/trademarks.sgml#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/translators.ent#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/urls.ent#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/share/sgml/freebsd.ent#13 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/faq/book.sgml#7 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/basics/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/install/chapter.sgml#8 integrate .. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#20 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/buildenv#5 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/dologs#5 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/dopackages#7 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/makeindex#5 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/mkbindist#6 integrate .. //depot/projects/dtrace/ports/UPDATING#45 integrate .. //depot/projects/dtrace/src/contrib/file/ChangeLog#5 integrate .. //depot/projects/dtrace/src/contrib/file/Magdir/acorn#4 integrate .. //depot/projects/dtrace/src/contrib/file/Magdir/animation#5 integrate .. //depot/projects/dtrace/src/contrib/file/Magdir/apple#4 integrate .. //depot/projects/dtrace/src/contrib/file/Magdir/archive#5 integrate .. //depot/projects/dtrace/src/contrib/file/Magdir/audio#5 integrate .. //depot/projects/dtrace/src/contrib/file/Magdir/blender#4 integrate .. //depot/projects/dtrace/src/contrib/file/Magdir/commands#5 integrate .. //depot/projects/dtrace/src/contrib/file/Magdir/console#5 integrate .. //depot/projects/dtrace/src/contrib/file/Magdir/database#5 integrate .. //depot/projects/dtrace/src/contrib/file/Magdir/efi#1 branch .. //depot/projects/dtrace/src/contrib/file/Magdir/elf#5 integrate .. //depot/projects/dtrace/src/contrib/file/Magdir/filesystems#5 integrate .. //depot/projects/dtrace/src/contrib/file/Magdir/fortran#1 branch .. //depot/projects/dtrace/src/contrib/file/Magdir/java#5 integrate .. //depot/projects/dtrace/src/contrib/file/Magdir/macintosh#4 integrate .. //depot/projects/dtrace/src/contrib/file/Magdir/msdos#5 integrate .. //depot/projects/dtrace/src/contrib/file/Magdir/pdf#4 integrate .. //depot/projects/dtrace/src/contrib/file/Magdir/sgi#4 integrate .. //depot/projects/dtrace/src/contrib/file/Makefile.am#5 integrate .. //depot/projects/dtrace/src/contrib/file/Makefile.in#5 integrate .. //depot/projects/dtrace/src/contrib/file/acinclude.m4#4 integrate .. //depot/projects/dtrace/src/contrib/file/aclocal.m4#4 integrate .. //depot/projects/dtrace/src/contrib/file/apprentice.c#5 integrate .. //depot/projects/dtrace/src/contrib/file/ascmagic.c#5 integrate .. //depot/projects/dtrace/src/contrib/file/compress.c#5 integrate .. //depot/projects/dtrace/src/contrib/file/config.h.in#5 integrate .. //depot/projects/dtrace/src/contrib/file/configure#5 integrate .. //depot/projects/dtrace/src/contrib/file/configure.in#5 integrate .. //depot/projects/dtrace/src/contrib/file/file.c#5 integrate .. //depot/projects/dtrace/src/contrib/file/file.h#5 integrate .. //depot/projects/dtrace/src/contrib/file/file.man#4 integrate .. //depot/projects/dtrace/src/contrib/file/file_opts.h#1 branch .. //depot/projects/dtrace/src/contrib/file/fsmagic.c#5 integrate .. //depot/projects/dtrace/src/contrib/file/funcs.c#5 integrate .. //depot/projects/dtrace/src/contrib/file/install-sh#5 integrate .. //depot/projects/dtrace/src/contrib/file/is_tar.c#5 integrate .. //depot/projects/dtrace/src/contrib/file/libmagic.man#4 integrate .. //depot/projects/dtrace/src/contrib/file/magic.c#5 integrate .. //depot/projects/dtrace/src/contrib/file/magic.h#5 integrate .. //depot/projects/dtrace/src/contrib/file/magic.man#4 integrate .. //depot/projects/dtrace/src/contrib/file/magic.mime#5 integrate .. //depot/projects/dtrace/src/contrib/file/mkinstalldirs#5 integrate .. //depot/projects/dtrace/src/contrib/file/names.h#5 integrate .. //depot/projects/dtrace/src/contrib/file/patchlevel.h#5 integrate .. //depot/projects/dtrace/src/contrib/file/print.c#5 integrate .. //depot/projects/dtrace/src/contrib/file/readelf.c#5 integrate .. //depot/projects/dtrace/src/contrib/file/readelf.h#4 integrate .. //depot/projects/dtrace/src/contrib/file/softmagic.c#5 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/eng_cryptodev.c#3 integrate .. //depot/projects/dtrace/src/etc/rc.d/jail#7 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/cvs/Makefile#4 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/cvs/contrib/Makefile#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_tar.c#12 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_tar.c#2 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/qsort.c#6 integrate .. //depot/projects/dtrace/src/lib/libmagic/config.h#5 integrate .. //depot/projects/dtrace/src/lib/msun/Makefile#9 integrate .. //depot/projects/dtrace/src/lib/msun/Symbol.map#8 integrate .. //depot/projects/dtrace/src/lib/msun/amd64/Makefile.inc#5 integrate .. //depot/projects/dtrace/src/lib/msun/amd64/s_llrintl.S#1 branch .. //depot/projects/dtrace/src/lib/msun/amd64/s_lrintl.S#1 branch .. //depot/projects/dtrace/src/lib/msun/amd64/s_rintl.S#1 branch .. //depot/projects/dtrace/src/lib/msun/i387/Makefile.inc#6 integrate .. //depot/projects/dtrace/src/lib/msun/i387/s_llrintl.S#1 branch .. //depot/projects/dtrace/src/lib/msun/i387/s_lrintl.S#1 branch .. //depot/projects/dtrace/src/lib/msun/i387/s_rintl.S#1 branch .. //depot/projects/dtrace/src/lib/msun/man/lrint.3#4 integrate .. //depot/projects/dtrace/src/lib/msun/man/rint.3#5 integrate .. //depot/projects/dtrace/src/lib/msun/src/math.h#7 integrate .. //depot/projects/dtrace/src/lib/msun/src/s_llrintl.c#1 branch .. //depot/projects/dtrace/src/lib/msun/src/s_lrintl.c#1 branch .. //depot/projects/dtrace/src/lib/msun/src/s_nearbyint.c#4 integrate .. //depot/projects/dtrace/src/lib/msun/src/s_rint.c#4 integrate .. //depot/projects/dtrace/src/lib/msun/src/s_rintl.c#1 branch .. //depot/projects/dtrace/src/sbin/fsck_msdosfs/boot.c#4 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#32 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_file.c#13 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_misc.c#19 integrate .. //depot/projects/dtrace/src/sys/compat/ndis/subr_ndis.c#7 integrate .. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/dtrace/src/sys/compat/pecoff/imgact_pecoff.c#7 integrate .. //depot/projects/dtrace/src/sys/compat/svr4/imgact_svr4.c#6 integrate .. //depot/projects/dtrace/src/sys/compat/svr4/svr4_fcntl.c#9 integrate .. //depot/projects/dtrace/src/sys/compat/svr4/svr4_misc.c#11 integrate .. //depot/projects/dtrace/src/sys/conf/files#64 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_adapter.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_main.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_osdep.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_sge.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/sys/uipc_mvec.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_mod.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/md/md.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/stge/if_stge.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/stge/if_stgereg.h#4 integrate .. //depot/projects/dtrace/src/sys/fs/cd9660/cd9660_lookup.c#3 integrate .. //depot/projects/dtrace/src/sys/fs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/dtrace/src/sys/fs/coda/coda_vnops.c#3 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs_devs.c#10 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs_vfsops.c#7 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs_vnops.c#16 integrate .. //depot/projects/dtrace/src/sys/fs/fdescfs/fdesc_vnops.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/fifofs/fifo_vnops.c#8 integrate .. //depot/projects/dtrace/src/sys/fs/hpfs/hpfs_vfsops.c#8 integrate .. //depot/projects/dtrace/src/sys/fs/hpfs/hpfs_vnops.c#7 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_lookup.c#7 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vfsops.c#18 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vnops.c#11 integrate .. //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_vfsops.c#9 integrate .. //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_vnops.c#8 integrate .. //depot/projects/dtrace/src/sys/fs/nullfs/null_vfsops.c#8 integrate .. //depot/projects/dtrace/src/sys/fs/nullfs/null_vnops.c#7 integrate .. //depot/projects/dtrace/src/sys/fs/nwfs/nwfs_vfsops.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/nwfs/nwfs_vnops.c#5 integrate .. //depot/projects/dtrace/src/sys/fs/procfs/procfs.c#7 integrate .. //depot/projects/dtrace/src/sys/fs/pseudofs/pseudofs_vncache.c#7 integrate .. //depot/projects/dtrace/src/sys/fs/pseudofs/pseudofs_vnops.c#7 integrate .. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_vfsops.c#7 integrate .. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_vnops.c#8 integrate .. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_vfsops.c#7 integrate .. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_vnops.c#5 integrate .. //depot/projects/dtrace/src/sys/fs/udf/udf_vfsops.c#12 integrate .. //depot/projects/dtrace/src/sys/fs/udf/udf_vnops.c#7 integrate .. //depot/projects/dtrace/src/sys/fs/unionfs/union_subr.c#12 integrate .. //depot/projects/dtrace/src/sys/fs/unionfs/union_vfsops.c#10 integrate .. //depot/projects/dtrace/src/sys/fs/unionfs/union_vnops.c#13 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_lookup.c#5 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#11 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_vnops.c#7 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/fs.h#5 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/reiserfs/reiserfs_inode.c#5 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/reiserfs/reiserfs_namei.c#6 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#8 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#7 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#7 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#5 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#6 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#28 integrate .. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_misc.c#11 integrate .. //depot/projects/dtrace/src/sys/i386/ibcs2/imgact_coff.c#8 integrate .. //depot/projects/dtrace/src/sys/i386/include/pmap.h#12 integrate .. //depot/projects/dtrace/src/sys/i386/linux/imgact_linux.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/imgact_aout.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/imgact_elf.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/imgact_gzip.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/kern_acct.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/kern_alq.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/kern_descrip.c#18 integrate .. //depot/projects/dtrace/src/sys/kern/kern_exec.c#22 integrate .. //depot/projects/dtrace/src/sys/kern/kern_exit.c#15 integrate .. //depot/projects/dtrace/src/sys/kern/kern_jail.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/kern_ktrace.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/kern_linker.c#26 integrate .. //depot/projects/dtrace/src/sys/kern/kern_sig.c#19 integrate .. //depot/projects/dtrace/src/sys/kern/link_elf.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/link_elf_obj.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/tty_cons.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_mqueue.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#21 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_usrreq.c#21 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_acl.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_aio.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_bio.c#17 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_cache.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_default.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_extattr.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_lookup.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#24 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#27 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_syscalls.c#19 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_vnops.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/vnode_if.src#7 integrate .. //depot/projects/dtrace/src/sys/modules/cxgb/cxgb/Makefile#3 integrate .. //depot/projects/dtrace/src/sys/nfs4client/nfs4_vfsops.c#9 integrate .. //depot/projects/dtrace/src/sys/nfs4client/nfs4_vnops.c#8 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_subs.c#9 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#14 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_vnops.c#12 integrate .. //depot/projects/dtrace/src/sys/nfsserver/nfs_serv.c#9 integrate .. //depot/projects/dtrace/src/sys/nfsserver/nfs_srvsubs.c#10 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_arg.c#10 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_syscalls.c#11 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_worker.c#9 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_process.c#10 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_syscalls.c#5 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#32 integrate .. //depot/projects/dtrace/src/sys/sys/pmc.h#6 integrate .. //depot/projects/dtrace/src/sys/sys/vnode.h#11 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_rawread.c#6 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_snapshot.c#13 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_softdep.c#14 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vfsops.c#18 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vnops.c#12 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_extattr.c#7 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_lookup.c#9 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_quota.c#10 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_vnops.c#15 integrate .. //depot/projects/dtrace/src/sys/vm/swap_pager.c#18 integrate .. //depot/projects/dtrace/src/sys/vm/vm_contig.c#12 integrate .. //depot/projects/dtrace/src/sys/vm/vm_object.c#19 integrate .. //depot/projects/dtrace/src/sys/vm/vnode_pager.c#12 integrate .. //depot/projects/dtrace/src/tools/regression/lib/msun/test-lrint.c#4 integrate .. //depot/projects/dtrace/src/tools/regression/usr.bin/Makefile#5 integrate .. //depot/projects/dtrace/src/tools/regression/usr.bin/tr/Makefile#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/tr/regress.00.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/tr/regress.01.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/tr/regress.02.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/tr/regress.03.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/tr/regress.04.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/tr/regress.05.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/tr/regress.06.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/tr/regress.07.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/tr/regress.08.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/tr/regress.09.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/tr/regress.0a.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/tr/regress.0b.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/tr/regress.in#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/tr/regress.sh#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/tr/regress.t#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/tr/regress2.in#1 branch .. //depot/projects/dtrace/src/tools/sched/schedgraph.py#8 integrate .. //depot/projects/dtrace/src/usr.bin/file/config.h#5 integrate .. //depot/projects/dtrace/www/share/sgml/advisories.xml#15 integrate Differences ... ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/faq/book.sgml#11 (text+ko) ==== @@ -2,10 +2,10 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project -$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.78 2007/08/01 08:05:03 jkois Exp $ -$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.602 2007/07/30 19:56:36 jkois Exp $ +$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.79 2008/01/14 08:36:46 miwi Exp $ +$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.604 2008/01/04 20:31:18 jkois Exp $ - basiert auf: 1.805 + basiert auf: 1.807 --> @@ -33,7 +33,7 @@ - $FreeBSDde: de-docproj/books/faq/book.sgml,v 1.602 2007/07/30 19:56:36 jkois Exp $ + $FreeBSDde: de-docproj/books/faq/book.sgml,v 1.604 2008/01/04 20:31:18 jkois Exp $ 1995 @@ -1198,6 +1198,27 @@ + Der Channel ##FreeBSD auf + Freenode + bietet allgemeine Hilfe zu FreeBSD-Themen. Durchschnittlich + sind zu jeden Zeitpunkt etwa 300 Benutzer online. Zwar + werden auch nicht-FreeBSD-spezifische Themen diskutiert, + den Hauptteil der Diskussionen dreht sich aber um die + Lösung der Probleme von FreeBSD-Anwendern. Die + Teilnehmer dieses Channels helfen Ihnen auch bei Fragen + zu elementaren Dingen und zeigen Ihnen auch, wo Sie die + entsprechenden Erklärungen im FreeBSD-Handbuch oder + anderen Ressourcen finden können. Obwohl die + Teilnehmer des Channels über die ganze Welt verstreut + sind, werden alle Diskussionen auf Englisch geführt. + Wollen Sie die Diskussion in Ihrer Sprache führen, + sollten Sie Ihre Frage trotzdem auf Englisch stellen und + danach gegebenfalls einen neuen Channel in der Form + ##freebsd-Ihre_Sprache + erönnen. + + + Der Channel #FreeBSD im DALNET ist in den USA unter irc.dal.net und in Europa @@ -2905,6 +2926,35 @@ zur vorherigen Frage. + + + + Wie kann ich die Delete-Taste in der sh und + csh einsetzen? + + + + Für die Bourne Shell + fügen Sie die folgende Zeile in die Datei + .shrc ein (lesen Sie dazu auch die + Manualpages &man.sh.1; sowie &man.editrc.5;). + + bind ^? ed-delete-next-char # for console +bind ^[[3~ ed-delete-next-char # for xterm + + Für die C Shell nehmen + Sie hingegen die folgende Zeile in die Datei + .cshrc auf (lesen Sie dazu auch die + Manualpage &man.csh.1;). + + bindkey ^? delete-char # for console +bindkey ^[[3~ delete-char # for xterm + + Weitere Informationen zu diesem Thema finden sich auch + hier. + + ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#5 (text+ko) ==== @@ -27,9 +27,9 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml,v 1.7 2007/11/11 21:05:22 miwi Exp $ - $FreeBSDde: de-docproj/books/fdp-primer/sgml-primer/chapter.sgml,v 1.19 2007/11/10 15:58:41 miwi Exp $ - basiert auf: 1.46 + $FreeBSD: doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml,v 1.8 2008/01/14 08:36:46 miwi Exp $ + $FreeBSDde: de-docproj/books/fdp-primer/sgml-primer/chapter.sgml,v 1.20 2007/12/30 13:23:46 miwi Exp $ + basiert auf: 1.47 --> @@ -289,6 +289,43 @@ FreeBSD-Boot-Prozess nicht genau verstehen. + + + Den Videomodus der Konsole anpassen + + Der Standard-Videomodus der FreeBSD-Konsole kann auf jeden + Modus eingestellt werden, der von Ihrer Grafikkarte und Ihrem + Monitor unterstützt wird (beispielsweise 1024x768 oder + 1280x1024). Wollen Sie eine andere Einstellung verwenden, + müssen Sie Ihren Kernel neu kompilieren, nachdem Sie die + zwei folgenden Zeilen in Ihre Kernelkonfigurationsdatei + aufgenommen haben: + + OPTIONS VESA +options SC_PIXEL_MODE + + Nachdem Sie den Kernel mit diesen zwei Optionen neu + kompiliert haben, bestimmen Sie die möglichen + Videomodi mit dem Werkzeug &man.vidcontrol.1;. Um + beispielsweise einer Liste aller unterstützten + Modi zu erhalten, verwenden Sie den folgenden Befehl: + + &prompt.root; vidcontrol -i mode + + Als Ergebnis erhalten Sie eine Liste aller Videomodi, + die von Ihrer Hardware unterstützt werden. Sie wählen + einen neuen Modus aus, indem Sie den entsprechenden Wert + (wiederum als Benutzer root) an + &man.vidcontrol.1; übergeben: + + &prompt.root; vidcontrol MODE_279 + + Um diese Einstellung dauerhaft zu speichern, müssen Sie + die folgende Zeile in die Datei + /etc/rc.conf aufnehmen: + + allscreens_flags="MODE_279" + ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/book.sgml#8 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/book.sgml,v 1.53 2007/05/14 15:54:07 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/book.sgml,v 1.82 2007/05/04 17:06:48 jkois Exp $ - basiert auf: 1.171 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/book.sgml,v 1.54 2008/01/14 08:36:45 miwi Exp $ + $FreeBSDde: de-docproj/books/handbook/book.sgml,v 1.83 2008/01/12 19:53:03 jkois Exp $ + basiert auf: 1.172 --> 2005 2006 2007 + 2008 The FreeBSD German Documentation Project ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#7 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml,v 1.46 2007/08/21 19:09:00 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/config/chapter.sgml,v 1.132 2007/08/19 17:06:21 jkois Exp $ - basiert auf: 1.227 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml,v 1.47 2008/01/14 08:36:46 miwi Exp $ + $FreeBSDde: de-docproj/books/handbook/config/chapter.sgml,v 1.133 2007/12/30 13:35:05 miwi Exp $ + basiert auf: 1.228 --> @@ -479,7 +479,7 @@ utility_enable="YES" - Die neue Methode erleichtert den Umgang mit + Die Methode erleichtert den Umgang mit Kommandozeilenargumenten, bindet Funktionen aus /etc/rc.subr ein, ist kompatibel zum Werkzeug &man.rcorder.8; und lässt sich ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#7 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.31 2007/12/01 17:19:43 miwi Exp $ - $FreeBSDde: de-docproj/books/handbook/desktop/chapter.sgml,v 1.61 2007/12/01 09:08:28 jkois Exp $ - basiert auf: 1.74 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.32 2008/01/14 08:36:47 miwi Exp $ + $FreeBSDde: de-docproj/books/handbook/desktop/chapter.sgml,v 1.62 2008/01/01 10:10:08 jkois Exp $ + basiert auf: 1.75 --> @@ -1055,12 +1055,14 @@ Bei KMyMoney handelt es sich ein Programm zur Verwaltung der persönlichen Finanzen, das - unter KDE entwickelt wird. KMyMoney hat das Ziel, alle + unter KDE entwickelt wird. + KMyMoney hat das Ziel, alle wichtigen Funktionen zu bieten, die auch von kommerziellen Programmen zur Verwaltung der persönlichen Finanzen unterstützt werden. Weiters zählen einfache Benutzung sowie korrekte doppelte Buchführung zu den - herausragenden Fähigkeiten dieses Programms. KMyMoney + herausragenden Fähigkeiten dieses Programms. + KMyMoney unterstützt den Import von Datendateien im Format Quicken Interchange Format (QIF), kann Investionen verfolgen, unterstützt verschiedene ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#11 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.58 2007/10/19 09:56:48 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/disks/chapter.sgml,v 1.156 2007/08/25 20:04:38 jkois Exp $ - basiert auf: 1.277 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.59 2008/01/14 08:36:47 miwi Exp $ + $FreeBSDde: de-docproj/books/handbook/disks/chapter.sgml,v 1.157 2008/01/01 10:22:36 jkois Exp $ + basiert auf: 1.279 --> @@ -3115,27 +3115,12 @@ cp /root/.profile /mnt/root -cp -f /dev/MAKEDEV /mnt/dev -chmod 755 /mnt/dev/MAKEDEV - chmod 500 /mnt/sbin/init chmod 555 /mnt/sbin/fsck /mnt/sbin/mount /mnt/sbin/halt chmod 555 /mnt/bin/sh /mnt/bin/sync chmod 6555 /mnt/sbin/restore # -# Geraetedateien erstellen -# -cd /mnt/dev -./MAKEDEV std -./MAKEDEV da0 -./MAKEDEV da1 -./MAKEDEV da2 -./MAKEDEV sa0 -./MAKEDEV pty0 -cd / - -# # Minimale Dateisystemtabelle erstellen # cat > /mnt/etc/fstab <detach on last close aktiviert: + geli_swap_flags="-e blowfish -l 128 -s 4096 -d" + + Auf Systemen vor &os; 6.2-RELEASE verwenden Sie hingegen + die folgende Zeile: + geli_swap_flags="-a blowfish -l 128 -s 4096 -d" Eine Auflistung möglicher Optionen für den Befehl ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#9 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.10 2007/10/19 09:56:48 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/firewalls/chapter.sgml,v 1.12 2007/10/08 14:48:39 jkois Exp $ - basiert auf: 1.77 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.11 2008/01/14 08:36:47 miwi Exp $ + $FreeBSDde: de-docproj/books/handbook/firewalls/chapter.sgml,v 1.13 2007/12/30 13:31:02 miwi Exp $ + basiert auf: 1.78 --> ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#11 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.60 2007/12/01 17:19:43 miwi Exp $ - $FreeBSDde: de-docproj/books/handbook/mirrors/chapter.sgml,v 1.137 2007/11/09 07:54:27 jkois Exp $ - basiert auf: 1.441 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.61 2008/01/14 08:36:47 miwi Exp $ + $FreeBSDde: de-docproj/books/handbook/mirrors/chapter.sgml,v 1.139 2008/01/12 20:08:56 jkois Exp $ + basiert auf: 1.443 --> @@ -1332,8 +1332,10 @@ doc/el_* doc/es_* doc/fr_* +doc/hu_* doc/it_* doc/ja_* +doc_mn_* doc/nl_* doc/no_* doc/pl_* @@ -2689,6 +2691,25 @@ + + RELENG_7 + + + Der Entwicklungszweig für FreeBSD-7.X, auch als + FreeBSD 7-STABLE bekannt. + + + + + RELENG_7_0 + + + Der Zweig, auf dem sicherheitsrelevante oder kritische + Fehlerbehebungen für FreeBSD 7.0 + durchgeführt werden. + + + RELENG_6 @@ -2698,12 +2719,22 @@ + + RELENG_6_3 + + + Der Zweig, auf dem sicherheitsrelevante oder kritische + Fehlerbehebungen für FreeBSD 6.3 + durchgeführt werden. + + + RELENG_6_2 Der Zweig, auf dem sicherheitsrelevante oder kritische - Fehlerbehebungen für FreeBSD 6.1 + Fehlerbehebungen für FreeBSD 6.2 durchgeführt werden. @@ -2934,6 +2965,22 @@ keine Release-Tags verwendet. + + RELENG_7_0_0_RELEASE + + + FreeBSD 7.0 + + + + + RELENG_6_3_0_RELEASE + + + FreeBSD 6.3 + + + RELENG_6_2_0_RELEASE ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#8 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.42 2007/10/19 09:56:48 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/ports/chapter.sgml,v 1.93 2007/09/03 17:28:41 as Exp $ - basiert auf: 1.268 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.43 2008/01/14 08:36:47 miwi Exp $ + $FreeBSDde: de-docproj/books/handbook/ports/chapter.sgml,v 1.94 2008/01/01 10:35:46 jkois Exp $ + basiert auf: 1.269 --> @@ -1186,6 +1186,31 @@ PREFIX beachten, ist schwierig oder sogar unmöglich. + + + Ports rekonfigurieren + + Beim Bau einiger Ports erhalten Sie ein ncurses-basiertes + Menü, über dessen Optionen Sie den Bau dieser Ports + beeinflussen können. Es gibt diverse Möglichkeiten, + dieses Menü nach dem Bau eines Ports erneut aufzurufen, um + beispielsweise Optionen zu entfernen, hinzuzufügen oder + anzupassen. Sie können beispielsweise in das + Verzeichnis des Ports wechseln und dort den Befehl + make config + eingeben, wodurch das Menü mit den ursprünglichen + gewählten Optionen erneut aufgerufen wird. Eine andere + Möglichkeit bietet der Befehl + make showconfig, + mit dem Sie eine Liste aller Konfigurationsoptionen dieses + Ports aufrufen. Eine weitere Alternative bietet der Befehl + make rmconfig, + der die von Ihnen ursprünglich gewählten Optionen + zurücksetzt und es Ihnen dadurch ermöglicht, die + Konfiguration erneut zu beginnen. Die eben erwähnten + Optionen (und viele andere) werden ausführlich in + der Manualpage &man.ports.7; beschrieben. + ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#11 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml,v 1.52 2007/10/19 09:56:49 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/security/chapter.sgml,v 1.155 2007/10/04 10:35:08 jkois Exp $ - basiert auf: 1.315 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml,v 1.53 2008/01/14 08:36:47 miwi Exp $ + $FreeBSDde: de-docproj/books/handbook/security/chapter.sgml,v 1.156 2007/10/23 09:24:47 jkois Exp $ + basiert auf: 1.316 --> ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#6 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml,v 1.34 2007/02/09 07:20:19 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/serialcomms/chapter.sgml,v 1.69 2007/02/09 06:57:37 jkois Exp $ - basiert auf: 1.119 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml,v 1.35 2008/01/14 08:36:48 miwi Exp $ + $FreeBSDde: de-docproj/books/handbook/serialcomms/chapter.sgml,v 1.71 2007/12/30 15:08:44 miwi Exp $ + basiert auf: 1.120 --> ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#8 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -440,10 +440,21 @@ X11 konfigurieren - X11 wird in mehreren Schritten konfiguriert. - Zuerst müssen Sie eine Vorgabe für die - Konfigurationsdatei erstellen. Setzen Sie dazu als - root den folgenden Befehl ab: + Ab Version 7.3 funktioniert + &xorg; häfig auch, ohne + dass Sie eine eigene Konfigurationsdatei anlegen + müssen. Sie müssen dann nur den folgenden + Befehl eingeben: + + &prompt.user; startx + + Funktioniert dies auf Ihrem System nicht (oder + wollen Sie nicht mit den Standardeinstellungen + arbeiten), müssen Sie X11 weiterhin manuell + konfigurieren. Dazu erstellen Sie als erstes eine + eine Vorgabe für die Konfigurationsdatei. + Setzen Sie dazu als root + den folgenden Befehl ab: &prompt.root; Xorg -configure ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/porters-handbook/book.sgml#5 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/porters-handbook/book.sgml,v 1.4 2007/12/01 17:19:43 miwi Exp $ - $FreeBSDde: de-docproj/books/porters-handbook/book.sgml,v 1.146 2007/11/26 13:16:32 miwi Exp $ - basiert auf: 1.890 + $FreeBSD: doc/de_DE.ISO8859-1/books/porters-handbook/book.sgml,v 1.5 2008/01/14 08:36:48 miwi Exp $ + $FreeBSDde: de-docproj/books/porters-handbook/book.sgml,v 1.148 2008/01/12 20:29:57 jkois Exp $ + basiert auf: 1.895 --> 2005 2006 2007 + 2008 The FreeBSD German Documentation Project @@ -12099,8 +12100,8 @@ 5.2-CURRENT nachdem VFS_ROOT geändert wurde, eine Struktur thread als Argument zu aktzeptieren, wie - vflush. Die Struktur kinfo_proc enthält nun einen Zeiger - auf Benutzer Daten. Der Umstieg auf + vflush. Die Struktur kinfo_proc enthält nun einen + Zeiger auf Benutzer Daten. Der Umstieg auf xorg als standardmäßige X Implementierung wurde auch zu dieser Zeit durchgeführt. @@ -12643,7 +12644,6 @@ wurde. 602114 - FreeBSD 6.2-STABLE nach der Entfernung/Eliminierung der wide und single Byte ctype-Trennung @@ -12658,6 +12658,11 @@ 603100 + 6.3-STABLE, nachdem der Support für den + Multibyte-Datentyp im Bit-Makro gefixt wurde. + 603101 + + 7.0-CURRENT. 700000 @@ -13022,7 +13027,7 @@ 700054 - 7.0-CURRENT, nachdem die + 7.0-RELEASE sowie 7.0-CURRENT, nachdem die ABI-Abwärtskompatibilität für die >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 15 00:31:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FD6A16A4F5; Tue, 15 Jan 2008 00:31:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 53B6B16A4D2 for ; Tue, 15 Jan 2008 00:31:27 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3789E13C46B for ; Tue, 15 Jan 2008 00:31:27 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0F0VRSd083652 for ; Tue, 15 Jan 2008 00:31:27 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0F0VNRQ083603 for perforce@freebsd.org; Tue, 15 Jan 2008 00:31:23 GMT (envelope-from peter-gmail@wemm.org) Date: Tue, 15 Jan 2008 00:31:23 GMT Message-Id: <200801150031.m0F0VNRQ083603@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 133293 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 00:31:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=133293 Change 133293 by peter@peter_overcee on 2008/01/15 00:30:28 IFC @133288 Affected files ... .. //depot/projects/hammer/contrib/file/ChangeLog#5 integrate .. //depot/projects/hammer/contrib/file/Magdir/acorn#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/animation#7 integrate .. //depot/projects/hammer/contrib/file/Magdir/apple#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/archive#8 integrate .. //depot/projects/hammer/contrib/file/Magdir/audio#8 integrate .. //depot/projects/hammer/contrib/file/Magdir/blender#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/commands#6 integrate .. //depot/projects/hammer/contrib/file/Magdir/console#6 integrate .. //depot/projects/hammer/contrib/file/Magdir/database#6 integrate .. //depot/projects/hammer/contrib/file/Magdir/efi#1 branch .. //depot/projects/hammer/contrib/file/Magdir/elf#8 integrate .. //depot/projects/hammer/contrib/file/Magdir/filesystems#8 integrate .. //depot/projects/hammer/contrib/file/Magdir/fortran#1 branch .. //depot/projects/hammer/contrib/file/Magdir/java#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/macintosh#5 integrate .. //depot/projects/hammer/contrib/file/Magdir/msdos#7 integrate .. //depot/projects/hammer/contrib/file/Magdir/pdf#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/sgi#4 integrate .. //depot/projects/hammer/contrib/file/Makefile.am#8 integrate .. //depot/projects/hammer/contrib/file/Makefile.in#8 integrate .. //depot/projects/hammer/contrib/file/acinclude.m4#4 integrate .. //depot/projects/hammer/contrib/file/aclocal.m4#7 integrate .. //depot/projects/hammer/contrib/file/apprentice.c#8 integrate .. //depot/projects/hammer/contrib/file/ascmagic.c#8 integrate .. //depot/projects/hammer/contrib/file/compress.c#7 integrate .. //depot/projects/hammer/contrib/file/config.h.in#8 integrate .. //depot/projects/hammer/contrib/file/configure#8 integrate .. //depot/projects/hammer/contrib/file/configure.in#8 integrate .. //depot/projects/hammer/contrib/file/file.c#8 integrate .. //depot/projects/hammer/contrib/file/file.h#8 integrate .. //depot/projects/hammer/contrib/file/file.man#6 integrate .. //depot/projects/hammer/contrib/file/file_opts.h#1 branch .. //depot/projects/hammer/contrib/file/fsmagic.c#7 integrate .. //depot/projects/hammer/contrib/file/funcs.c#5 integrate .. //depot/projects/hammer/contrib/file/install-sh#4 integrate .. //depot/projects/hammer/contrib/file/is_tar.c#6 integrate .. //depot/projects/hammer/contrib/file/libmagic.man#3 integrate .. //depot/projects/hammer/contrib/file/magic.c#5 integrate .. //depot/projects/hammer/contrib/file/magic.h#4 integrate .. //depot/projects/hammer/contrib/file/magic.man#6 integrate .. //depot/projects/hammer/contrib/file/magic.mime#8 integrate .. //depot/projects/hammer/contrib/file/mkinstalldirs#4 integrate .. //depot/projects/hammer/contrib/file/names.h#6 integrate .. //depot/projects/hammer/contrib/file/patchlevel.h#8 integrate .. //depot/projects/hammer/contrib/file/print.c#8 integrate .. //depot/projects/hammer/contrib/file/readelf.c#9 integrate .. //depot/projects/hammer/contrib/file/readelf.h#6 integrate .. //depot/projects/hammer/contrib/file/softmagic.c#8 integrate .. //depot/projects/hammer/crypto/openssl/crypto/engine/eng_cryptodev.c#2 integrate .. //depot/projects/hammer/etc/rc.d/jail#23 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/contrib/Makefile#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#39 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_tar.c#3 integrate .. //depot/projects/hammer/lib/libc/inet/inet_network.c#4 integrate .. //depot/projects/hammer/lib/libc/stdlib/grantpt.c#8 integrate .. //depot/projects/hammer/lib/libc/stdlib/qsort.c#5 integrate .. //depot/projects/hammer/lib/libmagic/config.h#5 integrate .. //depot/projects/hammer/lib/libutil/pty.c#8 integrate .. //depot/projects/hammer/lib/msun/Makefile#37 integrate .. //depot/projects/hammer/lib/msun/Symbol.map#7 integrate .. //depot/projects/hammer/lib/msun/amd64/Makefile.inc#7 integrate .. //depot/projects/hammer/lib/msun/amd64/s_llrintl.S#1 branch .. //depot/projects/hammer/lib/msun/amd64/s_lrintl.S#1 branch .. //depot/projects/hammer/lib/msun/amd64/s_rintl.S#1 branch .. //depot/projects/hammer/lib/msun/i387/Makefile.inc#9 integrate .. //depot/projects/hammer/lib/msun/i387/s_llrintl.S#1 branch .. //depot/projects/hammer/lib/msun/i387/s_lrintl.S#1 branch .. //depot/projects/hammer/lib/msun/i387/s_rintl.S#1 branch .. //depot/projects/hammer/lib/msun/man/lrint.3#2 integrate .. //depot/projects/hammer/lib/msun/man/rint.3#5 integrate .. //depot/projects/hammer/lib/msun/src/math.h#33 integrate .. //depot/projects/hammer/lib/msun/src/s_llrintl.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_lrintl.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_nearbyint.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_rint.c#5 integrate .. //depot/projects/hammer/lib/msun/src/s_rintl.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#172 integrate .. //depot/projects/hammer/sys/compat/linux/linux_file.c#27 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#44 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#44 integrate .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_kobj.c#5 integrate .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_vfs.c#6 integrate .. //depot/projects/hammer/sys/compat/opensolaris/sys/vnode.h#5 integrate .. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#18 integrate .. //depot/projects/hammer/sys/compat/svr4/imgact_svr4.c#11 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_fcntl.c#14 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#31 integrate .. //depot/projects/hammer/sys/conf/files#172 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#4 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#14 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#14 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_osdep.h#8 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#15 integrate .. //depot/projects/hammer/sys/dev/cxgb/sys/uipc_mvec.c#6 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#22 integrate .. //depot/projects/hammer/sys/dev/md/md.c#64 integrate .. //depot/projects/hammer/sys/dev/stge/if_stge.c#6 integrate .. //depot/projects/hammer/sys/dev/stge/if_stgereg.h#3 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_lookup.c#4 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_vfsops.c#5 integrate .. //depot/projects/hammer/sys/fs/coda/coda_vnops.c#4 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_devs.c#20 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vfsops.c#22 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#56 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#21 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#42 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#26 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vnops.c#25 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_lookup.c#15 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#50 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#35 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#35 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vnops.c#23 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vfsops.c#27 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#29 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vfsops.c#20 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vnops.c#17 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs.c#11 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vncache.c#18 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#27 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#26 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#30 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#12 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vnops.c#9 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#32 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#39 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#27 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vfsops.c#24 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#35 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_lookup.c#6 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vfsops.c#16 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vnops.c#10 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/fs.h#4 integrate .. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_inode.c#4 integrate .. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_namei.c#6 integrate .. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#9 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#8 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#5 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#4 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#5 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#107 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#20 integrate .. //depot/projects/hammer/sys/i386/ibcs2/imgact_coff.c#16 integrate .. //depot/projects/hammer/sys/i386/include/pmap.h#35 integrate .. //depot/projects/hammer/sys/i386/linux/imgact_linux.c#15 integrate .. //depot/projects/hammer/sys/kern/imgact_aout.c#19 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#46 integrate .. //depot/projects/hammer/sys/kern/imgact_gzip.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_acct.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_alq.c#18 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#74 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#78 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#70 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#27 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#36 integrate .. //depot/projects/hammer/sys/kern/kern_linker.c#33 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#86 integrate .. //depot/projects/hammer/sys/kern/link_elf.c#30 integrate .. //depot/projects/hammer/sys/kern/link_elf_obj.c#54 integrate .. //depot/projects/hammer/sys/kern/tty_cons.c#25 integrate .. //depot/projects/hammer/sys/kern/uipc_mqueue.c#14 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#69 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#55 integrate .. //depot/projects/hammer/sys/kern/vfs_acl.c#4 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#54 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#83 integrate .. //depot/projects/hammer/sys/kern/vfs_cache.c#26 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#51 integrate .. //depot/projects/hammer/sys/kern/vfs_extattr.c#4 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#31 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#88 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#122 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#77 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#52 integrate .. //depot/projects/hammer/sys/kern/vnode_if.src#24 integrate .. //depot/projects/hammer/sys/modules/cxgb/cxgb/Makefile#3 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vfsops.c#23 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#28 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#31 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#51 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#56 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#38 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#30 integrate .. //depot/projects/hammer/sys/security/audit/audit_arg.c#11 integrate .. //depot/projects/hammer/sys/security/audit/audit_syscalls.c#11 integrate .. //depot/projects/hammer/sys/security/audit/audit_worker.c#7 integrate .. //depot/projects/hammer/sys/security/mac/mac_process.c#14 integrate .. //depot/projects/hammer/sys/security/mac/mac_syscalls.c#6 integrate .. //depot/projects/hammer/sys/sys/param.h#103 integrate .. //depot/projects/hammer/sys/sys/pmc.h#11 integrate .. //depot/projects/hammer/sys/sys/vnode.h#74 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_rawread.c#21 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#51 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#48 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#70 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#47 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_extattr.c#25 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_lookup.c#20 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_quota.c#27 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#52 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#57 integrate .. //depot/projects/hammer/sys/vm/vm_contig.c#39 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#73 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#44 integrate .. //depot/projects/hammer/tools/regression/lib/msun/test-lrint.c#2 integrate .. //depot/projects/hammer/tools/sched/schedgraph.py#10 integrate .. //depot/projects/hammer/usr.bin/file/config.h#8 integrate Differences ... ==== //depot/projects/hammer/contrib/file/ChangeLog#5 (text+ko) ==== @@ -1,3 +1,84 @@ +2007-12-28 15:06 Christos Zoulas + + * strtof detection + + * remove bogus regex magic that could cause a DoS + + * better mismatch version message + +2007-12-27 11:35 Christos Zoulas + + * bring back some fixes from OpenBSD + + * treat ELF dynamic objects as executables + + * fix gcc warnings + +2007-12-01 19:55 Christos Zoulas + + * make sure we have zlib.h and libz to compile the builtin + decompress code + +2007-10-28 20:48 Christos Zoulas + + * float and double magic support (Behan Webster) + +2007-10-28 20:48 Christos Zoulas + + * Convert fortran to a soft test (Reuben Thomas) + +2007-10-23 5:25 Christos Zoulas + + * Add --with-filename, and --no-filename (Reuben Thomas) + +2007-10-23 3:59 Christos Zoulas + + * Rest of the mime split (Reuben Thomas) + + * Make usage message generated from the flags so that + they stay consistent (Reuben Thomas) + +2007-10-20 3:06 Christos Zoulas + + * typo in comment, missing ifdef QUICK, remove unneeded code + (Charles Longeau) + +2007-10-17 3:33 Christos Zoulas + + * Fix problem printing -\012 in some entries + + * Separate magic type and encoding flags (Reuben Thomas) + +2007-10-09 3:55 Christos Zoulas + + * configure fix for int64 and strndup (Reuben Thomas) + +2007-09-26 4:45 Christos Zoulas + + * Add magic_descriptor() function. + + * Fix regression in elf reading code where the core name was + not being printed. + + * Don't convert NUL's to spaces in {l,b}estring16 (Daniel Dawson) + +2007-08-19 6:30 Christos Zoulas + + * Make mime format consistent so that it can + be easily parsed: + mimetype [charset=character-set] [encoding=encoding-mime-type] + + Remove spurious extra text from some MIME type printouts + (mostly in is_tar). + + Fix one case where -i produced nothing at all (for a 1-byte file, + which is now classed as application/octet-stream). + + Remove 7/8bit classifications, since they were arbitrary + and not based on the file data. + + This work was done by Reuben Thomas + 2007-05-24 10:00 Christos Zoulas * Fix another integer overflow (Colin Percival) ==== //depot/projects/hammer/contrib/file/Magdir/acorn#2 (text+ko) ==== @@ -30,3 +30,38 @@ 0 string Maestro\r RISC OS music file >8 byte x version %d +>8 byte x type %d + +# Digital Symphony data files +# From: Bernard Jungen (bern8817@euphonynet.be) +0 string \x02\x01\x13\x13\x13\x01\x0d\x10 Digital Symphony sound sample (RISC OS), +>8 byte x version %d, +>9 pstring x named "%s", +>(9.b+19) byte =0 8-bit logarithmic +>(9.b+19) byte =1 LZW-compressed linear +>(9.b+19) byte =2 8-bit linear signed +>(9.b+19) byte =3 16-bit linear signed +>(9.b+19) byte =4 SigmaDelta-compressed linear +>(9.b+19) byte =5 SigmaDelta-compressed logarithmic +>(9.b+19) byte >5 unknown format + +0 string \x02\x01\x13\x13\x14\x12\x01\x0b Digital Symphony song (RISC OS), +>8 byte x version %d, +>9 byte =1 1 voice, +>9 byte !1 %d voices, +>10 leshort =1 1 track, +>10 leshort !1 %d tracks, +>12 leshort =1 1 pattern +>12 leshort !1 %d patterns + +0 string \x02\x01\x13\x13\x10\x14\x12\x0e +>9 byte =0 Digital Symphony sequence (RISC OS), +>>8 byte x version %d, +>>10 byte =1 1 line, +>>10 byte !1 %d lines, +>>11 leshort =1 1 position +>>11 leshort !1 %d positions +>9 byte =1 Digital Symphony pattern data (RISC OS), +>>8 byte x version %d, +>>10 leshort =1 1 pattern +>>10 leshort !1 %d patterns ==== //depot/projects/hammer/contrib/file/Magdir/animation#7 (text+ko) ==== @@ -678,3 +678,14 @@ >0x21 byte x v%x 0 string DVDVIDEO-VMG Video manager, >0x21 byte x v%x + +# From: Behan Webster +# NuppelVideo used by Mythtv (*.nuv) +0 regex NuppelVideo|MythTVVideo MythTV NuppelVideo +>12 string x v%s +>20 lelong x (%d +>24 lelong x \bx%d), +>36 string P \bprogressive, +>36 string I \binterlaced, +>40 ledouble x \baspect:%.2f, +>48 ledouble x \bfps:%.2f ==== //depot/projects/hammer/contrib/file/Magdir/apple#4 (text+ko) ==== @@ -189,3 +189,44 @@ >0 byte <5 \b >>13 byte 0x81 \b >>>14 uleshort x \b, system %hd + +#------------------------------------------------------------------------------ +# CAF: Apple CoreAudio File Format +# +# Container format for high-end audio purposes. +# From: David Remahl +# +0 string caff CoreAudio Format audio file +>4 beshort <10 version %d +>6 beshort x + + +#------------------------------------------------------------------------------ +# Keychain database files +0 string kych Mac OS X Keychain File + +#------------------------------------------------------------------------------ +# Code Signing related file types +0 belong 0xfade0c00 Mac OS X Code Requirement +>8 belong 1 (opExpr) +>4 belong x - %d bytes + +0 belong 0xfade0c01 Mac OS X Code Requirement Set +>8 belong >1 containing %d items +>4 belong x - %d bytes + +0 belong 0xfade0c02 Mac OS X Code Directory +>8 belong x version %x +>12 belong >0 flags 0x%x +>4 belong x - %d bytes + +0 belong 0xfade0cc0 Mac OS X Detached Code Signature (non-executable) +>4 belong x - %d bytes + +0 belong 0xfade0cc1 Mac OS X Detached Code Signature +>8 belong >1 (%d elements) +>4 belong x - %d bytes + +# From: "Nelson A. de Oliveira" +# .vdi +4 string innotek\ VirtualBox\ Disk\ Image %s ==== //depot/projects/hammer/contrib/file/Magdir/archive#8 (text+ko) ==== @@ -531,6 +531,7 @@ # ZIP archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu) 0 string PK\003\004 +>4 byte 0x00 Zip archive data >4 byte 0x09 Zip archive data, at least v0.9 to extract >4 byte 0x0a Zip archive data, at least v1.0 to extract >4 byte 0x0b Zip archive data, at least v1.1 to extract @@ -731,3 +732,19 @@ >4 lelong 0x1000006D (EPOC release 3/4/5) >4 lelong 0x10003A12 (EPOC release 6) 0 lelong 0x10201A7A Symbian installation file (Symbian OS 9.x) + +# Pack200 Java archives, http://jcp.org/en/jsr/detail?id=200 +0 belong 0xcafed00d Pack200 Java archive + +# From "Nelson A. de Oliveira" +0 string MPQ\032 MoPaQ (MPQ) archive + +# From: Dirk Jagdmann +# xar archive format: http://code.google.com/p/xar/ +0 string xar! xar archive +>6 beshort x - version %ld + +# From: "Nelson A. de Oliveira" +# .kgb +0 string KGB_arch KGB Archiver file +>10 string x with compression level %.1s ==== //depot/projects/hammer/contrib/file/Magdir/audio#8 (text+ko) ==== @@ -556,3 +556,10 @@ # From: Matthew Flaschen 0 string #EXTM3U M3U playlist text +# From: "Mateus Caruccio" +# guitar pro v3,4,5 from http://filext.com/file-extension/gp3 +0 string \030FICHIER\ GUITAR\ PRO\ v3. Guitar Pro Ver. 3 Tablature + +# From: "Leslie P. Polzer" +60 string SONG SoundFX Module sound file + ==== //depot/projects/hammer/contrib/file/Magdir/blender#2 (text+ko) ==== @@ -1,17 +1,37 @@ #------------------------------------------------------------------------------ -# blender: file(1) magic for Blender 3D data files +# blender: file(1) magic for Blender 3D related files # -# Coded by Guillermo S. Romero using the -# data from Ton Roosendaal . Ton or his company do not -# support the rule, so mail GSR if problems with it. Rule version: 1.1. -# You can get latest version with comments and details about the format -# at http://acd.asoc.euitt.upm.es/~gsromero/3d/blender/magic.blender +# Native format rule v1.2. For questions use the developers list +# http://lists.blender.org/mailman/listinfo/bf-committers +# GLOB chunk was moved near start and provides subversion info since 2.42 + +0 string =BLENDER Blender3D, +>7 string =_ saved as 32-bits +>>8 string =v little endian +>>>9 byte x with version %c. +>>>10 byte x \b%c +>>>11 byte x \b%c +>>>0x40 string =GLOB \b. +>>>>0x58 leshort x \b%.4d +>>8 string =V big endian +>>>9 byte x with version %c. +>>>10 byte x \b%c +>>>11 byte x \b%c +>>>0x40 string =GLOB \b. +>>>>0x58 beshort x \b%.4d +>7 string =- saved as 64-bits +>>8 string =v little endian +>>9 byte x with version %c. +>>10 byte x \b%c +>>11 byte x \b%c +>>0x44 string =GLOB \b. +>>>0x60 leshort x \b%.4d +>>8 string =V big endian +>>>9 byte x with version %c. +>>>10 byte x \b%c +>>>11 byte x \b%c +>>>0x44 string =GLOB \b. +>>>>0x60 beshort x \b%.4d -0 string =BLENDER Blender3D, ->7 string =_ saved as 32-bits ->7 string =- saved as 64-bits ->8 string =v little endian ->8 string =V big endian ->9 byte x with version %c. ->10 byte x \b%c ->11 byte x \b%c +# Scripts that run in the embeded Python interpreter +0 string #!BPY Blender3D BPython script ==== //depot/projects/hammer/contrib/file/Magdir/commands#6 (text+ko) ==== @@ -28,7 +28,8 @@ 0 string/b #!\ /bin/awk awk script text executable 0 string/b #!\ /usr/bin/awk awk script text executable # update to distinguish from *.vcf files -0 regex BEGIN[[:space:]]*[{] awk script text +# this is broken because postscript has /EBEGIN{ for example. +#0 regex BEGIN[[:space:]]*[{] awk script text # AT&T Bell Labs' Plan 9 shell 0 string/b #!\ /bin/rc Plan 9 rc shell script text executable ==== //depot/projects/hammer/contrib/file/Magdir/console#6 (text+ko) ==== @@ -191,3 +191,64 @@ 0 string PPF10 Playstation Patch File version 1.0 >5 byte 0 \b, Simple Encoding >6 string x \b, description: %s + +# From: Daniel Dawson +# SNES9x .smv "movie" file format. +0 string SMV\x1A SNES9x input recording +>0x4 lelong x \b, version %d +# version 4 is latest so far +>0x4 lelong <5 +>>0x8 ledate x \b, recorded at %s +>>0xc lelong >0 \b, rerecorded %d times +>>0x10 lelong x \b, %d frames long +>>0x14 byte >0 \b, data for controller(s): +>>>0x14 byte &0x1 #1 +>>>0x14 byte &0x2 #2 +>>>0x14 byte &0x4 #3 +>>>0x14 byte &0x8 #4 +>>>0x14 byte &0x10 #5 +>>0x15 byte ^0x1 \b, begins from snapshot +>>0x15 byte &0x1 \b, begins from reset +>>0x15 byte ^0x2 \b, NTSC standard +>>0x15 byte &0x2 \b, PAL standard +>>0x17 byte &0x1 \b, settings: +# WIP1Timing not used as of version 4 +>>>0x4 lelong <4 +>>>>0x17 byte &0x2 WIP1Timing +>>>0x17 byte &0x4 Left+Right +>>>0x17 byte &0x8 VolumeEnvX +>>>0x17 byte &0x10 FakeMute +>>>0x17 byte &0x20 SyncSound +# New flag as of version 4 +>>>0x4 lelong >3 +>>>>0x17 byte &0x80 NoCPUShutdown +>>0x4 lelong <4 +>>>0x18 lelong >0x23 +>>>>0x20 leshort !0 +>>>>>0x20 lestring16 x \b, metadata: "%s" +>>0x4 lelong >3 +>>>0x24 byte >0 \b, port 1: +>>>>0x24 byte 1 joypad +>>>>0x24 byte 2 mouse +>>>>0x24 byte 3 SuperScope +>>>>0x24 byte 4 Justifier +>>>>0x24 byte 5 multitap +>>>0x24 byte >0 \b, port 2: +>>>>0x25 byte 1 joypad +>>>>0x25 byte 2 mouse +>>>>0x25 byte 3 SuperScope +>>>>0x25 byte 4 Justifier +>>>>0x25 byte 5 multitap +>>>0x18 lelong >0x43 +>>>>0x40 leshort !0 +>>>>>0x40 lestring16 x \b, metadata: "%s" +>>0x17 byte &0x40 \b, ROM: +>>>(0x18.l-26) lelong x CRC32 0x%08x +>>>(0x18.l-23) string x "%s" + +# From: "Nelson A. de Oliveira" +# .w3g +0 string Warcraft\ III\ recorded\ game %s +# .w3m +0 string HM3W Warcraft III map file + ==== //depot/projects/hammer/contrib/file/Magdir/database#6 (text+ko) ==== @@ -210,3 +210,13 @@ 16 string MIT-MAGIC-COOKIE-1 X11 Xauthority data 17 string MIT-MAGIC-COOKIE-1 X11 Xauthority data 18 string MIT-MAGIC-COOKIE-1 X11 Xauthority data + +# From: Maxime Henrion +# PostgreSQL's custom dump format, Maxime Henrion +0 string PGDMP PostgreSQL custom database dump +>5 byte x - v%d +>6 byte x \b.%d +>5 beshort <=0x100 \b-0 +>5 beshort >0x100 +>>7 byte x \b-%d + ==== //depot/projects/hammer/contrib/file/Magdir/elf#8 (text+ko) ==== @@ -51,10 +51,10 @@ >>>>36 lelong&0xf0000000 0x20000000 MIPS-III >>>>36 lelong&0xf0000000 0x30000000 MIPS-IV >>>>36 lelong&0xf0000000 0x40000000 MIPS-V ->>>>36 lelong&0xf0000000 0x60000000 MIPS32 ->>>>36 lelong&0xf0000000 0x70000000 MIPS64 ->>>>36 lelong&0xf0000000 0x80000000 MIPS32 rel2 ->>>>36 lelong&0xf0000000 0x90000000 MIPS64 rel2 +>>>>36 lelong&0xf0000000 0x50000000 MIPS32 +>>>>36 lelong&0xf0000000 0x60000000 MIPS64 +>>>>36 lelong&0xf0000000 0x70000000 MIPS32 rel2 +>>>>36 lelong&0xf0000000 0x80000000 MIPS64 rel2 # only for 64-bit >>>4 byte 2 >>>>48 lelong&0xf0000000 0x00000000 MIPS-I @@ -62,10 +62,10 @@ >>>>48 lelong&0xf0000000 0x20000000 MIPS-III >>>>48 lelong&0xf0000000 0x30000000 MIPS-IV >>>>48 lelong&0xf0000000 0x40000000 MIPS-V ->>>>48 lelong&0xf0000000 0x60000000 MIPS32 ->>>>48 lelong&0xf0000000 0x70000000 MIPS64 ->>>>48 lelong&0xf0000000 0x80000000 MIPS32 rel2 ->>>>48 lelong&0xf0000000 0x90000000 MIPS64 rel2 +>>>>48 lelong&0xf0000000 0x50000000 MIPS32 +>>>>48 lelong&0xf0000000 0x60000000 MIPS64 +>>>>48 lelong&0xf0000000 0x70000000 MIPS32 rel2 +>>>>48 lelong&0xf0000000 0x80000000 MIPS64 rel2 >>18 leshort 9 Amdahl - invalid byte order, >>18 leshort 10 MIPS (deprecated), >>18 leshort 11 RS6000 - invalid byte order, @@ -139,10 +139,10 @@ >>>>36 belong&0xf0000000 0x20000000 MIPS-III >>>>36 belong&0xf0000000 0x30000000 MIPS-IV >>>>36 belong&0xf0000000 0x40000000 MIPS-V ->>>>36 belong&0xf0000000 0x60000000 MIPS32 ->>>>36 belong&0xf0000000 0x70000000 MIPS64 ->>>>36 belong&0xf0000000 0x80000000 MIPS32 rel2 ->>>>36 belong&0xf0000000 0x90000000 MIPS64 rel2 +>>>>36 belong&0xf0000000 0x50000000 MIPS32 +>>>>36 belong&0xf0000000 0x60000000 MIPS64 +>>>>36 belong&0xf0000000 0x70000000 MIPS32 rel2 +>>>>36 belong&0xf0000000 0x80000000 MIPS64 rel2 # only for 64-bit >>>4 byte 2 >>>>48 belong&0xf0000000 0x00000000 MIPS-I @@ -150,10 +150,10 @@ >>>>48 belong&0xf0000000 0x20000000 MIPS-III >>>>48 belong&0xf0000000 0x30000000 MIPS-IV >>>>48 belong&0xf0000000 0x40000000 MIPS-V ->>>>48 belong&0xf0000000 0x60000000 MIPS32 ->>>>48 belong&0xf0000000 0x70000000 MIPS64 ->>>>48 belong&0xf0000000 0x80000000 MIPS32 rel2 ->>>>48 belong&0xf0000000 0x90000000 MIPS64 rel2 +>>>>48 belong&0xf0000000 0x50000000 MIPS32 +>>>>48 belong&0xf0000000 0x60000000 MIPS64 +>>>>48 belong&0xf0000000 0x70000000 MIPS32 rel2 +>>>>48 belong&0xf0000000 0x80000000 MIPS64 rel2 >>18 beshort 9 Amdahl, >>18 beshort 10 MIPS (deprecated), >>18 beshort 11 RS6000, @@ -196,6 +196,7 @@ >>18 beshort 88 Renesas M32R, >>18 beshort 94 Tensilica Xtensa, >>18 beshort 97 NatSemi 32k, +>>18 beshort 0x18ad AVR32 (unofficial), >>18 beshort 0x9026 Alpha (unofficial), >>18 beshort 0xa390 IBM S/390 (obsolete), >>20 belong 0 invalid version ==== //depot/projects/hammer/contrib/file/Magdir/filesystems#8 (text+ko) ==== @@ -52,7 +52,13 @@ >>>>11 ulelong >0 \b, %d sectors/track >>>>15 ulelong >0 \b, %d cylinders +# updated by Joerg Jenderek at Sep 2007 +# only for sector sizes with 512 or more Bytes 0x1FE leshort 0xAA55 x86 boot sector +# to do also for sectors < than 512 Bytes and some other files, GRR +#30 search/481 \x55\xAA x86 boot sector +# not for BeOS floppy 1440k, MBRs +#(11.s-2) uleshort 0xAA55 x86 boot sector >2 string OSBS \b, OS/BS MBR # J\xf6rg Jenderek >0x8C string Invalid\ partition\ table \b, MS-DOS MBR @@ -173,56 +179,59 @@ >>498 string BCDL\ \ \ \ BIN \b, Bootable CD Loader (1.50Z) # mbr partion table entries # OEM-ID not Microsoft,SYSLINUX,or MTOOLs ->3 string !MS +>3 string !MS >>3 string !SYSLINUX >>>3 string !MTOOL # not FAT (32 bit) >>>>82 string !FAT32 #not IO.SYS >>>>>472 string !IO\ \ \ \ \ \ SYS +>>>>>>480 string !IO\ \ \ \ \ \ SYS #not Linux kernel ->>>>>>514 string !HdrS +>>>>>>>514 string !HdrS +#not BeOS +>>>>>>>>422 string !Be\ Boot\ Loader # active flag 0 or 0x80 and type > 0 ->>>>>>>446 ubyte <0x81 ->>>>>>>>446 ubyte&0x7F 0 +>>>>>>>>>446 ubyte <0x81 +>>>>>>>>>>446 ubyte&0x7F 0 >>>>>>>>>>>450 ubyte >0 \b; partition 1: ID=0x%x ->>>>>>>>>>446 ubyte 0x80 \b, active ->>>>>>>>>>447 ubyte x \b, starthead %u -#>>>>>>>>>>448 ubyte x \b, start C_S: 0x%x -#>>>>>>>>>>448 ubeshort&1023 x \b, startcylinder? %d ->>>>>>>>>>454 ulelong x \b, startsector %u ->>>>>>>>>>458 ulelong x \b, %u sectors +>>>>>>>>>>>>446 ubyte 0x80 \b, active +>>>>>>>>>>>>447 ubyte x \b, starthead %u +#>>>>>>>>>>>>448 ubyte x \b, start C_S: 0x%x +#>>>>>>>>>>>>448 ubeshort&1023 x \b, startcylinder? %d +>>>>>>>>>>>>454 ulelong x \b, startsector %u +>>>>>>>>>>>>458 ulelong x \b, %u sectors # ->>>>>>>462 ubyte <0x81 ->>>>>>>>462 ubyte&0x7F 0 ->>>>>>>>>466 ubyte >0 \b; partition 2: ID=0x%x ->>>>>>>>>>462 ubyte 0x80 \b, active ->>>>>>>>>>463 ubyte x \b, starthead %u -#>>>>>>>>>>464 ubyte x \b, start C_S: 0x%x -#>>>>>>>>>>464 ubeshort&1023 x \b, startcylinder? %d ->>>>>>>>>>470 ulelong x \b, startsector %u ->>>>>>>>>>474 ulelong x \b, %u sectors +>>>>>>>>>462 ubyte <0x81 +>>>>>>>>>>462 ubyte&0x7F 0 +>>>>>>>>>>>466 ubyte >0 \b; partition 2: ID=0x%x +>>>>>>>>>>>>462 ubyte 0x80 \b, active +>>>>>>>>>>>>463 ubyte x \b, starthead %u +#>>>>>>>>>>>>464 ubyte x \b, start C_S: 0x%x +#>>>>>>>>>>>>464 ubeshort&1023 x \b, startcylinder? %d +>>>>>>>>>>>>470 ulelong x \b, startsector %u +>>>>>>>>>>>>474 ulelong x \b, %u sectors # ->>>>>>>478 ubyte <0x81 ->>>>>>>>478 ubyte&0x7F 0 ->>>>>>>>>482 ubyte >0 \b; partition 3: ID=0x%x ->>>>>>>>>>478 ubyte 0x80 \b, active ->>>>>>>>>>479 ubyte x \b, starthead %u -#>>>>>>>>>>480 ubyte x \b, start C_S: 0x%x -#>>>>>>>>>>481 ubyte x \b, start C2S: 0x%x -#>>>>>>>>>>480 ubeshort&1023 x \b, startcylinder? %d ->>>>>>>>>>486 ulelong x \b, startsector %u ->>>>>>>>>>490 ulelong x \b, %u sectors +>>>>>>>>>478 ubyte <0x81 +>>>>>>>>>>478 ubyte&0x7F 0 +>>>>>>>>>>>482 ubyte >0 \b; partition 3: ID=0x%x +>>>>>>>>>>>>478 ubyte 0x80 \b, active +>>>>>>>>>>>>479 ubyte x \b, starthead %u +#>>>>>>>>>>>>480 ubyte x \b, start C_S: 0x%x +#>>>>>>>>>>>>481 ubyte x \b, start C2S: 0x%x +#>>>>>>>>>>>>480 ubeshort&1023 x \b, startcylinder? %d +>>>>>>>>>>>>486 ulelong x \b, startsector %u +>>>>>>>>>>>>490 ulelong x \b, %u sectors # ->>>>>>>494 ubyte <0x81 ->>>>>>>>494 ubyte&0x7F 0 ->>>>>>>>>498 ubyte >0 \b; partition 4: ID=0x%x ->>>>>>>>>>494 ubyte 0x80 \b, active ->>>>>>>>>>495 ubyte x \b, starthead %u -#>>>>>>>>>>496 ubyte x \b, start C_S: 0x%x -#>>>>>>>>>>496 ubeshort&1023 x \b, startcylinder? %d ->>>>>>>>>>502 ulelong x \b, startsector %u ->>>>>>>>>>506 ulelong x \b, %u sectors +>>>>>>>>>494 ubyte <0x81 +>>>>>>>>>>494 ubyte&0x7F 0 +>>>>>>>>>>>498 ubyte >0 \b; partition 4: ID=0x%x +>>>>>>>>>>>>494 ubyte 0x80 \b, active +>>>>>>>>>>>>495 ubyte x \b, starthead %u +#>>>>>>>>>>>>496 ubyte x \b, start C_S: 0x%x +#>>>>>>>>>>>>496 ubeshort&1023 x \b, startcylinder? %d +>>>>>>>>>>>>502 ulelong x \b, startsector %u +>>>>>>>>>>>>506 ulelong x \b, %u sectors # mbr partion table entries end # http://www.acronis.de/ #FAT label=ACRONIS\ SZ @@ -507,34 +516,52 @@ >>>>>>>498 ubyte&0xDF >0 >>>>>>>>498 string x \b.%-.3s # ->486 ubyte&0xDF >0 ->>416 string Non-System\ disk\ or\ ->>>435 string disk\ error\r ->>>>447 string Replace\ and\ press\ any\ key\ ->>>>>473 string when\ ready\r \b, Microsoft DOS Bootloader ->480 ubyte&0xDF >0 ->>393 string Non-System\ disk\ or\ ->>>412 string disk\ error\r ->>>>424 string Replace\ and\ press\ any\ key\ ->>>>>450 string when\ ready\r \b, Microsoft DOS bootloader -#IO.SYS ->>>>>480 string x \b %-.2s ->>>>>>482 ubyte&0xDF >0 ->>>>>>>48 string x \b%-.6s ->>>>>488 ubyte&0xDF >0 ->>>>>>488 string x \b.%-.3s -#MSDOS.SYS ->>>>>>491 ubyte&0xDF >0 \b+ ->>>>>>>491 string x \b%-.5s ->>>>>>>>496 ubyte&0xDF >0 ->>>>>>>>>496 string x \b%-.3s ->>>>>>>499 ubyte&0xDF >0 ->>>>>>>>499 string x \b.%-.3s +>376 search/41 Non-System\ disk\ or\ +>>395 search/41 disk\ error\r +>>>407 search/41 Replace\ and\ +>>>>419 search/41 press\ \b, +>>>>419 search/41 strike\ \b, old +>>>>426 search/41 any\ key\ when\ ready\r MS or PC-DOS bootloader +#449 Disk\ Boot\ failure\r MS 3.21 +#466 Boot\ Failure\r MS 3.30 +>>>>>468 search/18 \0 +#IO.SYS,IBMBIO.COM +>>>>>>&0 string x \b %-.2s +>>>>>>>&-20 ubyte&0xDF >0 +>>>>>>>>&-1 string x \b%-.4s +>>>>>>>>>&-16 ubyte&0xDF >0 +>>>>>>>>>>&-1 string x \b%-.2s +>>>>>>&8 ubyte&0xDF >0 \b. +>>>>>>>&-1 string x \b%-.3s +#MSDOS.SYS,IBMDOS.COM +>>>>>>&11 ubyte&0xDF >0 \b+ +>>>>>>>&-1 string x \b%-.5s +>>>>>>>>&-6 ubyte&0xDF >0 +>>>>>>>>>&-1 string x \b%-.1s +>>>>>>>>>>&-5 ubyte&0xDF >0 +>>>>>>>>>>>&-1 string x \b%-.2s +>>>>>>>&7 ubyte&0xDF >0 \b. +>>>>>>>>&-1 string x \b%-.3s +>441 string Cannot\ load\ from\ harddisk.\n\r +>>469 string Insert\ Systemdisk\ +>>>487 string and\ press\ any\ key.\n\r \b, MS (2.11) DOS bootloader #>43 string \224R-LOADER\ \ SYS =label >54 string SYS >>324 string VASKK >>>495 string NEWLDR\0 \b, DR-DOS Bootloader (LOADER.SYS) # +>98 string Press\ a\ key\ to\ retry\0\r +>>120 string Cannot\ find\ file\ \0\r +>>>139 string Disk\ read\ error\0\r +>>>>156 string Loading\ ...\0 \b, DR-DOS (3.41) Bootloader +#DRBIOS.SYS +>>>>>44 ubyte&0xDF >0 +>>>>>>44 string x \b %-.6s +>>>>>>>50 ubyte&0xDF >0 +>>>>>>>>50 string x \b%-.2s +>>>>>>52 ubyte&0xDF >0 +>>>>>>>52 string x \b.%-.3s +# >70 string IBMBIO\ \ COM >>472 string Cannot\ load\ DOS!\ >>>489 string Any\ key\ to\ retry \b, DR-DOS Bootloader @@ -679,26 +706,43 @@ #it also hangs with another message ("NF"). >>>>>492 string RENF \b, FAT (12 bit) >>>>>495 string RENF \b, FAT (16 bit) +# added by Joerg Jenderek +# http://syslinux.zytor.com/iso.php +0 ulelong 0x7c40eafa isolinux Loader +# http://syslinux.zytor.com/pxe.php +0 ulelong 0x007c05ea pxelinux Loader +0 ulelong 0x60669c66 pxelinux Loader # loader end -# Joerg Jenderek ->446 ubyte 0 ->>450 ubyte >0 ->>>482 ubyte 0 ->>>>498 ubyte 0 ->>>>466 ubyte 0x05 \b, extended partition table ->>>>466 ubyte 0x0F \b, extended partition table (LBA) ->>>>466 ubyte 0x0 \b, extended partition table (last) +# updated by Joerg Jenderek at Sep 2007 +>3 ubyte 0 +#no active flag +>>446 ubyte 0 +# partition 1 not empty +>>>450 ubyte >0 +# partitions 3,4 empty +>>>>482 ubyte 0 +>>>>>498 ubyte 0 +# partition 2 ID=0,5,15 +>>>>>>466 ubyte <0x10 +>>>>>>>466 ubyte 0x05 \b, extended partition table +>>>>>>>466 ubyte 0x0F \b, extended partition table (LBA) +>>>>>>>466 ubyte 0x0 \b, extended partition table (last) # JuMP short bootcodeoffset NOP assembler instructions will usually be EB xx 90 -# older drives may use E9 xx xx +# http://mirror.href.com/thestarman/asm/2bytejumps.htmm#FWD +# older drives may use Near JuMP instruction E9 xx xx >0 lelong&0x009000EB 0x009000EB >0 lelong&0x000000E9 0x000000E9 ->>1 ubyte >37 \b, code offset 0x%x +# maximal short forward jump is 07fx +>1 ubyte <0xff \b, code offset 0x%x # mtools-3.9.8/msdos.h # usual values are marked with comments to get only informations of strange FAT systems -# valid sectorsize are from 32 to 2048 ->>>11 uleshort <2049 ->>>>11 uleshort >31 +# valid sectorsize must be a power of 2 from 32 to 32768 +>>11 uleshort&0x000f x +>>>11 uleshort <32769 +>>>>11 uleshort >31 >>>>>3 string >\0 \b, OEM-ID "%8.8s" +#http://mirror.href.com/thestarman/asm/debug/debug2.htm#IHC +>>>>>>8 string IHC \b cached by Windows 9M >>>>>11 uleshort >512 \b, Bytes/sector %u #>>>>>11 uleshort =512 \b, Bytes/sector %u=512 (usual) >>>>>11 uleshort <512 \b, Bytes/sector %u @@ -725,17 +769,18 @@ >>>>>26 ubyte >2 \b, heads %u #>>>>>26 ubyte =2 \b, heads %u (usual floppy) >>>>>26 ubyte =1 \b, heads %u ->>>>>28 ulelong >0 \b, hidden sectors %u -#>>>>>28 ulelong =0 \b, hidden sectors %u (usual floppy) ->>>>>32 ulelong >0 \b, sectors %u (volumes > 32 MB) -#>>>>>32 ulelong =0 \b, sectors %u (volumes > 32 MB) +#skip for Digital Research DOS (version 3.41) 1440 kB Bootdisk +>>>>>38 ubyte !0x70 +>>>>>>28 ulelong >0 \b, hidden sectors %u +#>>>>>>28 ulelong =0 \b, hidden sectors %u (usual floppy) +>>>>>>32 ulelong >0 \b, sectors %u (volumes > 32 MB) +#>>>>>>32 ulelong =0 \b, sectors %u (volumes > 32 MB) # FAT<32 specific -# NOT le FAT3=NOT 3TAF=0xCCABBEB9 ->>>>>82 ulelong&0xCCABBEB9 >0 ->>>>>>36 ubyte >0x80 \b, physical drive 0x%x -#>>>>>>36 ubyte =0x80 \b, physical drive 0x%x=0x80 (usual harddisk) ->>>>>>36 ubyte&0x7F >0 \b, physical drive 0x%x -#>>>>>>36 ubyte =0 \b, physical drive 0x%x=0 (usual floppy) +>>>>>82 string !FAT32 +#>>>>>>36 ubyte 0x80 \b, physical drive 0x%x=0x80 (usual harddisk) +#>>>>>>36 ubyte 0 \b, physical drive 0x%x=0 (usual floppy) +>>>>>>36 ubyte !0x80 +>>>>>>>36 ubyte !0 \b, physical drive 0x%x >>>>>>37 ubyte >0 \b, reserved 0x%x #>>>>>>37 ubyte =0 \b, reserved 0x%x >>>>>>38 ubyte >0x29 \b, dos < 4.0 BootSector (0x%x) @@ -1072,13 +1117,12 @@ # Modified for UDF by gerardo.cacciari@gmail.com 32769 string CD001 >38913 string !NSR0 ISO 9660 CD-ROM filesystem data ->38913 string NSR01 UDF filesystem data (version 1.0) ->38913 string NSR02 UDF filesystem data (version 1.5) ->38913 string NSR03 UDF filesystem data (version 2.0) ->38913 string >NSR03 UDF filesystem data (unknown version, ->>38917 byte x id 'NSR0%c') ->38913 string >38917 byte x id 'NSR0%c') +>38913 string NSR0 UDF filesystem data +>>38917 string 1 (version 1.0) +>>38917 string 2 (version 1.5) +>>38917 string 3 (version 2.0) +>>38917 byte >0x33 (unknown version, ID 0x%X) +>>38917 byte <0x31 (unknown version, ID 0x%X) # "application id" which appears to be used as a volume label >32808 string >\0 '%s' >34816 string \000CD001\001EL\ TORITO\ SPECIFICATION (bootable) @@ -1210,3 +1254,8 @@ >525 byte x Level %d >525 byte x (ODS-%d OpenVMS file system), >984 string x volume label is '%-12.12s' + +# From: Thomas Klausner +# http://filext.com/file-extension/DAA +# describes the daa file format. The magic would be: +0 string DAA\x0\x0\x0\x0\x0 PowerISO Direct-Access-Archive ==== //depot/projects/hammer/contrib/file/Magdir/java#4 (text+ko) ==== @@ -7,3 +7,17 @@ # From Martin Pool (m.pool@pharos.com.au) 0 beshort 0xaced Java serialization data >2 beshort >0x0004 \b, version %d + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 15 02:00:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B44716A41B; Tue, 15 Jan 2008 02:00:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6036116A419 for ; Tue, 15 Jan 2008 02:00:01 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3F4A013C43E for ; Tue, 15 Jan 2008 02:00:01 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0F2016T008721 for ; Tue, 15 Jan 2008 02:00:01 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0F200FQ008704 for perforce@freebsd.org; Tue, 15 Jan 2008 02:00:00 GMT (envelope-from imp@freebsd.org) Date: Tue, 15 Jan 2008 02:00:00 GMT Message-Id: <200801150200.m0F200FQ008704@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133297 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 02:00:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=133297 Change 133297 by imp@imp_lighthouse on 2008/01/15 01:59:51 Copy the topstack construct from mips2. Change PAGE_SIZE to NBPG to match what's used here (the param.h stuff is too tricky to try to sort out atm). Use topstack in preference to putting the stack just before 'start' since that appears to be used for other according to nm. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#9 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#9 (text+ko) ==== @@ -83,14 +83,16 @@ GLOBAL(cfe_vector) .space 4 #endif - +GLOBAL(stackspace) + .space NBPG /* Smaller than it should be since it's temp. */ + .align 8 +GLOBAL(topstack) + .set noreorder + .text - .set noreorder # Noreorder is default style! - .globl _C_LABEL(_start) - .globl _C_LABEL(btext) -_C_LABEL(_start): -_C_LABEL(btext): +GLOBAL(btext) +ASM_ENTRY(_start) VECTOR(_locore, unknown) /* UNSAFE TO USE a0..a3, since some bootloaders pass that to us */ @@ -142,7 +144,7 @@ /* * Initialize stack and call machine startup. */ - la sp, _start - START_FRAME + la sp, topstack - START_FRAME la gp, _C_LABEL(_gp) sw zero, START_FRAME - 4(sp) # Zero out old ra for debugger From owner-p4-projects@FreeBSD.ORG Tue Jan 15 02:09:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5985016A420; Tue, 15 Jan 2008 02:09:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 06B7316A417 for ; Tue, 15 Jan 2008 02:09:11 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E167A13C442 for ; Tue, 15 Jan 2008 02:09:10 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0F29AxH011286 for ; Tue, 15 Jan 2008 02:09:10 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0F29AJr011283 for perforce@freebsd.org; Tue, 15 Jan 2008 02:09:10 GMT (envelope-from swise@FreeBSD.org) Date: Tue, 15 Jan 2008 02:09:10 GMT Message-Id: <200801150209.m0F29AJr011283@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 133298 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 02:09:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=133298 Change 133298 by swise@swise:vic10:iwarp on 2008/01/15 02:08:46 Enhance krping to allow using but dma-mrs and regular mrs. Affected files ... .. //depot/projects/iwarp/sys/contrib/rdma/krping/krping.c#6 edit .. //depot/projects/iwarp/sys/contrib/rdma/krping/krping.h#4 edit Differences ... ==== //depot/projects/iwarp/sys/contrib/rdma/krping/krping.c#6 (text+ko) ==== @@ -74,6 +74,8 @@ {"validate", OPT_NOPARAM, 'V'}, {"server", OPT_NOPARAM, 's'}, {"client", OPT_NOPARAM, 'c'}, + {"dmamr", OPT_NOPARAM, 'D'}, + {"debug", OPT_NOPARAM, 'd'}, {NULL, 0, 0} }; @@ -446,13 +448,19 @@ /* XXX X86 only here... not mapping for dma! */ cb->recv_sgl.addr = virt_to_phys(&cb->recv_buf); cb->recv_sgl.length = sizeof cb->recv_buf; - cb->recv_sgl.lkey = cb->dma_mr->lkey; + if (cb->use_dmamr) + cb->recv_sgl.lkey = cb->dma_mr->lkey; + else + cb->recv_sgl.lkey = cb->recv_mr->lkey; cb->rq_wr.sg_list = &cb->recv_sgl; cb->rq_wr.num_sge = 1; cb->send_sgl.addr = virt_to_phys(&cb->send_buf); cb->send_sgl.length = sizeof cb->send_buf; - cb->send_sgl.lkey = cb->dma_mr->lkey; + if (cb->use_dmamr) + cb->send_sgl.lkey = cb->dma_mr->lkey; + else + cb->send_sgl.lkey = cb->send_mr->lkey; cb->sq_wr.opcode = IB_WR_SEND; cb->sq_wr.send_flags = IB_SEND_SIGNALED; @@ -461,7 +469,10 @@ cb->rdma_addr = virt_to_phys(cb->rdma_buf); cb->rdma_sgl.addr = cb->rdma_addr; - cb->rdma_sgl.lkey = cb->dma_mr->lkey; + if (cb->use_dmamr) + cb->rdma_sgl.lkey = cb->dma_mr->lkey; + else + cb->rdma_sgl.lkey = cb->rdma_mr->lkey; cb->rdma_sq_wr.send_flags = IB_SEND_SIGNALED; cb->rdma_sq_wr.sg_list = &cb->rdma_sgl; cb->rdma_sq_wr.num_sge = 1; @@ -474,15 +485,44 @@ static int krping_setup_buffers(struct krping_cb *cb) { int ret; + struct ib_phys_buf buf; + u64 iovbase; DEBUG_LOG(PFX "krping_setup_buffers called on cb %p\n", cb); - cb->dma_mr = ib_get_dma_mr(cb->pd, IB_ACCESS_LOCAL_WRITE| + if (cb->use_dmamr) { + cb->dma_mr = ib_get_dma_mr(cb->pd, IB_ACCESS_LOCAL_WRITE| IB_ACCESS_REMOTE_READ| IB_ACCESS_REMOTE_WRITE); - if (IS_ERR(cb->dma_mr)) { - DEBUG_LOG(PFX "recv_buf reg_mr failed\n"); - return PTR_ERR(cb->dma_mr); + if (IS_ERR(cb->dma_mr)) { + DEBUG_LOG(PFX "reg_dmamr failed\n"); + return PTR_ERR(cb->dma_mr); + } + } else { + + buf.addr = virt_to_phys(&cb->recv_buf); + buf.size = sizeof cb->recv_buf; + iovbase = virt_to_phys(&cb->recv_buf); + cb->recv_mr = ib_reg_phys_mr(cb->pd, &buf, 1, + IB_ACCESS_LOCAL_WRITE, + &iovbase); + + if (IS_ERR(cb->recv_mr)) { + DEBUG_LOG(PFX "recv_buf reg_mr failed\n"); + return PTR_ERR(cb->recv_mr); + } + + buf.addr = virt_to_phys(&cb->send_buf); + buf.size = sizeof cb->send_buf; + iovbase = virt_to_phys(&cb->send_buf); + cb->send_mr = ib_reg_phys_mr(cb->pd, &buf, 1, + 0, &iovbase); + + if (IS_ERR(cb->send_mr)) { + DEBUG_LOG(PFX "send_buf reg_mr failed\n"); + ib_dereg_mr(cb->recv_mr); + return PTR_ERR(cb->send_mr); + } } cb->rdma_buf = contigmalloc(cb->size, M_DEVBUF, M_WAITOK, 0, (1L<<22), @@ -493,7 +533,23 @@ ret = -ENOMEM; goto err1; } + if (!cb->use_dmamr) { + buf.addr = virt_to_phys(cb->rdma_buf); + buf.size = cb->size; + iovbase = virt_to_phys(cb->rdma_buf); + cb->rdma_mr = ib_reg_phys_mr(cb->pd, &buf, 1, + IB_ACCESS_REMOTE_READ| + IB_ACCESS_REMOTE_WRITE, + &iovbase); + + if (IS_ERR(cb->rdma_buf)) { + DEBUG_LOG(PFX "rdma_buf reg_mr failed\n"); + ret = PTR_ERR(cb->rdma_mr); + goto err2; + } + } + if (!cb->server) { cb->start_buf = contigmalloc(cb->size, M_DEVBUF, M_WAITOK, 0, (1L<<22), 4096, 1024*1024); @@ -502,15 +558,40 @@ ret = -ENOMEM; goto err2; } + if (!cb->use_dmamr) { + + buf.addr = virt_to_phys(cb->start_buf); + buf.size = cb->size; + iovbase = virt_to_phys(cb->start_buf); + cb->start_mr = ib_reg_phys_mr(cb->pd, &buf, 1, + IB_ACCESS_REMOTE_READ, + &iovbase); + + if (IS_ERR(cb->start_buf)) { + DEBUG_LOG(PFX "start_buf reg_mr failed\n"); + ret = PTR_ERR(cb->start_mr); + goto err3; + } + } } krping_setup_wr(cb); DEBUG_LOG(PFX "allocated & registered buffers...\n"); return 0; +err3: + contigfree(cb->start_buf, cb->size, M_DEVBUF); + + if (!cb->use_dmamr) + ib_dereg_mr(cb->rdma_mr); err2: contigfree(cb->rdma_buf, cb->size, M_DEVBUF); err1: - ib_dereg_mr(cb->dma_mr); + if (cb->use_dmamr) + ib_dereg_mr(cb->dma_mr); + else { + ib_dereg_mr(cb->recv_mr); + ib_dereg_mr(cb->send_mr); + } return ret; } @@ -536,7 +617,15 @@ cb->size, DMA_BIDIRECTIONAL); contigfree(cb->start_buf, cb->size, M_DEVBUF); } - ib_dereg_mr(cb->dma_mr); + if (cb->use_dmamr) + ib_dereg_mr(cb->dma_mr); + else { + ib_dereg_mr(cb->send_mr); + ib_dereg_mr(cb->recv_mr); + ib_dereg_mr(cb->rdma_mr); + if (!cb->server) + ib_dereg_mr(cb->start_mr); + } } static int krping_create_qp(struct krping_cb *cb) @@ -823,7 +912,11 @@ start = 65; cb->start_buf[cb->size - 1] = 0; - krping_format_send(cb, cb->start_addr, cb->dma_mr); + if (cb->dma_mr) + krping_format_send(cb, cb->start_addr, cb->dma_mr); + else + krping_format_send(cb, cb->start_addr, cb->start_mr); + ret = ib_post_send(cb->qp, &cb->sq_wr, &bad_wr); if (ret) { DEBUG_LOG(PFX "post send error %d\n", ret); @@ -839,7 +932,11 @@ break; } - krping_format_send(cb, cb->rdma_addr, cb->dma_mr); + if (cb->dma_mr) + krping_format_send(cb, cb->rdma_addr, cb->dma_mr); + else + krping_format_send(cb, cb->rdma_addr, cb->rdma_mr); + ret = ib_post_send(cb->qp, &cb->sq_wr, &bad_wr); if (ret) { DEBUG_LOG(PFX "post send error %d\n", ret); @@ -995,6 +1092,10 @@ ret = -EINVAL; } break; + case 'D': + cb->use_dmamr = 1; + DEBUG_LOG(PFX "using dma mr\n"); + break; case 'p': cb->port = htons(optint); DEBUG_LOG(PFX "port %d\n", (int)optint); ==== //depot/projects/iwarp/sys/contrib/rdma/krping/krping.h#4 (text+ko) ==== @@ -54,22 +54,26 @@ struct ib_pd *pd; struct ib_qp *qp; struct ib_mr *dma_mr; + int use_dmamr; struct ib_recv_wr rq_wr; /* recv work request record */ struct ib_sge recv_sgl; /* recv single SGE */ struct krping_rdma_info recv_buf;/* malloc'd buffer */ DECLARE_PCI_UNMAP_ADDR(recv_mapping) + struct ib_mr *recv_mr; struct ib_send_wr sq_wr; /* send work requrest record */ struct ib_sge send_sgl; struct krping_rdma_info send_buf;/* single send buf */ DECLARE_PCI_UNMAP_ADDR(send_mapping) + struct ib_mr *send_mr; struct ib_send_wr rdma_sq_wr; /* rdma work request record */ struct ib_sge rdma_sgl; /* rdma single SGE */ char *rdma_buf; /* used as rdma sink */ u64 rdma_addr; DECLARE_PCI_UNMAP_ADDR(rdma_mapping) + struct ib_mr *rdma_mr; uint32_t remote_rkey; /* remote guys RKEY */ uint64_t remote_addr; /* remote guys TO */ @@ -78,6 +82,7 @@ char *start_buf; /* rdma read src */ u64 start_addr; DECLARE_PCI_UNMAP_ADDR(start_mapping) + struct ib_mr *start_mr; enum test_state state; /* used for cond/signalling */ struct mtx lock; From owner-p4-projects@FreeBSD.ORG Tue Jan 15 02:11:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 74F0816A421; Tue, 15 Jan 2008 02:11:16 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3A74016A419 for ; Tue, 15 Jan 2008 02:11:16 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 21E9A13C4E1 for ; Tue, 15 Jan 2008 02:11:16 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0F2BG4Q011776 for ; Tue, 15 Jan 2008 02:11:16 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0F2BGxS011728 for perforce@freebsd.org; Tue, 15 Jan 2008 02:11:16 GMT (envelope-from swise@FreeBSD.org) Date: Tue, 15 Jan 2008 02:11:16 GMT Message-Id: <200801150211.m0F2BGxS011728@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 133299 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 02:11:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=133299 Change 133299 by swise@swise:vic10:iwarp on 2008/01/15 02:10:25 YAGF - Yet Another Genpool Fix! wasn't rounding up the chunks correctly. Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.h#8 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.h#8 (text+ko) ==== @@ -249,7 +249,7 @@ int chunks; daddr_t blkno; - chunks = size >> gp->gen_chunk_shift; + chunks = (size + (1<gen_chunk_shift) - 1) >> gp->gen_chunk_shift; blkno = blist_alloc(gp->gen_list, chunks); if (blkno == SWAPBLK_NONE) @@ -258,29 +258,13 @@ return (gp->gen_base + ((1 << gp->gen_chunk_shift) * blkno)); } -#define cxio_wait(ctx, lockp, cond) \ -({ \ - int __ret = 0; \ - mtx_lock_spin(lockp); \ - while (!cond) { \ - msleep_spin(ctx, lockp, "cxio_wait", hz); \ - if (SIGPENDING(curthread)) { \ - __ret = ERESTART; \ - break; \ - } \ - } \ - mtx_unlock_spin(lockp); \ - __ret; \ -}) - - static __inline void gen_pool_free(struct gen_pool *gp, daddr_t address, int size) { int chunks; daddr_t blkno; - chunks = size >> gp->gen_chunk_shift; + chunks = (size + (1<gen_chunk_shift) - 1) >> gp->gen_chunk_shift; blkno = (address - gp->gen_base) / (1 << gp->gen_chunk_shift); blist_free(gp->gen_list, blkno, chunks); } @@ -292,4 +276,19 @@ free(gp, M_DEVBUF); } +#define cxio_wait(ctx, lockp, cond) \ +({ \ + int __ret = 0; \ + mtx_lock_spin(lockp); \ + while (!cond) { \ + msleep_spin(ctx, lockp, "cxio_wait", hz); \ + if (SIGPENDING(curthread)) { \ + __ret = ERESTART; \ + break; \ + } \ + } \ + mtx_unlock_spin(lockp); \ + __ret; \ +}) + #endif From owner-p4-projects@FreeBSD.ORG Tue Jan 15 02:37:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D8C216A49E; Tue, 15 Jan 2008 02:37:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2AD8D16A496 for ; Tue, 15 Jan 2008 02:37:44 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 15F5B13C461 for ; Tue, 15 Jan 2008 02:37:44 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0F2bhN1015874 for ; Tue, 15 Jan 2008 02:37:43 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0F2bh9x015871 for perforce@freebsd.org; Tue, 15 Jan 2008 02:37:43 GMT (envelope-from imp@freebsd.org) Date: Tue, 15 Jan 2008 02:37:43 GMT Message-Id: <200801150237.m0F2bh9x015871@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133302 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 02:37:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=133302 Change 133302 by imp@imp_lighthouse on 2008/01/15 02:37:13 Update... Affected files ... .. //depot/projects/mips2-jnpr/src/sys/TODO#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/TODO#2 (text+ko) ==== @@ -1,5 +1,5 @@ o Sort out MIPS_COP_0_STATUS (defined as _(12)) vs COP_0_STATUS_REG (defined - as $12) + as $12) This is cpu.h vs cpureg.h or a 'netbsd' vs 'openbsd' argument. o Can we remove PDP_ENDIAN? o Can we remove a.out junk o Can we remove pre-ansi stuff @@ -9,5 +9,8 @@ o cpu.c in mips2 appears to be done in machdep in jnpr. reconcile cpu.c in jmips is just for the cpu device driver. o Look at the differences between the trampoline code between the two versions - as this may lead to problems. - + as this may lead to problems. Specifically, we have sigcode encoded + into locore.S, and some code in sigreturn in pm_machdep.c. Not sure where + things are in libc. +o What does that assmbler before mi_startup do in locore.S Comment or + remove. From owner-p4-projects@FreeBSD.ORG Tue Jan 15 05:25:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24DFE16A420; Tue, 15 Jan 2008 05:25:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DEB5116A417 for ; Tue, 15 Jan 2008 05:25:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E2A3113C459 for ; Tue, 15 Jan 2008 05:25:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0F5Pe10055006 for ; Tue, 15 Jan 2008 05:25:40 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0F5Peiu055003 for perforce@freebsd.org; Tue, 15 Jan 2008 05:25:40 GMT (envelope-from sam@freebsd.org) Date: Tue, 15 Jan 2008 05:25:40 GMT Message-Id: <200801150525.m0F5Peiu055003@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133310 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 05:25:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=133310 Change 133310 by sam@sam_ebb on 2008/01/15 05:24:57 revert use of iv_txseq for now; need to be more careful doing this Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_output.c#23 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_output.c#23 (text+ko) ==== @@ -392,13 +392,11 @@ const uint8_t bssid[IEEE80211_ADDR_LEN]) { #define WH4(wh) ((struct ieee80211_frame_addr4 *)wh) -#define PROBE_RESP \ - ((IEEE80211_FC0_TYPE_MGT << IEEE80211_FC0_TYPE_SHIFT) | \ - (IEEE80211_FC0_SUBTYPE_PROBE_RESP << IEEE80211_FC0_SUBTYPE_SHIFT)) - struct ieee80211vap *vap = ni->ni_vap; wh->i_fc[0] = IEEE80211_FC0_VERSION_0 | type; if ((type & IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_DATA) { + struct ieee80211vap *vap = ni->ni_vap; + switch (vap->iv_opmode) { case IEEE80211_M_STA: wh->i_fc[1] = IEEE80211_FC1_DIR_TODS; @@ -436,19 +434,11 @@ IEEE80211_ADDR_COPY(wh->i_addr3, bssid); } *(uint16_t *)&wh->i_dur[0] = 0; - if (type == PROBE_RESP) { - /* NB: use per-vap seq# space */ - *(uint16_t *)&wh->i_seq[0] = - htole16(vap->iv_txseq << IEEE80211_SEQ_SEQ_SHIFT); - vap->iv_txseq++; - } else { - /* NB: use non-QoS tid */ - *(uint16_t *)&wh->i_seq[0] = - htole16(ni->ni_txseqs[IEEE80211_NONQOS_TID] << - IEEE80211_SEQ_SEQ_SHIFT); - ni->ni_txseqs[IEEE80211_NONQOS_TID]++; - } -#undef PROBE_RESP + /* XXX probe response use per-vap seq#? */ + /* NB: use non-QoS tid */ + *(uint16_t *)&wh->i_seq[0] = + htole16(ni->ni_txseqs[IEEE80211_NONQOS_TID] << IEEE80211_SEQ_SEQ_SHIFT); + ni->ni_txseqs[IEEE80211_NONQOS_TID]++; #undef WH4 } @@ -2423,9 +2413,6 @@ uint16_t capinfo; IEEE80211_LOCK(ic); - *(uint16_t *)&mtod(m, struct ieee80211_frame *)->i_seq[0] = - htole16(vap->iv_txseq << IEEE80211_SEQ_SEQ_SHIFT); - vap->iv_txseq++; /* * Handle 11h channel change when we've reached the count. * We must recalculate the beacon frame contents to account From owner-p4-projects@FreeBSD.ORG Tue Jan 15 10:03:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE90A16A421; Tue, 15 Jan 2008 10:03:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A46D416A41A for ; Tue, 15 Jan 2008 10:03:47 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A03DD13C459 for ; Tue, 15 Jan 2008 10:03:47 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FA3l65090334 for ; Tue, 15 Jan 2008 10:03:47 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FA3l6B090331 for perforce@freebsd.org; Tue, 15 Jan 2008 10:03:47 GMT (envelope-from sephe@FreeBSD.org) Date: Tue, 15 Jan 2008 10:03:47 GMT Message-Id: <200801151003.m0FA3l6B090331@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 133319 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 10:03:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=133319 Change 133319 by sephe@sephe_zealot:sam_wifi on 2008/01/15 10:02:51 More ids Obtained from: Ralink RT73 Affected files ... .. //depot/projects/wifi/sys/dev/usb/if_rum.c#10 edit .. //depot/projects/wifi/sys/dev/usb/usbdevs#35 edit Differences ... ==== //depot/projects/wifi/sys/dev/usb/if_rum.c#10 (text+ko) ==== @@ -113,13 +113,15 @@ { USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUSMM }, { USB_VENDOR_QCOM, USB_PRODUCT_QCOM_RT2573 }, { USB_VENDOR_QCOM, USB_PRODUCT_QCOM_RT2573_2 }, + { USB_VENDOR_QCOM, USB_PRODUCT_QCOM_RT2573_3 }, { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2573 }, { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2573_2 }, { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2671 }, { USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL113R2 }, { USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL172 }, { USB_VENDOR_SPARKLAN, USB_PRODUCT_SPARKLAN_RT2573 }, - { USB_VENDOR_SURECOM, USB_PRODUCT_SURECOM_RT2573 } + { USB_VENDOR_SURECOM, USB_PRODUCT_SURECOM_RT2573 }, + { USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_RT2573 } }; MODULE_DEPEND(rum, wlan, 1, 1, 1); ==== //depot/projects/wifi/sys/dev/usb/usbdevs#35 (text+ko) ==== @@ -1913,6 +1913,7 @@ /* Qcom products */ product QCOM RT2573 0x6196 RT2573 product QCOM RT2573_2 0x6229 RT2573 +product QCOM RT2573_3 0x6238 RT2573 /* Qualcomm products */ product QUALCOMM CDMA_MSM 0x6000 CDMA Technologies MSM phone @@ -2341,3 +2342,4 @@ product ZYXEL AG225H 0x3409 AG-225H product ZYXEL M202 0x340a M-202 product ZYXEL G220V2 0x340f G-220 v2 +product ZYXEL RT2573 0x3415 RT2573 From owner-p4-projects@FreeBSD.ORG Tue Jan 15 10:22:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7ADC916A419; Tue, 15 Jan 2008 10:22:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4062316A418 for ; Tue, 15 Jan 2008 10:22:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3D9B913C447 for ; Tue, 15 Jan 2008 10:22:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FAM8RN092636 for ; Tue, 15 Jan 2008 10:22:08 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FAM7v6092631 for perforce@freebsd.org; Tue, 15 Jan 2008 10:22:07 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Jan 2008 10:22:07 GMT Message-Id: <200801151022.m0FAM7v6092631@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133320 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 10:22:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=133320 Change 133320 by jb@jb_freebsd1 on 2008/01/15 10:21:14 Catch up with the vn_lock/VOP_UNLOCK changes. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#3 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#3 (text+ko) ==== @@ -321,7 +321,7 @@ VN_HOLD(pvp); *vpp = pvp; } - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, curthread); + vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); return (0); } ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 (text+ko) ==== @@ -391,7 +391,7 @@ if (strcmp(nm, "..") == 0) { err = VFS_ROOT(dvp->v_vfsp, LK_EXCLUSIVE, vpp, curthread); if (err == 0) - VOP_UNLOCK(*vpp, 0, curthread); + VOP_UNLOCK(*vpp, 0); } else { err = gfs_dir_lookup(dvp, nm, vpp); } @@ -429,7 +429,7 @@ err = zfsctl_root_lookup(dvp, nm, vpp, NULL, 0, NULL, cr); if (err == 0 && (nm[0] != '.' || nm[1] != '\0')) - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, ap->a_cnp->cn_thread); + vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); return (err); } @@ -692,7 +692,7 @@ */ goto domount; } - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, ap->a_cnp->cn_thread); + vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); mutex_exit(&sdp->sd_lock); ZFS_EXIT(zfsvfs); return (0); @@ -732,7 +732,7 @@ kmem_free(mountpoint, mountpoint_len); /* FreeBSD: This line was moved from below to avoid a lock recursion. */ if (err == 0) - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, curthread); + vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); mutex_exit(&sdp->sd_lock); /* @@ -882,7 +882,7 @@ VERIFY(gfs_dir_lookup(vp, "..", &dvp) == 0); sdp = dvp->v_data; - VOP_UNLOCK(dvp, 0, ap->a_td); + VOP_UNLOCK(dvp, 0); if (!(locked = MUTEX_HELD(&sdp->sd_lock))) mutex_enter(&sdp->sd_lock); ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 (text+ko) ==== @@ -109,7 +109,7 @@ cn.cn_thread = curthread; cn.cn_flags = SAVENAME; - vn_lock(ZTOV(dzp), LK_EXCLUSIVE | LK_RETRY, curthread); + vn_lock(ZTOV(dzp), LK_EXCLUSIVE | LK_RETRY); switch ((int)lr->lr_common.lrc_txtype) { case TX_CREATE: error = VOP_CREATE(ZTOV(dzp), &vp, &cn, &va); @@ -127,10 +127,10 @@ default: error = ENOTSUP; } - VOP_UNLOCK(ZTOV(dzp), 0, curthread); + VOP_UNLOCK(ZTOV(dzp), 0); if (error == 0 && vp != NULL) { - VOP_UNLOCK(vp, 0, curthread); + VOP_UNLOCK(vp, 0); VN_RELE(vp); } @@ -162,10 +162,10 @@ cn.cn_lkflags = LK_EXCLUSIVE | LK_RETRY; cn.cn_cred = kcred; cn.cn_thread = curthread; - vn_lock(ZTOV(dzp), LK_EXCLUSIVE | LK_RETRY, curthread); + vn_lock(ZTOV(dzp), LK_EXCLUSIVE | LK_RETRY); error = VOP_LOOKUP(ZTOV(dzp), &vp, &cn); if (error != 0) { - VOP_UNLOCK(ZTOV(dzp), 0, curthread); + VOP_UNLOCK(ZTOV(dzp), 0); goto fail; } @@ -180,7 +180,7 @@ error = ENOTSUP; } vput(vp); - VOP_UNLOCK(ZTOV(dzp), 0, curthread); + VOP_UNLOCK(ZTOV(dzp), 0); fail: VN_RELE(ZTOV(dzp)); @@ -211,11 +211,11 @@ cn.cn_thread = curthread; cn.cn_flags = SAVENAME; - vn_lock(ZTOV(dzp), LK_EXCLUSIVE | LK_RETRY, curthread); - vn_lock(ZTOV(zp), LK_EXCLUSIVE | LK_RETRY, curthread); + vn_lock(ZTOV(dzp), LK_EXCLUSIVE | LK_RETRY); + vn_lock(ZTOV(zp), LK_EXCLUSIVE | LK_RETRY); error = VOP_LINK(ZTOV(dzp), ZTOV(zp), &cn); - VOP_UNLOCK(ZTOV(zp), 0, curthread); - VOP_UNLOCK(ZTOV(dzp), 0, curthread); + VOP_UNLOCK(ZTOV(zp), 0); + VOP_UNLOCK(ZTOV(dzp), 0); VN_RELE(ZTOV(zp)); VN_RELE(ZTOV(dzp)); @@ -255,12 +255,12 @@ scn.cn_lkflags = LK_EXCLUSIVE | LK_RETRY; scn.cn_cred = kcred; scn.cn_thread = td; - vn_lock(ZTOV(sdzp), LK_EXCLUSIVE | LK_RETRY, td); + vn_lock(ZTOV(sdzp), LK_EXCLUSIVE | LK_RETRY); error = VOP_LOOKUP(ZTOV(sdzp), &svp, &scn); - VOP_UNLOCK(ZTOV(sdzp), 0, td); + VOP_UNLOCK(ZTOV(sdzp), 0); if (error != 0) goto fail; - VOP_UNLOCK(svp, 0, td); + VOP_UNLOCK(svp, 0); bzero(&tcn, sizeof(tcn)); tcn.cn_nameptr = tname; @@ -270,12 +270,12 @@ tcn.cn_lkflags = LK_EXCLUSIVE | LK_RETRY; tcn.cn_cred = kcred; tcn.cn_thread = td; - vn_lock(ZTOV(tdzp), LK_EXCLUSIVE | LK_RETRY, td); + vn_lock(ZTOV(tdzp), LK_EXCLUSIVE | LK_RETRY); error = VOP_LOOKUP(ZTOV(tdzp), &tvp, &tcn); if (error == EJUSTRETURN) tvp = NULL; else if (error != 0) { - VOP_UNLOCK(ZTOV(tdzp), 0, td); + VOP_UNLOCK(ZTOV(tdzp), 0); goto fail; } @@ -360,9 +360,9 @@ ZFS_TIME_DECODE(&va.va_mtime, lr->lr_mtime); vp = ZTOV(zp); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); error = VOP_SETATTR(vp, &va, kcred, curthread); - VOP_UNLOCK(vp, 0, curthread); + VOP_UNLOCK(vp, 0); VN_RELE(vp); return (error); ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 (text+ko) ==== @@ -663,7 +663,7 @@ error = zfs_zget(zfsvfs, zfsvfs->z_root, &rootzp); if (error == 0) { *vpp = ZTOV(rootzp); - error = vn_lock(*vpp, flags, td); + error = vn_lock(*vpp, flags); (*vpp)->v_vflag |= VV_ROOT; } @@ -763,7 +763,7 @@ *vpp = NULL; else { *vpp = ZTOV(zp); - vn_lock(*vpp, flags, curthread); + vn_lock(*vpp, flags); } ZFS_EXIT(zfsvfs); return (err); @@ -830,7 +830,7 @@ } ZFS_EXIT(zfsvfs); /* XXX: LK_RETRY? */ - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, td); + vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); return (0); } @@ -853,7 +853,7 @@ *vpp = ZTOV(zp); /* XXX: LK_RETRY? */ - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, td); + vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); vnode_create_vobject(*vpp, zp->z_phys->zp_size, td); ZFS_EXIT(zfsvfs); return (0); ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 (text+ko) ==== @@ -1114,11 +1114,11 @@ if (cnp->cn_flags & ISDOTDOT) { ltype = VOP_ISLOCKED(dvp, td); - VOP_UNLOCK(dvp, 0, td); + VOP_UNLOCK(dvp, 0); } - error = vn_lock(*vpp, cnp->cn_lkflags, td); + error = vn_lock(*vpp, cnp->cn_lkflags); if (cnp->cn_flags & ISDOTDOT) - vn_lock(dvp, ltype | LK_RETRY, td); + vn_lock(dvp, ltype | LK_RETRY); if (error != 0) { VN_RELE(*vpp); *vpp = NULL; @@ -1302,7 +1302,7 @@ if (error == 0) { *vpp = ZTOV(zp); - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, td); + vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); } if (dl) @@ -1584,7 +1584,7 @@ zfs_log_create(zilog, tx, TX_MKDIR, dzp, zp, dirname); dmu_tx_commit(tx); - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, curthread); + vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); zfs_dirent_unlock(dl); @@ -2769,7 +2769,7 @@ if (error == 0) { zfs_log_symlink(zilog, tx, TX_SYMLINK, dzp, zp, name, link); *vpp = ZTOV(zp); - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, td); + vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); } dmu_tx_commit(tx); ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 (text+ko) ==== @@ -85,9 +85,9 @@ ZTOV(zp) = NULL; vhold(vp); mutex_exit(&zp->z_lock); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); vrecycle(vp, curthread); - VOP_UNLOCK(vp, 0, curthread); + VOP_UNLOCK(vp, 0); vdrop(vp); zfs_znode_free(zp); } else { From owner-p4-projects@FreeBSD.ORG Tue Jan 15 10:33:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64C5C16A46B; Tue, 15 Jan 2008 10:33:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 26DB516A420 for ; Tue, 15 Jan 2008 10:33:20 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BD07113C461 for ; Tue, 15 Jan 2008 10:33:19 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FAXJPI097158 for ; Tue, 15 Jan 2008 10:33:19 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FAXJHH097155 for perforce@freebsd.org; Tue, 15 Jan 2008 10:33:19 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Jan 2008 10:33:19 GMT Message-Id: <200801151033.m0FAXJHH097155@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133321 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 10:33:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=133321 Change 133321 by jb@jb_freebsd1 on 2008/01/15 10:32:23 We will use _ONLY_ our own sdt.h to avoid any problems with CDDL'd code. Affected files ... .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/sdt.h#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#3 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/sdt_impl.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Jan 15 19:41:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F106516A469; Tue, 15 Jan 2008 19:41:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9BD7316A420 for ; Tue, 15 Jan 2008 19:41:15 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7E6ED13C458 for ; Tue, 15 Jan 2008 19:41:15 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FJfFF9094500 for ; Tue, 15 Jan 2008 19:41:15 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FJfFYN094466 for perforce@freebsd.org; Tue, 15 Jan 2008 19:41:15 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 15 Jan 2008 19:41:15 GMT Message-Id: <200801151941.m0FJfFYN094466@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 133339 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 19:41:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=133339 Change 133339 by hselasky@hselasky_laptop001 on 2008/01/15 19:40:23 Compile fix for FreeBSD 7.0-RC1. Reported by "Stefan Lambrev". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_port.h#24 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_port.h#24 (text+ko) ==== @@ -194,7 +194,7 @@ #include "opt_usb.h" -#if (__FreeBSD_version >= 700000) +#if (__FreeBSD_version >= 800000) #define usb_thread_create(f, s, p, ...) \ kproc_create((f), (s), (p), RFHIGHPID, 0, __VA_ARGS__) #define usb_thread_exit(err) kproc_exit(err) From owner-p4-projects@FreeBSD.ORG Tue Jan 15 19:44:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C375616A419; Tue, 15 Jan 2008 19:44:20 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8871016A417 for ; Tue, 15 Jan 2008 19:44:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6AF6913C4E5 for ; Tue, 15 Jan 2008 19:44:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FJiKMD094919 for ; Tue, 15 Jan 2008 19:44:20 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FJiKe1094914 for perforce@freebsd.org; Tue, 15 Jan 2008 19:44:20 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 15 Jan 2008 19:44:20 GMT Message-Id: <200801151944.m0FJiKe1094914@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 133340 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 19:44:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=133340 Change 133340 by hselasky@hselasky_laptop001 on 2008/01/15 19:43:41 Try to work around some compiler warnings "xfer[2] and xfer[3] might be used uninitialized" which is not the case on FreeBSD 7.0-RC1. Reported by "Stefan Lambrev". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#104 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#104 (text+ko) ==== @@ -2110,31 +2110,33 @@ repeat: xfer[0] = LIST_FIRST(&(info->done_head)); if (xfer[0]) { + do { LIST_REMOVE(xfer[0], done_list); xfer[0]->done_list.le_prev = NULL; xfer[1] = LIST_FIRST(&(info->done_head)); if (xfer[1] == NULL) { dropcount = 1; - goto lockchange_0; + break; } LIST_REMOVE(xfer[1], done_list); xfer[1]->done_list.le_prev = NULL; xfer[2] = LIST_FIRST(&(info->done_head)); if (xfer[2] == NULL) { dropcount = 2; - goto lockchange_0; + break; } LIST_REMOVE(xfer[2], done_list); xfer[2]->done_list.le_prev = NULL; xfer[3] = LIST_FIRST(&(info->done_head)); if (xfer[3] == NULL) { dropcount = 3; - goto lockchange_0; + break; } LIST_REMOVE(xfer[3], done_list); xfer[3]->done_list.le_prev = NULL; dropcount = 4; -lockchange_0: + } while (0); + mtx_unlock(info->usb_mtx); /* @@ -2144,20 +2146,18 @@ mtx_lock(info->priv_mtx); /* call callback(s) */ + switch (dropcount) { + case 4: + usbd_callback_wrapper(xfer[3], info, USBD_CONTEXT_CALLBACK); + case 3: + usbd_callback_wrapper(xfer[2], info, USBD_CONTEXT_CALLBACK); + case 2: + usbd_callback_wrapper(xfer[1], info, USBD_CONTEXT_CALLBACK); + case 1: usbd_callback_wrapper(xfer[0], info, USBD_CONTEXT_CALLBACK); - if (xfer[1] == NULL) { - goto lockchange_1; - } - usbd_callback_wrapper(xfer[1], info, USBD_CONTEXT_CALLBACK); - if (xfer[2] == NULL) { - goto lockchange_1; - } - usbd_callback_wrapper(xfer[2], info, USBD_CONTEXT_CALLBACK); - if (xfer[3] == NULL) { - goto lockchange_1; + default: + break; } - usbd_callback_wrapper(xfer[3], info, USBD_CONTEXT_CALLBACK); -lockchange_1: mtx_unlock(info->priv_mtx); mtx_lock(info->usb_mtx); From owner-p4-projects@FreeBSD.ORG Tue Jan 15 19:45:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9C9516A41A; Tue, 15 Jan 2008 19:45:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9F76B16A418 for ; Tue, 15 Jan 2008 19:45:21 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9AD8B13C459 for ; Tue, 15 Jan 2008 19:45:21 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FJjLu2095089 for ; Tue, 15 Jan 2008 19:45:21 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FJjLZ5095086 for perforce@freebsd.org; Tue, 15 Jan 2008 19:45:21 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 15 Jan 2008 19:45:21 GMT Message-Id: <200801151945.m0FJjLZ5095086@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 133341 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 19:45:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=133341 Change 133341 by hselasky@hselasky_laptop001 on 2008/01/15 19:44:37 Style change by "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#105 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#105 (text+ko) ==== @@ -2110,32 +2110,32 @@ repeat: xfer[0] = LIST_FIRST(&(info->done_head)); if (xfer[0]) { - do { - LIST_REMOVE(xfer[0], done_list); - xfer[0]->done_list.le_prev = NULL; - xfer[1] = LIST_FIRST(&(info->done_head)); - if (xfer[1] == NULL) { - dropcount = 1; - break; - } - LIST_REMOVE(xfer[1], done_list); - xfer[1]->done_list.le_prev = NULL; - xfer[2] = LIST_FIRST(&(info->done_head)); - if (xfer[2] == NULL) { - dropcount = 2; - break; - } - LIST_REMOVE(xfer[2], done_list); - xfer[2]->done_list.le_prev = NULL; - xfer[3] = LIST_FIRST(&(info->done_head)); - if (xfer[3] == NULL) { - dropcount = 3; - break; - } - LIST_REMOVE(xfer[3], done_list); - xfer[3]->done_list.le_prev = NULL; - dropcount = 4; - } while (0); + do { + LIST_REMOVE(xfer[0], done_list); + xfer[0]->done_list.le_prev = NULL; + xfer[1] = LIST_FIRST(&(info->done_head)); + if (xfer[1] == NULL) { + dropcount = 1; + break; + } + LIST_REMOVE(xfer[1], done_list); + xfer[1]->done_list.le_prev = NULL; + xfer[2] = LIST_FIRST(&(info->done_head)); + if (xfer[2] == NULL) { + dropcount = 2; + break; + } + LIST_REMOVE(xfer[2], done_list); + xfer[2]->done_list.le_prev = NULL; + xfer[3] = LIST_FIRST(&(info->done_head)); + if (xfer[3] == NULL) { + dropcount = 3; + break; + } + LIST_REMOVE(xfer[3], done_list); + xfer[3]->done_list.le_prev = NULL; + dropcount = 4; + } while (0); mtx_unlock(info->usb_mtx); @@ -2148,13 +2148,13 @@ /* call callback(s) */ switch (dropcount) { case 4: - usbd_callback_wrapper(xfer[3], info, USBD_CONTEXT_CALLBACK); + usbd_callback_wrapper(xfer[3], info, USBD_CONTEXT_CALLBACK); case 3: - usbd_callback_wrapper(xfer[2], info, USBD_CONTEXT_CALLBACK); + usbd_callback_wrapper(xfer[2], info, USBD_CONTEXT_CALLBACK); case 2: - usbd_callback_wrapper(xfer[1], info, USBD_CONTEXT_CALLBACK); + usbd_callback_wrapper(xfer[1], info, USBD_CONTEXT_CALLBACK); case 1: - usbd_callback_wrapper(xfer[0], info, USBD_CONTEXT_CALLBACK); + usbd_callback_wrapper(xfer[0], info, USBD_CONTEXT_CALLBACK); default: break; } From owner-p4-projects@FreeBSD.ORG Tue Jan 15 20:38:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C81E16A41A; Tue, 15 Jan 2008 20:38:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0E9DE16A419 for ; Tue, 15 Jan 2008 20:38:06 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0666C13C4EA for ; Tue, 15 Jan 2008 20:38:06 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FKc5xw027522 for ; Tue, 15 Jan 2008 20:38:05 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FKanmO027436 for perforce@freebsd.org; Tue, 15 Jan 2008 20:36:49 GMT (envelope-from sam@freebsd.org) Date: Tue, 15 Jan 2008 20:36:49 GMT Message-Id: <200801152036.m0FKanmO027436@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133344 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 20:38:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=133344 Change 133344 by sam@sam_ebb on 2008/01/15 20:36:48 IFC @ 133343 Affected files ... .. //depot/projects/vap/COPYRIGHT#3 integrate .. //depot/projects/vap/Makefile#3 integrate .. //depot/projects/vap/Makefile.inc1#3 integrate .. //depot/projects/vap/ObsoleteFiles.inc#3 integrate .. //depot/projects/vap/bin/cp/cp.c#3 integrate .. //depot/projects/vap/bin/ed/Makefile#3 integrate .. //depot/projects/vap/bin/mv/mv.c#3 integrate .. //depot/projects/vap/bin/sh/sh.1#3 integrate .. //depot/projects/vap/contrib/amd/AUTHORS#3 integrate .. //depot/projects/vap/contrib/amd/BUGS#3 integrate .. //depot/projects/vap/contrib/amd/COPYING#3 integrate .. //depot/projects/vap/contrib/amd/ChangeLog#3 integrate .. //depot/projects/vap/contrib/amd/FAQ#1 branch .. //depot/projects/vap/contrib/amd/FREEBSD-Xlist#3 integrate .. //depot/projects/vap/contrib/amd/FREEBSD-upgrade#3 integrate .. //depot/projects/vap/contrib/amd/INSTALL#3 integrate .. //depot/projects/vap/contrib/amd/NEWS#3 integrate .. //depot/projects/vap/contrib/amd/README.attrcache#1 branch .. //depot/projects/vap/contrib/amd/README.ldap#3 integrate .. //depot/projects/vap/contrib/amd/amd/am_ops.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/amd.8#3 integrate .. //depot/projects/vap/contrib/amd/amd/amd.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/amd.h#3 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_auto.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_direct.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_error.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_generic.c#1 branch .. //depot/projects/vap/contrib/amd/amd/amfs_host.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_inherit.c#3 delete .. //depot/projects/vap/contrib/amd/amd/amfs_link.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_linkx.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_nfsl.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_nfsx.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_program.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_root.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_toplvl.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_union.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/amq_subr.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/amq_svc.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/autil.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/clock.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/conf.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/conf_parse.y#3 integrate .. //depot/projects/vap/contrib/amd/amd/conf_tok.l#3 integrate .. //depot/projects/vap/contrib/amd/amd/get_args.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/info_exec.c#1 branch .. //depot/projects/vap/contrib/amd/amd/info_file.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/info_hesiod.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/info_ldap.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/info_ndbm.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/info_nis.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/info_nisplus.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/info_passwd.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/info_union.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/map.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/mapc.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/mntfs.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/nfs_prot_svc.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/nfs_start.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/nfs_subr.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/ops_TEMPLATE.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/ops_cachefs.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/ops_cdfs.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/ops_efs.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/ops_lofs.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/ops_mfs.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/ops_nfs.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/ops_nfs3.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/ops_nullfs.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/ops_pcfs.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/ops_tfs.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/ops_tmpfs.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/ops_ufs.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/ops_umapfs.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/ops_unionfs.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/ops_xfs.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/opts.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/readdir.c#1 branch .. //depot/projects/vap/contrib/amd/amd/restart.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/rpc_fwd.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/sched.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/srvr_amfs_auto.c#3 integrate .. //depot/projects/vap/contrib/amd/amd/srvr_nfs.c#3 integrate .. //depot/projects/vap/contrib/amd/amq/amq.8#3 integrate .. //depot/projects/vap/contrib/amd/amq/amq.c#3 integrate .. //depot/projects/vap/contrib/amd/amq/amq.h#3 integrate .. //depot/projects/vap/contrib/amd/amq/amq_clnt.c#3 integrate .. //depot/projects/vap/contrib/amd/amq/amq_xdr.c#3 integrate .. //depot/projects/vap/contrib/amd/amq/pawd.1#3 integrate .. //depot/projects/vap/contrib/amd/amq/pawd.c#3 integrate .. //depot/projects/vap/contrib/amd/aux_conf.h.in#3 integrate .. //depot/projects/vap/contrib/amd/bootstrap#3 integrate .. //depot/projects/vap/contrib/amd/conf/checkmount/checkmount_bsd44.c#3 integrate .. //depot/projects/vap/contrib/amd/conf/mtab/mtab_bsd.c#3 integrate .. //depot/projects/vap/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#3 integrate .. //depot/projects/vap/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#3 integrate .. //depot/projects/vap/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#3 integrate .. //depot/projects/vap/contrib/amd/conf/transp/transp_sockets.c#3 integrate .. //depot/projects/vap/contrib/amd/conf/trap/trap_default.h#3 integrate .. //depot/projects/vap/contrib/amd/conf/umount/umount_bsd44.c#3 integrate .. //depot/projects/vap/contrib/amd/doc/am-utils.texi#3 integrate .. //depot/projects/vap/contrib/amd/doc/stamp-vti#1 branch .. //depot/projects/vap/contrib/amd/doc/texinfo.tex#3 integrate .. //depot/projects/vap/contrib/amd/doc/version.texi#3 integrate .. //depot/projects/vap/contrib/amd/fixmount/fixmount.8#3 integrate .. //depot/projects/vap/contrib/amd/fixmount/fixmount.c#3 integrate .. //depot/projects/vap/contrib/amd/fsinfo/fsi_analyze.c#3 integrate .. //depot/projects/vap/contrib/amd/fsinfo/fsi_data.h#3 integrate .. //depot/projects/vap/contrib/amd/fsinfo/fsi_dict.c#3 integrate .. //depot/projects/vap/contrib/amd/fsinfo/fsi_gram.y#3 integrate .. //depot/projects/vap/contrib/amd/fsinfo/fsi_lex.l#3 integrate .. //depot/projects/vap/contrib/amd/fsinfo/fsi_util.c#3 integrate .. //depot/projects/vap/contrib/amd/fsinfo/fsinfo.8#3 integrate .. //depot/projects/vap/contrib/amd/fsinfo/fsinfo.c#3 integrate .. //depot/projects/vap/contrib/amd/fsinfo/fsinfo.h#3 integrate .. //depot/projects/vap/contrib/amd/fsinfo/wr_atab.c#3 integrate .. //depot/projects/vap/contrib/amd/fsinfo/wr_bparam.c#3 integrate .. //depot/projects/vap/contrib/amd/fsinfo/wr_dumpset.c#3 integrate .. //depot/projects/vap/contrib/amd/fsinfo/wr_exportfs.c#3 integrate .. //depot/projects/vap/contrib/amd/fsinfo/wr_fstab.c#3 integrate .. //depot/projects/vap/contrib/amd/hlfsd/hlfsd.8#3 integrate .. //depot/projects/vap/contrib/amd/hlfsd/hlfsd.c#3 integrate .. //depot/projects/vap/contrib/amd/hlfsd/hlfsd.h#3 integrate .. //depot/projects/vap/contrib/amd/hlfsd/homedir.c#3 integrate .. //depot/projects/vap/contrib/amd/hlfsd/nfs_prot_svc.c#3 integrate .. //depot/projects/vap/contrib/amd/hlfsd/stubs.c#3 integrate .. //depot/projects/vap/contrib/amd/include/am_compat.h#3 integrate .. //depot/projects/vap/contrib/amd/include/am_defs.h#3 integrate .. //depot/projects/vap/contrib/amd/include/am_utils.h#3 integrate .. //depot/projects/vap/contrib/amd/include/am_xdr_func.h#3 integrate .. //depot/projects/vap/contrib/amd/include/amq_defs.h#3 integrate .. //depot/projects/vap/contrib/amd/include/mount_headers1.h#3 integrate .. //depot/projects/vap/contrib/amd/include/mount_headers2.h#3 integrate .. //depot/projects/vap/contrib/amd/ldap-id.ms#3 integrate .. //depot/projects/vap/contrib/amd/ldap.schema#1 branch .. //depot/projects/vap/contrib/amd/libamu/alloca.c#3 delete .. //depot/projects/vap/contrib/amd/libamu/amu.h#3 integrate .. //depot/projects/vap/contrib/amd/libamu/hasmntopt.c#3 integrate .. //depot/projects/vap/contrib/amd/libamu/misc_rpc.c#3 integrate .. //depot/projects/vap/contrib/amd/libamu/mount_fs.c#3 integrate .. //depot/projects/vap/contrib/amd/libamu/mtab.c#3 integrate .. //depot/projects/vap/contrib/amd/libamu/nfs_prot_xdr.c#3 integrate .. //depot/projects/vap/contrib/amd/libamu/strerror.c#3 integrate .. //depot/projects/vap/contrib/amd/libamu/strutil.c#1 branch .. //depot/projects/vap/contrib/amd/libamu/util.c#3 delete .. //depot/projects/vap/contrib/amd/libamu/wire.c#3 integrate .. //depot/projects/vap/contrib/amd/libamu/xdr_func.c#3 integrate .. //depot/projects/vap/contrib/amd/libamu/xutil.c#3 integrate .. //depot/projects/vap/contrib/amd/m4/GNUmakefile#3 delete .. //depot/projects/vap/contrib/amd/m4/amdgrep#3 delete .. //depot/projects/vap/contrib/amd/m4/amindent#3 delete .. //depot/projects/vap/contrib/amd/m4/autopat#3 delete .. //depot/projects/vap/contrib/amd/m4/chop-aclocal.pl#3 delete .. //depot/projects/vap/contrib/amd/m4/copy-if-newbig#3 delete .. //depot/projects/vap/contrib/amd/m4/macros/HEADER#3 delete .. //depot/projects/vap/contrib/amd/m4/macros/TRAILER#3 delete .. //depot/projects/vap/contrib/amd/m4/mk-aclocal#3 delete .. //depot/projects/vap/contrib/amd/m4/mkconf#3 delete .. //depot/projects/vap/contrib/amd/m4/rmtspc#3 delete .. //depot/projects/vap/contrib/amd/m4/update_build_version#3 delete .. //depot/projects/vap/contrib/amd/mk-amd-map/mk-amd-map.8#3 integrate .. //depot/projects/vap/contrib/amd/mk-amd-map/mk-amd-map.c#3 integrate .. //depot/projects/vap/contrib/amd/scripts/am-eject.in#3 integrate .. //depot/projects/vap/contrib/amd/scripts/amd.conf-sample#3 integrate .. //depot/projects/vap/contrib/amd/scripts/amd.conf.5#3 integrate .. //depot/projects/vap/contrib/amd/scripts/amd2ldif.in#3 integrate .. //depot/projects/vap/contrib/amd/scripts/amd2sun.in#3 integrate .. //depot/projects/vap/contrib/amd/scripts/automount2amd.8#3 integrate .. //depot/projects/vap/contrib/amd/scripts/automount2amd.in#3 integrate .. //depot/projects/vap/contrib/amd/scripts/ctl-amd.in#3 integrate .. //depot/projects/vap/contrib/amd/scripts/ctl-hlfsd.in#3 integrate .. //depot/projects/vap/contrib/amd/scripts/expn.1#3 integrate .. //depot/projects/vap/contrib/amd/scripts/expn.in#3 integrate .. //depot/projects/vap/contrib/amd/scripts/fix-amd-map.in#3 integrate .. //depot/projects/vap/contrib/amd/scripts/fixrmtab.in#3 integrate .. //depot/projects/vap/contrib/amd/scripts/redhat-ctl-amd.in#3 integrate .. //depot/projects/vap/contrib/amd/scripts/test-attrcache.in#1 branch .. //depot/projects/vap/contrib/amd/scripts/wait4amd.in#3 integrate .. //depot/projects/vap/contrib/amd/scripts/wait4amd2die.in#3 integrate .. //depot/projects/vap/contrib/amd/tasks#3 integrate .. //depot/projects/vap/contrib/amd/vers.m4#1 branch .. //depot/projects/vap/contrib/amd/wire-test/wire-test.8#3 integrate .. //depot/projects/vap/contrib/amd/wire-test/wire-test.c#3 integrate .. //depot/projects/vap/contrib/bind9/CHANGES#3 integrate .. //depot/projects/vap/contrib/bind9/COPYRIGHT#3 integrate .. //depot/projects/vap/contrib/bind9/FAQ#3 integrate .. //depot/projects/vap/contrib/bind9/FAQ.xml#3 integrate .. //depot/projects/vap/contrib/bind9/Makefile.in#3 integrate .. //depot/projects/vap/contrib/bind9/README#3 integrate .. //depot/projects/vap/contrib/bind9/bin/check/check-tool.c#3 integrate .. //depot/projects/vap/contrib/bind9/bin/check/named-checkconf.8#3 integrate .. //depot/projects/vap/contrib/bind9/bin/check/named-checkconf.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/bin/check/named-checkconf.html#3 integrate .. //depot/projects/vap/contrib/bind9/bin/check/named-checkzone.8#3 integrate .. //depot/projects/vap/contrib/bind9/bin/check/named-checkzone.c#3 integrate .. //depot/projects/vap/contrib/bind9/bin/check/named-checkzone.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/bin/check/named-checkzone.html#3 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/dig.1#3 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/dig.c#3 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/dig.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/dig.html#3 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/host.1#3 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/host.c#3 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/host.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/host.html#3 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/nslookup.1#3 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/nslookup.c#3 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/nslookup.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/nslookup.html#3 integrate .. //depot/projects/vap/contrib/bind9/bin/dnssec/dnssec-keygen.8#3 integrate .. //depot/projects/vap/contrib/bind9/bin/dnssec/dnssec-keygen.c#3 integrate .. //depot/projects/vap/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/bin/dnssec/dnssec-keygen.html#3 integrate .. //depot/projects/vap/contrib/bind9/bin/dnssec/dnssec-signzone.8#3 integrate .. //depot/projects/vap/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate .. //depot/projects/vap/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/bin/dnssec/dnssec-signzone.html#3 integrate .. //depot/projects/vap/contrib/bind9/bin/named/client.c#3 integrate .. //depot/projects/vap/contrib/bind9/bin/named/config.c#3 integrate .. //depot/projects/vap/contrib/bind9/bin/named/control.c#3 integrate .. //depot/projects/vap/contrib/bind9/bin/named/lwresd.8#3 integrate .. //depot/projects/vap/contrib/bind9/bin/named/lwresd.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/bin/named/lwresd.html#3 integrate .. //depot/projects/vap/contrib/bind9/bin/named/named.8#3 integrate .. //depot/projects/vap/contrib/bind9/bin/named/named.conf.5#3 integrate .. //depot/projects/vap/contrib/bind9/bin/named/named.conf.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/bin/named/named.conf.html#3 integrate .. //depot/projects/vap/contrib/bind9/bin/named/named.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/bin/named/named.html#3 integrate .. //depot/projects/vap/contrib/bind9/bin/named/query.c#3 integrate .. //depot/projects/vap/contrib/bind9/bin/named/server.c#3 integrate .. //depot/projects/vap/contrib/bind9/bin/named/update.c#3 integrate .. //depot/projects/vap/contrib/bind9/bin/nsupdate/nsupdate.8#3 integrate .. //depot/projects/vap/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate .. //depot/projects/vap/contrib/bind9/bin/nsupdate/nsupdate.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/bin/nsupdate/nsupdate.html#3 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/Makefile.in#3 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/rndc-confgen.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/rndc.8#3 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/rndc.conf.5#3 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/rndc.conf.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/rndc.conf.html#3 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/rndc.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/rndc.html#3 integrate .. //depot/projects/vap/contrib/bind9/configure.in#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.ch01.html#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.ch02.html#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.ch10.html#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.pdf#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Makefile.in#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/man.dig.html#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/man.dnssec-keygen.html#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/man.dnssec-signzone.html#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/man.host.html#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/man.named-checkconf.html#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/man.named-checkzone.html#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/man.named.html#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/man.rndc-confgen.html#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/man.rndc.conf.html#3 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/man.rndc.html#3 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#3 delete .. //depot/projects/vap/contrib/bind9/doc/misc/Makefile.in#3 integrate .. //depot/projects/vap/contrib/bind9/doc/misc/migration#3 integrate .. //depot/projects/vap/contrib/bind9/doc/rfc/index#3 integrate .. //depot/projects/vap/contrib/bind9/doc/rfc/rfc4398.txt#1 branch .. //depot/projects/vap/contrib/bind9/doc/rfc/rfc4408.txt#1 branch .. //depot/projects/vap/contrib/bind9/doc/rfc/rfc4470.txt#1 branch .. //depot/projects/vap/contrib/bind9/doc/rfc/rfc4634.txt#1 branch .. //depot/projects/vap/contrib/bind9/doc/rfc/rfc4641.txt#1 branch .. //depot/projects/vap/contrib/bind9/lib/bind/api#3 integrate .. //depot/projects/vap/contrib/bind9/lib/bind/config.h.in#3 integrate .. //depot/projects/vap/contrib/bind9/lib/bind/configure#3 integrate .. //depot/projects/vap/contrib/bind9/lib/bind/configure.in#3 integrate .. //depot/projects/vap/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/bind/dst/hmac_link.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/bind/irs/gai_strerror.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/bind/irs/irs_data.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/bind/isc/ctl_clnt.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/bind/make/rules.in#3 integrate .. //depot/projects/vap/contrib/bind9/lib/bind/nameser/ns_parse.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/bind/port_before.h.in#3 integrate .. //depot/projects/vap/contrib/bind9/lib/bind/resolv/res_data.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/bind/resolv/res_init.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/bind9/api#3 integrate .. //depot/projects/vap/contrib/bind9/lib/bind9/check.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/adb.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/dispatch.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/dnssec.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/include/dns/db.h#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/include/dns/dispatch.h#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/include/dns/validator.h#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/journal.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/lookup.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/master.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/message.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/openssl_link.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/openssldh_link.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/openssldsa_link.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/rbtdb.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/rdata/generic/ds_43.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/rdataslab.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/resolver.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/rootns.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/sdb.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/sdlz.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/tsig.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/validator.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/view.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/xfrin.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/zone.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/Makefile.in#3 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/alpha/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isc/alpha/include/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isc/api#3 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/arm/include/isc/atomic.h#3 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/hmacsha.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/ia64/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isc/ia64/include/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isc/include/isc/platform.h.in#3 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/include/isc/string.h#3 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/mem.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/mips/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isc/mips/include/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isc/noatomic/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isc/noatomic/include/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isc/powerpc/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isc/powerpc/include/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#3 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/sparc64/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isc/sparc64/include/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isc/timer.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/unix/net.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/unix/socket.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/unix/syslog.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/x86_32/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isc/x86_32/include/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isc/x86_64/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isc/x86_64/include/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#1 branch .. //depot/projects/vap/contrib/bind9/lib/isccc/symtab.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/isccfg/api#3 integrate .. //depot/projects/vap/contrib/bind9/lib/lwres/api#3 integrate .. //depot/projects/vap/contrib/bind9/lib/lwres/context.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/lwres/getaddrinfo.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/lwres/getipnode.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/lwres/lwres_gnba.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/lwres/man/lwres.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/lib/lwres/man/lwres_config.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/lib/lwres/man/lwres_context.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/lib/lwres/man/lwres_noop.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/lib/lwres/man/lwres_packet.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#3 integrate .. //depot/projects/vap/contrib/bind9/make/rules.in#3 integrate .. //depot/projects/vap/contrib/bind9/version#3 integrate .. //depot/projects/vap/contrib/cvs/AUTHORS#3 integrate .. //depot/projects/vap/contrib/cvs/BUGS#3 integrate .. //depot/projects/vap/contrib/cvs/ChangeLog#3 integrate .. //depot/projects/vap/contrib/cvs/FAQ#3 integrate .. //depot/projects/vap/contrib/cvs/FREEBSD-Xlist#3 integrate .. //depot/projects/vap/contrib/cvs/FREEBSD-upgrade#3 integrate .. //depot/projects/vap/contrib/cvs/HACKING#3 integrate .. //depot/projects/vap/contrib/cvs/INSTALL#3 integrate .. //depot/projects/vap/contrib/cvs/Makefile.in#3 integrate .. //depot/projects/vap/contrib/cvs/NEWS#3 integrate .. //depot/projects/vap/contrib/cvs/README#3 integrate .. //depot/projects/vap/contrib/cvs/TESTS#3 integrate .. //depot/projects/vap/contrib/cvs/TODO#3 integrate .. //depot/projects/vap/contrib/cvs/acinclude.m4#3 integrate .. //depot/projects/vap/contrib/cvs/aclocal.m4#3 integrate .. //depot/projects/vap/contrib/cvs/config.h.in#3 integrate .. //depot/projects/vap/contrib/cvs/configure#3 integrate .. //depot/projects/vap/contrib/cvs/configure.in#3 integrate .. //depot/projects/vap/contrib/cvs/contrib/ChangeLog#3 integrate .. //depot/projects/vap/contrib/cvs/contrib/Makefile.am#3 integrate .. //depot/projects/vap/contrib/cvs/contrib/Makefile.in#3 integrate .. //depot/projects/vap/contrib/cvs/contrib/README#3 integrate .. //depot/projects/vap/contrib/cvs/contrib/clmerge.in#3 integrate .. //depot/projects/vap/contrib/cvs/contrib/cln_hist.in#3 integrate .. //depot/projects/vap/contrib/cvs/contrib/commit_prep.in#3 integrate .. //depot/projects/vap/contrib/cvs/contrib/cvs2vendor.sh#3 integrate .. //depot/projects/vap/contrib/cvs/contrib/cvs_acls.html#1 branch .. //depot/projects/vap/contrib/cvs/contrib/cvs_acls.in#3 integrate .. //depot/projects/vap/contrib/cvs/contrib/cvscheck.sh#3 integrate .. //depot/projects/vap/contrib/cvs/contrib/debug_check_log.sh#3 integrate .. //depot/projects/vap/contrib/cvs/contrib/descend.sh#3 integrate .. //depot/projects/vap/contrib/cvs/contrib/log.in#3 integrate .. //depot/projects/vap/contrib/cvs/contrib/log_accum.in#3 integrate .. //depot/projects/vap/contrib/cvs/contrib/mfpipe.in#3 integrate .. //depot/projects/vap/contrib/cvs/contrib/pvcs2rcs.in#3 integrate .. //depot/projects/vap/contrib/cvs/contrib/rcs-to-cvs.sh#3 integrate .. //depot/projects/vap/contrib/cvs/contrib/rcs2log.sh#3 integrate .. //depot/projects/vap/contrib/cvs/contrib/rcs2sccs.sh#3 integrate .. //depot/projects/vap/contrib/cvs/contrib/rcslock.in#3 integrate .. //depot/projects/vap/contrib/cvs/contrib/sccs2rcs.in#3 integrate .. //depot/projects/vap/contrib/cvs/diff/ChangeLog#3 integrate .. //depot/projects/vap/contrib/cvs/diff/Makefile.am#3 integrate .. //depot/projects/vap/contrib/cvs/diff/Makefile.in#3 integrate .. //depot/projects/vap/contrib/cvs/doc/ChangeLog#3 integrate .. //depot/projects/vap/contrib/cvs/doc/Makefile.am#3 integrate .. //depot/projects/vap/contrib/cvs/doc/Makefile.in#3 integrate .. //depot/projects/vap/contrib/cvs/doc/cvs.1#3 integrate .. //depot/projects/vap/contrib/cvs/doc/cvs.man.footer#3 integrate .. //depot/projects/vap/contrib/cvs/doc/cvs.man.header#3 integrate .. //depot/projects/vap/contrib/cvs/doc/cvs.texinfo#3 integrate .. //depot/projects/vap/contrib/cvs/doc/cvsclient.texi#3 integrate .. //depot/projects/vap/contrib/cvs/doc/mkman.in#3 delete .. //depot/projects/vap/contrib/cvs/doc/mkman.pl#1 branch .. //depot/projects/vap/contrib/cvs/doc/stamp-1#3 integrate .. //depot/projects/vap/contrib/cvs/doc/stamp-vti#3 integrate .. //depot/projects/vap/contrib/cvs/doc/version-client.texi#3 integrate .. //depot/projects/vap/contrib/cvs/doc/version.texi#3 integrate .. //depot/projects/vap/contrib/cvs/lib/ChangeLog#3 integrate .. //depot/projects/vap/contrib/cvs/lib/Makefile.am#3 integrate .. //depot/projects/vap/contrib/cvs/lib/Makefile.in#3 integrate .. //depot/projects/vap/contrib/cvs/lib/fncase.c#3 integrate .. //depot/projects/vap/contrib/cvs/lib/getdate#1 branch .. //depot/projects/vap/contrib/cvs/lib/getpass.c#3 integrate .. //depot/projects/vap/contrib/cvs/lib/regex.c#3 integrate .. //depot/projects/vap/contrib/cvs/lib/system.h#3 integrate .. //depot/projects/vap/contrib/cvs/lib/test-getdate.sh#1 branch .. //depot/projects/vap/contrib/cvs/lib/xtime.h#3 integrate .. //depot/projects/vap/contrib/cvs/man/ChangeLog#3 integrate .. //depot/projects/vap/contrib/cvs/man/Makefile.am#3 integrate .. //depot/projects/vap/contrib/cvs/man/Makefile.in#3 integrate .. //depot/projects/vap/contrib/cvs/man/cvs.1#3 integrate .. //depot/projects/vap/contrib/cvs/src/ChangeLog#3 integrate .. //depot/projects/vap/contrib/cvs/src/Makefile.am#3 integrate .. //depot/projects/vap/contrib/cvs/src/Makefile.in#3 integrate .. //depot/projects/vap/contrib/cvs/src/add.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/admin.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/annotate.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/buffer.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/buffer.h#3 integrate .. //depot/projects/vap/contrib/cvs/src/checkin.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/checkout.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/classify.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/client.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/client.h#3 integrate .. //depot/projects/vap/contrib/cvs/src/commit.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/create_adm.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/cvs.h#3 integrate .. //depot/projects/vap/contrib/cvs/src/cvsrc.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/diff.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/edit.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/entries.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/expand_path.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/fileattr.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/filesubr.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/find_names.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/hardlink.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/hardlink.h#3 integrate .. //depot/projects/vap/contrib/cvs/src/hash.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/hash.h#3 integrate .. //depot/projects/vap/contrib/cvs/src/history.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/history.h#3 integrate .. //depot/projects/vap/contrib/cvs/src/ignore.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/import.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/lock.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/log.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/login.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/logmsg.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/main.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/mkmodules.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/modules.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/myndbm.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/myndbm.h#3 integrate .. //depot/projects/vap/contrib/cvs/src/no_diff.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/parseinfo.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/patch.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/rcs.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/rcs.h#3 integrate .. //depot/projects/vap/contrib/cvs/src/rcscmds.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/recurse.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/release.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/remove.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/repos.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/root.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/root.h#3 integrate .. //depot/projects/vap/contrib/cvs/src/run.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/sanity.sh#3 integrate .. //depot/projects/vap/contrib/cvs/src/server.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/server.h#3 integrate .. //depot/projects/vap/contrib/cvs/src/stack.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/stack.h#3 integrate .. //depot/projects/vap/contrib/cvs/src/status.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/subr.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/tag.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/update.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/vers_ts.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/version.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/watch.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/wrapper.c#3 integrate .. //depot/projects/vap/contrib/cvs/src/zlib.c#3 integrate .. //depot/projects/vap/contrib/cvs/tools/ChangeLog#3 integrate .. //depot/projects/vap/contrib/cvs/tools/Makefile.am#3 integrate .. //depot/projects/vap/contrib/cvs/tools/Makefile.in#3 integrate .. //depot/projects/vap/contrib/cvs/tools/README#3 integrate .. //depot/projects/vap/contrib/file/ChangeLog#3 integrate .. //depot/projects/vap/contrib/file/Magdir/acorn#3 integrate .. //depot/projects/vap/contrib/file/Magdir/animation#3 integrate .. //depot/projects/vap/contrib/file/Magdir/apple#3 integrate .. //depot/projects/vap/contrib/file/Magdir/archive#3 integrate .. //depot/projects/vap/contrib/file/Magdir/audio#3 integrate .. //depot/projects/vap/contrib/file/Magdir/blender#3 integrate .. //depot/projects/vap/contrib/file/Magdir/commands#3 integrate .. //depot/projects/vap/contrib/file/Magdir/console#3 integrate .. //depot/projects/vap/contrib/file/Magdir/database#3 integrate .. //depot/projects/vap/contrib/file/Magdir/efi#1 branch .. //depot/projects/vap/contrib/file/Magdir/elf#3 integrate .. //depot/projects/vap/contrib/file/Magdir/filesystems#3 integrate .. //depot/projects/vap/contrib/file/Magdir/fortran#1 branch .. //depot/projects/vap/contrib/file/Magdir/java#3 integrate .. //depot/projects/vap/contrib/file/Magdir/macintosh#3 integrate .. //depot/projects/vap/contrib/file/Magdir/msdos#3 integrate .. //depot/projects/vap/contrib/file/Magdir/pdf#3 integrate .. //depot/projects/vap/contrib/file/Magdir/sgi#3 integrate .. //depot/projects/vap/contrib/file/Makefile.am#3 integrate .. //depot/projects/vap/contrib/file/Makefile.in#3 integrate .. //depot/projects/vap/contrib/file/acinclude.m4#3 integrate .. //depot/projects/vap/contrib/file/aclocal.m4#3 integrate .. //depot/projects/vap/contrib/file/apprentice.c#3 integrate .. //depot/projects/vap/contrib/file/ascmagic.c#3 integrate .. //depot/projects/vap/contrib/file/compress.c#3 integrate .. //depot/projects/vap/contrib/file/config.h.in#3 integrate .. //depot/projects/vap/contrib/file/configure#3 integrate .. //depot/projects/vap/contrib/file/configure.in#3 integrate .. //depot/projects/vap/contrib/file/file.c#3 integrate .. //depot/projects/vap/contrib/file/file.h#3 integrate .. //depot/projects/vap/contrib/file/file.man#3 integrate .. //depot/projects/vap/contrib/file/file_opts.h#1 branch .. //depot/projects/vap/contrib/file/fsmagic.c#3 integrate .. //depot/projects/vap/contrib/file/funcs.c#3 integrate .. //depot/projects/vap/contrib/file/install-sh#3 integrate .. //depot/projects/vap/contrib/file/is_tar.c#3 integrate .. //depot/projects/vap/contrib/file/libmagic.man#3 integrate .. //depot/projects/vap/contrib/file/magic.c#3 integrate .. //depot/projects/vap/contrib/file/magic.h#3 integrate .. //depot/projects/vap/contrib/file/magic.man#3 integrate .. //depot/projects/vap/contrib/file/magic.mime#3 integrate .. //depot/projects/vap/contrib/file/mkinstalldirs#3 integrate .. //depot/projects/vap/contrib/file/names.h#3 integrate .. //depot/projects/vap/contrib/file/patchlevel.h#3 integrate .. //depot/projects/vap/contrib/file/print.c#3 integrate .. //depot/projects/vap/contrib/file/readelf.c#3 integrate .. //depot/projects/vap/contrib/file/readelf.h#3 integrate .. //depot/projects/vap/contrib/file/softmagic.c#3 integrate .. //depot/projects/vap/contrib/gcc/config/sparc/freebsd.h#3 integrate .. //depot/projects/vap/contrib/gcc/fold-const.c#3 integrate .. //depot/projects/vap/contrib/gdtoa/gdtoaimp.h#3 integrate .. //depot/projects/vap/contrib/gdtoa/hexnan.c#3 integrate .. //depot/projects/vap/contrib/gdtoa/strtod.c#3 integrate .. //depot/projects/vap/contrib/gdtoa/strtof.c#3 integrate .. //depot/projects/vap/contrib/gdtoa/strtorQ.c#3 integrate .. //depot/projects/vap/contrib/gdtoa/strtorx.c#3 integrate .. //depot/projects/vap/contrib/libiberty/cp-demangle.c#1 branch .. //depot/projects/vap/contrib/ncurses/FREEBSD-upgrade#3 integrate .. //depot/projects/vap/contrib/ncurses/INSTALL#3 integrate .. //depot/projects/vap/contrib/ncurses/MANIFEST#3 integrate .. //depot/projects/vap/contrib/ncurses/NEWS#3 integrate .. //depot/projects/vap/contrib/ncurses/TO-DO#3 integrate .. //depot/projects/vap/contrib/ncurses/aclocal.m4#3 integrate .. //depot/projects/vap/contrib/ncurses/config.guess#3 integrate .. //depot/projects/vap/contrib/ncurses/config.sub#3 integrate .. //depot/projects/vap/contrib/ncurses/configure#3 integrate .. //depot/projects/vap/contrib/ncurses/configure.in#3 integrate .. //depot/projects/vap/contrib/ncurses/dist.mk#3 integrate .. //depot/projects/vap/contrib/ncurses/doc/hackguide.doc#3 integrate .. //depot/projects/vap/contrib/ncurses/doc/html/ncurses-intro.html#3 integrate .. //depot/projects/vap/contrib/ncurses/doc/ncurses-intro.doc#3 integrate .. //depot/projects/vap/contrib/ncurses/form/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ncurses/form/fld_def.c#3 integrate .. //depot/projects/vap/contrib/ncurses/form/fld_dup.c#3 integrate .. //depot/projects/vap/contrib/ncurses/form/fld_ftlink.c#3 integrate .. //depot/projects/vap/contrib/ncurses/form/fld_link.c#3 integrate .. //depot/projects/vap/contrib/ncurses/form/fld_newftyp.c#3 integrate .. //depot/projects/vap/contrib/ncurses/form/frm_def.c#3 integrate .. //depot/projects/vap/contrib/ncurses/form/frm_driver.c#3 integrate .. //depot/projects/vap/contrib/ncurses/form/fty_alnum.c#3 integrate .. //depot/projects/vap/contrib/ncurses/form/fty_alpha.c#3 integrate .. //depot/projects/vap/contrib/ncurses/form/fty_enum.c#3 integrate .. //depot/projects/vap/contrib/ncurses/form/fty_int.c#3 integrate .. //depot/projects/vap/contrib/ncurses/form/fty_num.c#3 integrate .. //depot/projects/vap/contrib/ncurses/form/fty_regex.c#3 integrate .. //depot/projects/vap/contrib/ncurses/form/headers#3 integrate .. //depot/projects/vap/contrib/ncurses/form/modules#3 integrate .. //depot/projects/vap/contrib/ncurses/include/MKterm.h.awk.in#3 integrate .. //depot/projects/vap/contrib/ncurses/include/curses.h.in#3 integrate .. //depot/projects/vap/contrib/ncurses/include/curses.tail#3 integrate .. //depot/projects/vap/contrib/ncurses/include/curses.wide#3 integrate .. //depot/projects/vap/contrib/ncurses/include/headers#3 integrate .. //depot/projects/vap/contrib/ncurses/include/nc_alloc.h#3 integrate .. //depot/projects/vap/contrib/ncurses/include/ncurses_defs#3 integrate .. //depot/projects/vap/contrib/ncurses/include/ncurses_dll.h#3 integrate .. //depot/projects/vap/contrib/ncurses/include/tic.h#3 integrate .. //depot/projects/vap/contrib/ncurses/install-sh#3 integrate .. //depot/projects/vap/contrib/ncurses/man/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ncurses/man/captoinfo.1m#3 integrate .. //depot/projects/vap/contrib/ncurses/man/clear.1#3 integrate .. //depot/projects/vap/contrib/ncurses/man/curs_add_wch.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/curs_addch.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/curs_attr.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/curs_border.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/curs_deleteln.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/curs_extend.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/curs_getcchar.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/curs_getyx.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/curs_insstr.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/curs_legacy.3x#1 branch .. //depot/projects/vap/contrib/ncurses/man/curs_mouse.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/curs_opaque.3x#1 branch .. //depot/projects/vap/contrib/ncurses/man/curs_outopts.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/curs_printw.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/curs_scanw.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/curs_scr_dump.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/curs_slk.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/curs_termattrs.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/curs_termcap.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/curs_terminfo.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/curs_trace.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/curs_util.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/default_colors.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/form_driver.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/form_field_new.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/form_field_opts.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/form_field_validation.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/form_hook.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/form_opts.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/infocmp.1m#3 integrate .. //depot/projects/vap/contrib/ncurses/man/infotocap.1m#3 integrate .. //depot/projects/vap/contrib/ncurses/man/legacy_coding.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/man_db.renames#3 integrate .. //depot/projects/vap/contrib/ncurses/man/menu_driver.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/menu_hook.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/menu_opts.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/mitem_opts.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/ncurses.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/panel.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/term.5#3 integrate .. //depot/projects/vap/contrib/ncurses/man/term.7#3 integrate .. //depot/projects/vap/contrib/ncurses/man/terminfo.head#3 integrate .. //depot/projects/vap/contrib/ncurses/man/terminfo.tail#3 integrate .. //depot/projects/vap/contrib/ncurses/man/tic.1m#3 integrate .. //depot/projects/vap/contrib/ncurses/man/toe.1m#3 integrate .. //depot/projects/vap/contrib/ncurses/man/tput.1#3 integrate .. //depot/projects/vap/contrib/ncurses/man/tset.1#3 integrate .. //depot/projects/vap/contrib/ncurses/menu/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ncurses/menu/headers#3 integrate .. //depot/projects/vap/contrib/ncurses/menu/menu.h#3 integrate .. //depot/projects/vap/contrib/ncurses/menu/modules#3 integrate .. //depot/projects/vap/contrib/ncurses/misc/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ncurses/misc/ncurses-config.in#3 integrate .. //depot/projects/vap/contrib/ncurses/misc/shlib#3 integrate .. //depot/projects/vap/contrib/ncurses/misc/terminfo.src#3 integrate .. //depot/projects/vap/contrib/ncurses/mk-1st.awk#3 integrate .. //depot/projects/vap/contrib/ncurses/mk-hdr.awk#1 branch .. //depot/projects/vap/contrib/ncurses/mkdirs.sh#1 branch .. //depot/projects/vap/contrib/ncurses/mkinstalldirs#3 delete .. //depot/projects/vap/contrib/ncurses/ncurses/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/MKkeyname.awk#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/MKlib_gen.sh#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/MKunctrl.awk#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/define_key.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/key_defined.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/keyok.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_addstr.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_color.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_delwin.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_freeall.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_getch.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_initscr.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_instr.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_mouse.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_newterm.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_newwin.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_overlay.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_redrawln.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_refresh.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_restart.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_screen.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_set_term.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_slkinit.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_slkset.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_ungetch.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_window.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/memmove.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/resizeterm.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/safe_sprintf.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/tries.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/use_window.c#1 branch .. //depot/projects/vap/contrib/ncurses/ncurses/base/wresize.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/curses.priv.h#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/llib-lncurses#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/llib-lncursesw#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/modules#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/MKcaptab.sh#1 branch .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/MKcodes.awk#1 branch .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/MKnames.awk#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/access.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/add_tries.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/comp_error.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/comp_hash.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/comp_parse.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/db_iterator.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/entries.c#1 branch .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/home_terminfo.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/init_keytry.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_acs.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_data.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_options.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_raw.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_setup.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_termcap.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_tparm.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_tputs.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/make_keys.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/name_match.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/parse_entry.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/read_entry.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/setbuf.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/strings.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/use_screen.c#1 branch .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/write_entry.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/trace/lib_trace.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/trace/lib_traceatr.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/trace/lib_tracebits.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/trace/lib_tracechr.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/trace/lib_tracedmp.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/trace/lib_tracemse.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/trace/trace_buf.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/trace/trace_tries.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/trace/varargs.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/trace/visbuf.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tty/hardscroll.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tty/hashmap.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tty/lib_mvcur.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tty/lib_tstp.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tty/lib_twait.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tty/lib_vidattr.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tty/tty_update.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/widechar/lib_cchar.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/widechar/lib_get_wch.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/widechar/lib_key_name.c#1 branch .. //depot/projects/vap/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#3 integrate .. //depot/projects/vap/contrib/ncurses/panel/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ncurses/panel/headers#3 integrate .. //depot/projects/vap/contrib/ncurses/panel/modules#3 integrate .. //depot/projects/vap/contrib/ncurses/progs/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ncurses/progs/clear.c#3 integrate .. //depot/projects/vap/contrib/ncurses/progs/dump_entry.c#3 integrate .. //depot/projects/vap/contrib/ncurses/progs/infocmp.c#3 integrate .. //depot/projects/vap/contrib/ncurses/progs/modules#3 integrate .. //depot/projects/vap/contrib/ncurses/progs/progs.priv.h#3 integrate .. //depot/projects/vap/contrib/ncurses/progs/tic.c#3 integrate .. //depot/projects/vap/contrib/ncurses/progs/toe.c#3 integrate .. //depot/projects/vap/contrib/ncurses/progs/tput.c#3 integrate .. //depot/projects/vap/contrib/ncurses/progs/tset.c#3 integrate .. //depot/projects/vap/contrib/ncurses/tack/COPYING#3 delete .. //depot/projects/vap/contrib/ncurses/tack/HISTORY#3 delete .. //depot/projects/vap/contrib/ncurses/tack/Makefile.in#3 delete .. //depot/projects/vap/contrib/ncurses/tack/README#3 delete .. //depot/projects/vap/contrib/ncurses/tack/ansi.c#3 delete .. //depot/projects/vap/contrib/ncurses/tack/charset.c#3 delete .. //depot/projects/vap/contrib/ncurses/tack/color.c#3 delete .. //depot/projects/vap/contrib/ncurses/tack/control.c#3 delete .. //depot/projects/vap/contrib/ncurses/tack/crum.c#3 delete .. //depot/projects/vap/contrib/ncurses/tack/edit.c#3 delete .. //depot/projects/vap/contrib/ncurses/tack/fun.c#3 delete .. //depot/projects/vap/contrib/ncurses/tack/init.c#3 delete .. //depot/projects/vap/contrib/ncurses/tack/menu.c#3 delete .. //depot/projects/vap/contrib/ncurses/tack/modes.c#3 delete .. //depot/projects/vap/contrib/ncurses/tack/modules#3 delete .. //depot/projects/vap/contrib/ncurses/tack/output.c#3 delete .. //depot/projects/vap/contrib/ncurses/tack/pad.c#3 delete .. //depot/projects/vap/contrib/ncurses/tack/scan.c#3 delete .. //depot/projects/vap/contrib/ncurses/tack/sync.c#3 delete .. //depot/projects/vap/contrib/ncurses/tack/sysdep.c#3 delete .. //depot/projects/vap/contrib/ncurses/tack/tack.1#3 delete .. //depot/projects/vap/contrib/ncurses/tack/tack.c#3 delete .. //depot/projects/vap/contrib/ncurses/tack/tack.h#3 delete .. //depot/projects/vap/contrib/openpam/CREDITS#3 integrate .. //depot/projects/vap/contrib/openpam/HISTORY#3 integrate .. //depot/projects/vap/contrib/openpam/INSTALL#3 integrate .. //depot/projects/vap/contrib/openpam/LICENSE#3 integrate .. //depot/projects/vap/contrib/openpam/MANIFEST#3 delete .. //depot/projects/vap/contrib/openpam/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openpam/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openpam/README#3 integrate .. //depot/projects/vap/contrib/openpam/RELNOTES#3 integrate .. //depot/projects/vap/contrib/openpam/aclocal.m4#3 integrate .. //depot/projects/vap/contrib/openpam/autogen.sh#3 integrate .. //depot/projects/vap/contrib/openpam/bin/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openpam/bin/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openpam/bin/su/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openpam/bin/su/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openpam/bin/su/su.c#3 integrate .. //depot/projects/vap/contrib/openpam/compile#1 branch .. //depot/projects/vap/contrib/openpam/config.h.in#3 integrate .. //depot/projects/vap/contrib/openpam/configure#3 integrate .. //depot/projects/vap/contrib/openpam/configure.ac#3 integrate .. //depot/projects/vap/contrib/openpam/configure.in#3 delete .. //depot/projects/vap/contrib/openpam/depcomp#3 integrate .. //depot/projects/vap/contrib/openpam/doc/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openpam/doc/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/openpam.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/openpam.man#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/openpam_borrow_cred.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/openpam_free_data.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/openpam_free_envlist.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/openpam_get_option.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/openpam_log.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/openpam_nullconv.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/openpam_readline.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/openpam_restore_cred.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/openpam_set_option.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/openpam_ttyconv.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam.conf.5#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam.man#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_acct_mgmt.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_authenticate.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_chauthtok.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_close_session.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_conv.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_end.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_error.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_get_authtok.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_get_data.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_get_item.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_get_user.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_getenv.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_getenvlist.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_info.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_open_session.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_prompt.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_putenv.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_set_data.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_set_item.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_setcred.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_setenv.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_sm_authenticate.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_sm_chauthtok.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_sm_close_session.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_sm_open_session.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_sm_setcred.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_start.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_strerror.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_verror.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_vinfo.3#3 integrate .. //depot/projects/vap/contrib/openpam/doc/man/pam_vprompt.3#3 integrate .. //depot/projects/vap/contrib/openpam/include/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openpam/include/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openpam/include/security/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openpam/include/security/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openpam/include/security/openpam.h#3 integrate .. //depot/projects/vap/contrib/openpam/include/security/openpam_attr.h#1 branch .. //depot/projects/vap/contrib/openpam/include/security/openpam_version.h#3 integrate .. //depot/projects/vap/contrib/openpam/include/security/pam_appl.h#3 integrate .. //depot/projects/vap/contrib/openpam/include/security/pam_constants.h#3 integrate .. //depot/projects/vap/contrib/openpam/include/security/pam_modules.h#3 integrate .. //depot/projects/vap/contrib/openpam/include/security/pam_types.h#3 integrate .. //depot/projects/vap/contrib/openpam/install-sh#3 integrate .. //depot/projects/vap/contrib/openpam/lib/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openpam/lib/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openpam/lib/openpam_borrow_cred.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/openpam_configure.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/openpam_dispatch.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/openpam_dynamic.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/openpam_findenv.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/openpam_free_data.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/openpam_free_envlist.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/openpam_get_option.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/openpam_impl.h#3 integrate .. //depot/projects/vap/contrib/openpam/lib/openpam_load.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/openpam_log.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/openpam_nullconv.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/openpam_readline.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/openpam_restore_cred.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/openpam_set_option.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/openpam_static.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/openpam_ttyconv.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_acct_mgmt.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_authenticate.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_authenticate_secondary.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_chauthtok.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_close_session.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_end.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_error.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_get_authtok.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_get_data.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_get_item.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_get_mapped_authtok.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_get_mapped_username.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_get_user.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_getenv.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_getenvlist.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_info.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_open_session.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_prompt.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_putenv.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_set_data.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_set_item.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_set_mapped_authtok.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_set_mapped_username.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_setcred.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_setenv.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_sm_acct_mgmt.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_sm_authenticate.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_sm_authenticate_secondary.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_sm_chauthtok.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_sm_close_session.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_sm_get_mapped_username.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_sm_open_session.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_sm_set_mapped_username.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_sm_setcred.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_start.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_strerror.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_verror.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_vinfo.c#3 integrate .. //depot/projects/vap/contrib/openpam/lib/pam_vprompt.c#3 integrate .. //depot/projects/vap/contrib/openpam/ltconfig#3 delete .. //depot/projects/vap/contrib/openpam/ltmain.sh#3 integrate .. //depot/projects/vap/contrib/openpam/misc/gendoc.pl#3 integrate .. //depot/projects/vap/contrib/openpam/missing#3 integrate .. //depot/projects/vap/contrib/openpam/mkinstalldirs#3 delete .. //depot/projects/vap/contrib/openpam/modules/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openpam/modules/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openpam/modules/pam_deny/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openpam/modules/pam_deny/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openpam/modules/pam_deny/pam_deny.c#3 integrate .. //depot/projects/vap/contrib/openpam/modules/pam_permit/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openpam/modules/pam_permit/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openpam/modules/pam_permit/pam_permit.c#3 integrate .. //depot/projects/vap/contrib/openpam/modules/pam_unix/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openpam/modules/pam_unix/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openpam/modules/pam_unix/pam_unix.c#3 integrate .. //depot/projects/vap/contrib/openpam/stamp-h.in#3 delete .. //depot/projects/vap/contrib/top/top.c#3 integrate .. //depot/projects/vap/crypto/openssl/crypto/engine/eng_cryptodev.c#3 integrate .. //depot/projects/vap/etc/defaults/periodic.conf#3 integrate .. //depot/projects/vap/etc/defaults/rc.conf#3 integrate .. //depot/projects/vap/etc/namedb/named.conf#3 integrate .. //depot/projects/vap/etc/periodic/daily/460.status-mail-rejects#3 integrate .. //depot/projects/vap/etc/rc.d/DAEMON#3 integrate .. //depot/projects/vap/etc/rc.d/LOGIN#3 integrate .. //depot/projects/vap/etc/rc.d/Makefile#3 integrate .. //depot/projects/vap/etc/rc.d/NETWORKING#3 integrate .. //depot/projects/vap/etc/rc.d/SERVERS#3 integrate .. //depot/projects/vap/etc/rc.d/accounting#3 integrate .. //depot/projects/vap/etc/rc.d/amd#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 15 20:40:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E06CC16A468; Tue, 15 Jan 2008 20:40:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A587B16A41B for ; Tue, 15 Jan 2008 20:40:08 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9DD2B13C4D9 for ; Tue, 15 Jan 2008 20:40:08 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FKe8qX027698 for ; Tue, 15 Jan 2008 20:40:08 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FKe89R027695 for perforce@freebsd.org; Tue, 15 Jan 2008 20:40:08 GMT (envelope-from sam@freebsd.org) Date: Tue, 15 Jan 2008 20:40:08 GMT Message-Id: <200801152040.m0FKe89R027695@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133346 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 20:40:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=133346 Change 133346 by sam@sam_ebb on 2008/01/15 20:40:02 catch up with removal of awi and wlan_scan_ap Affected files ... .. //depot/projects/vap/sys/i386/conf/GENERIC#6 edit Differences ... ==== //depot/projects/vap/sys/i386/conf/GENERIC#6 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.477 2007/11/28 05:50:44 attilio Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.480 2008/01/07 21:40:10 jhb Exp $ cpu I486_CPU cpu I586_CPU @@ -52,8 +52,10 @@ options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options COMPAT_FREEBSD5 # Compatible with FreeBSD5 options COMPAT_FREEBSD6 # Compatible with FreeBSD6 +options COMPAT_FREEBSD7 # Compatible with FreeBSD7 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support +options STACK # stack(9) support options SYSVSHM # SYSV-style shared memory options SYSVMSG # SYSV-style message queues options SYSVSEM # SYSV-style semaphores @@ -137,6 +139,7 @@ device ciss # Compaq Smart RAID 5* device dpt # DPT Smartcache III, IV - See NOTES for options device hptmv # Highpoint RocketRAID 182x +device hptrr # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx device rr232x # Highpoint RocketRAID 232x device iir # Intel Integrated RAID device ips # IBM (Adaptec) ServeRAID @@ -250,13 +253,11 @@ device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm -device wlan_scan_ap # 802.11 AP mode scanning device wlan_scan_sta # 802.11 STA mode scanning device an # Aironet 4500/4800 802.11 wireless NICs. device ath # Atheros pci/cardbus NIC's device ath_hal # Atheros HAL (Hardware Access Layer) device ath_rate_sample # SampleRate tx rate control for ath -device awi # BayStack 660 and others device ral # Ralink Technology RT2500 wireless NICs. device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. #device wl # Older non 802.11 Wavelan wireless NIC. From owner-p4-projects@FreeBSD.ORG Tue Jan 15 21:17:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8B1D16A46D; Tue, 15 Jan 2008 21:17:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8DB4E16A421 for ; Tue, 15 Jan 2008 21:17:50 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6EDB513C43E for ; Tue, 15 Jan 2008 21:17:50 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FLHn8k043711 for ; Tue, 15 Jan 2008 21:17:49 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FLHn1E043708 for perforce@freebsd.org; Tue, 15 Jan 2008 21:17:49 GMT (envelope-from sam@freebsd.org) Date: Tue, 15 Jan 2008 21:17:49 GMT Message-Id: <200801152117.m0FLHn1E043708@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133349 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 21:17:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=133349 Change 133349 by sam@sam_ebb on 2008/01/15 21:17:28 correct typo Affected files ... .. //depot/projects/vap/sys/dev/wi/if_wivar.h#7 edit Differences ... ==== //depot/projects/vap/sys/dev/wi/if_wivar.h#7 (text+ko) ==== @@ -172,9 +172,9 @@ u_int16_t sc_txbuf[IEEE80211_MAX_LEN/2]; - struct wi_tx_radiotap_header sc_tx_th + struct wi_tx_radiotap_header sc_tx_th; int sc_tx_th_len; - struct wi_rx_radiotap_header sc_rx_th + struct wi_rx_radiotap_header sc_rx_th; int sc_rx_th_len; }; From owner-p4-projects@FreeBSD.ORG Tue Jan 15 21:17:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D72416A531; Tue, 15 Jan 2008 21:17:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B51D016A46B for ; Tue, 15 Jan 2008 21:17:50 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9679513C465 for ; Tue, 15 Jan 2008 21:17:50 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FLHoMZ043717 for ; Tue, 15 Jan 2008 21:17:50 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FLHoU0043714 for perforce@freebsd.org; Tue, 15 Jan 2008 21:17:50 GMT (envelope-from sam@freebsd.org) Date: Tue, 15 Jan 2008 21:17:50 GMT Message-Id: <200801152117.m0FLHoU0043714@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133350 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 21:17:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=133350 Change 133350 by sam@sam_ebb on 2008/01/15 21:17:46 fix mis-merge Affected files ... .. //depot/projects/vap/sys/conf/options#8 edit Differences ... ==== //depot/projects/vap/sys/conf/options#8 (text+ko) ==== @@ -755,5 +755,10 @@ # Interrupt filtering INTR_FILTER opt_global.h +# 802.11 support layer +IEEE80211_DEBUG opt_wlan.h +IEEE80211_DEBUG_REFCNT opt_wlan.h +IEEE80211_AMPDU_AGE opt_wlan.h + #Disable code to dispatch tcp offloading TCP_OFFLOAD_DISABLE opt_inet.h From owner-p4-projects@FreeBSD.ORG Tue Jan 15 21:30:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45C6416A419; Tue, 15 Jan 2008 21:30:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0B17D16A421 for ; Tue, 15 Jan 2008 21:30:03 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0431613C45A for ; Tue, 15 Jan 2008 21:30:03 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FLU2kX045628 for ; Tue, 15 Jan 2008 21:30:02 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FLU2Fm045624 for perforce@freebsd.org; Tue, 15 Jan 2008 21:30:02 GMT (envelope-from sam@freebsd.org) Date: Tue, 15 Jan 2008 21:30:02 GMT Message-Id: <200801152130.m0FLU2Fm045624@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133352 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 21:30:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=133352 Change 133352 by sam@sam_ebb on 2008/01/15 21:29:55 fix build/w DEBUG enabled Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_power.c#8 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_power.c#8 (text+ko) ==== @@ -169,8 +169,8 @@ ("operating mode %u", vap->iv_opmode)); aid = IEEE80211_AID(ni->ni_associd); - KASSERT(aid < ic->ic_max_aid, - ("bogus aid %u, max %u", aid, ic->ic_max_aid)); + KASSERT(aid < vap->iv_max_aid, + ("bogus aid %u, max %u", aid, vap->iv_max_aid)); IEEE80211_LOCK(ic); if (set != (isset(vap->iv_tim_bitmap, aid) != 0)) { From owner-p4-projects@FreeBSD.ORG Tue Jan 15 21:31:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E0B116A421; Tue, 15 Jan 2008 21:31:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 527C316A419 for ; Tue, 15 Jan 2008 21:31:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4A8AB13C447 for ; Tue, 15 Jan 2008 21:31:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FLV4J9046232 for ; Tue, 15 Jan 2008 21:31:04 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FLV3Xf046226 for perforce@freebsd.org; Tue, 15 Jan 2008 21:31:03 GMT (envelope-from sam@freebsd.org) Date: Tue, 15 Jan 2008 21:31:03 GMT Message-Id: <200801152131.m0FLV3Xf046226@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133353 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 21:31:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=133353 Change 133353 by sam@sam_ebb on 2008/01/15 21:30:15 backout mis-auto-merge Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211.c#20 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211.c#20 (text+ko) ==== @@ -25,11 +25,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.45 2007/12/07 01:46:12 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.44 2007/11/23 05:57:20 sam Exp $"); /* * IEEE 802.11 generic handler */ +#include "opt_wlan.h" #include #include @@ -38,10 +39,13 @@ #include #include +#include #include +#include #include #include +#include #include @@ -57,7 +61,21 @@ "11na", /* IEEE80211_MODE_11NA */ "11ng", /* IEEE80211_MODE_11NG */ }; +static const uint8_t ieee80211broadcastaddr[IEEE80211_ADDR_LEN] = + { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; +static void ieee80211_syncflag_locked(struct ieee80211com *ic, int flag); +static void ieee80211_syncflag_ext_locked(struct ieee80211com *ic, int flag); +static int ieee80211_media_setup(struct ieee80211com *ic, + struct ifmedia *media, int caps, int addsta, + ifm_change_cb_t media_change, ifm_stat_cb_t media_stat); +static void ieee80211com_media_status(struct ifnet *, struct ifmediareq *); +static int ieee80211com_media_change(struct ifnet *); +static int media_status(enum ieee80211_opmode, + const struct ieee80211_channel *); + +MALLOC_DEFINE(M_80211_VAP, "80211vap", "802.11 vap state"); + /* * Default supported rates for 802.11 operation (in IEEE .5Mb units). */ @@ -75,66 +93,6 @@ { 12, { B(2), B(4), B(11), B(22), 12, 18, 24, 36, 48, 72, 96, 108 } }; #undef B -static int media_status(enum ieee80211_opmode , - const struct ieee80211_channel *); - -/* list of all instances */ -SLIST_HEAD(ieee80211_list, ieee80211com); -static struct ieee80211_list ieee80211_list = - SLIST_HEAD_INITIALIZER(ieee80211_list); -static uint8_t ieee80211_vapmap[32]; /* enough for 256 */ -static struct mtx ieee80211_vap_mtx; -MTX_SYSINIT(ieee80211, &ieee80211_vap_mtx, "net80211 instances", MTX_DEF); - -static void -ieee80211_add_vap(struct ieee80211com *ic) -{ -#define N(a) (sizeof(a)/sizeof(a[0])) - int i; - uint8_t b; - - mtx_lock(&ieee80211_vap_mtx); - ic->ic_vap = 0; - for (i = 0; i < N(ieee80211_vapmap) && ieee80211_vapmap[i] == 0xff; i++) - ic->ic_vap += NBBY; - if (i == N(ieee80211_vapmap)) - panic("vap table full"); - for (b = ieee80211_vapmap[i]; b & 1; b >>= 1) - ic->ic_vap++; - setbit(ieee80211_vapmap, ic->ic_vap); - SLIST_INSERT_HEAD(&ieee80211_list, ic, ic_next); - mtx_unlock(&ieee80211_vap_mtx); -#undef N -} - -static void -ieee80211_remove_vap(struct ieee80211com *ic) -{ - mtx_lock(&ieee80211_vap_mtx); - SLIST_REMOVE(&ieee80211_list, ic, ieee80211com, ic_next); - KASSERT(ic->ic_vap < sizeof(ieee80211_vapmap)*NBBY, - ("invalid vap id %d", ic->ic_vap)); - KASSERT(isset(ieee80211_vapmap, ic->ic_vap), - ("vap id %d not allocated", ic->ic_vap)); - clrbit(ieee80211_vapmap, ic->ic_vap); - mtx_unlock(&ieee80211_vap_mtx); -} - -/* - * Default reset method for use with the ioctl support. This - * method is invoked after any state change in the 802.11 - * layer that should be propagated to the hardware but not - * require re-initialization of the 802.11 state machine (e.g - * rescanning for an ap). We always return ENETRESET which - * should cause the driver to re-initialize the device. Drivers - * can override this method to implement more optimized support. - */ -static int -ieee80211_default_reset(struct ifnet *ifp) -{ - return ENETRESET; -} - /* * Fill in 802.11 available channel set, mark * all available channels as active, and pick @@ -153,6 +111,7 @@ KASSERT(0 < ic->ic_nchans && ic->ic_nchans < IEEE80211_CHAN_MAX, ("invalid number of channels specified: %u", ic->ic_nchans)); memset(ic->ic_chan_avail, 0, sizeof(ic->ic_chan_avail)); + memset(ic->ic_modecaps, 0, sizeof(ic->ic_modecaps)); setbit(ic->ic_modecaps, IEEE80211_MODE_AUTO); for (i = 0; i < ic->ic_nchans; i++) { c = &ic->ic_channels[i]; @@ -186,9 +145,13 @@ memcpy(ic->ic_chan_active, ic->ic_chan_avail, sizeof(ic->ic_chan_avail)); - ic->ic_des_chan = IEEE80211_CHAN_ANYC; /* any channel is ok */ + /* sort channel table to allow lookup optimizations */ + ieee80211_sort_channels(ic->ic_channels, ic->ic_nchans); + + /* invalidate any previous state */ ic->ic_bsschan = IEEE80211_CHAN_ANYC; ic->ic_prevchan = NULL; + ic->ic_csa_newchan = NULL; /* arbitrarily pick the first channel */ ic->ic_curchan = &ic->ic_channels[0]; @@ -206,54 +169,45 @@ #undef DEFAULTRATES } +static void +null_update_mcast(struct ifnet *ifp) +{ + if_printf(ifp, "need multicast update callback\n"); +} + +static void +null_update_promisc(struct ifnet *ifp) +{ + if_printf(ifp, "need promiscuous mode update callback\n"); +} + +/* + * Attach/setup the common net80211 state. Called by + * the driver on attach to prior to creating any vap's. + */ void ieee80211_ifattach(struct ieee80211com *ic) { struct ifnet *ifp = ic->ic_ifp; + struct sockaddr_dl *sdl; + struct ifaddr *ifa; ether_ifattach(ifp, ic->ic_myaddr); - ifp->if_output = ieee80211_output; - bpfattach2(ifp, DLT_IEEE802_11, - sizeof(struct ieee80211_frame_addr4), &ic->ic_rawbpf); - - /* override the 802.3 setting */ - ifp->if_hdrlen = ic->ic_headroom - + sizeof(struct ieee80211_qosframe_addr4) - + IEEE80211_WEP_IVLEN + IEEE80211_WEP_KIDLEN - + IEEE80211_WEP_EXTIVLEN; - /* XXX no way to recalculate on ifdetach */ - if (ALIGN(ifp->if_hdrlen) > max_linkhdr) { - /* XXX sanity check... */ - max_linkhdr = ALIGN(ifp->if_hdrlen); - max_hdr = max_linkhdr + max_protohdr; - max_datalen = MHLEN - max_hdr; - } - + IEEE80211_LOCK_INIT(ic, "ieee80211com"); + TAILQ_INIT(&ic->ic_vaps); /* * Fill in 802.11 available channel set, mark all * available channels as active, and pick a default * channel if not already specified. */ - ieee80211_chan_init(ic); + ieee80211_media_init(ic, + ieee80211com_media_change, ieee80211com_media_status); - if (ic->ic_caps & IEEE80211_C_BGSCAN) /* enable if capable */ - ic->ic_flags |= IEEE80211_F_BGSCAN; -#if 0 - /* XXX not until WME+WPA issues resolved */ - if (ic->ic_caps & IEEE80211_C_WME) /* enable if capable */ - ic->ic_flags |= IEEE80211_F_WME; -#endif - if (ic->ic_caps & IEEE80211_C_BURST) - ic->ic_flags |= IEEE80211_F_BURST; - ic->ic_flags |= IEEE80211_F_DOTH; /* XXX out of caps, just ena */ + ic->ic_update_mcast = null_update_mcast; + ic->ic_update_promisc = null_update_promisc; ic->ic_bintval = IEEE80211_BINTVAL_DEFAULT; - ic->ic_bmissthreshold = IEEE80211_HWBMISS_DEFAULT; - ic->ic_dtim_period = IEEE80211_DTIM_DEFAULT; - IEEE80211_LOCK_INIT(ic, "ieee80211com"); - IEEE80211_BEACON_LOCK_INIT(ic, "beacon"); - ic->ic_lintval = ic->ic_bintval; ic->ic_txpowlimit = IEEE80211_TXPOWER_MAX; @@ -263,30 +217,43 @@ ieee80211_proto_attach(ic); ieee80211_ht_attach(ic); ieee80211_scan_attach(ic); + ieee80211_regdomain_attach(ic); - ieee80211_add_vap(ic); + ieee80211_sysctl_attach(ic); - ieee80211_sysctl_attach(ic); /* NB: requires ic_vap */ - - /* - * Install a default reset method for the ioctl support. - * The driver is expected to fill this in before calling us. - */ - if (ic->ic_reset == NULL) - ic->ic_reset = ieee80211_default_reset; - - KASSERT(ifp->if_llsoftc == NULL, ("oops, hosed")); - ifp->if_llsoftc = ic; + ifp->if_type = IFT_IEEE80211; /* NB: not IFT_ETHER */ + ifp->if_addrlen = IEEE80211_ADDR_LEN; + ifp->if_hdrlen = 0; + if_attach(ifp); + /* NB: must do after 'cuz if_attach resets state */ + ifp->if_mtu = IEEE80211_MTU_MAX; + ifa = ifaddr_byindex(ifp->if_index); + KASSERT(ifa != NULL, ("%s: no lladdr!\n", __func__)); + sdl = (struct sockaddr_dl *)ifa->ifa_addr; + sdl->sdl_type = IFT_ETHER; /* XXX IFT_IEEE80211? */ + sdl->sdl_alen = IEEE80211_ADDR_LEN; + IEEE80211_ADDR_COPY(LLADDR(sdl), ic->ic_myaddr); + ifp->if_broadcastaddr = ieee80211broadcastaddr; } +/* + * Detach net80211 state on device detach. Tear down + * all vap's and reclaim all common state prior to the + * device state going away. Note we may call back into + * driver; it must be prepared for this. + */ void ieee80211_ifdetach(struct ieee80211com *ic) { struct ifnet *ifp = ic->ic_ifp; + struct ieee80211vap *vap; - ieee80211_remove_vap(ic); + /* XXX ieee80211_stop_all? */ + while ((vap = TAILQ_FIRST(&ic->ic_vaps)) != NULL) + ic->ic_vap_delete(vap); ieee80211_sysctl_detach(ic); + ieee80211_regdomain_detach(ic); ieee80211_scan_detach(ic); ieee80211_ht_detach(ic); /* NB: must be called before ieee80211_node_detach */ @@ -296,13 +263,357 @@ ieee80211_node_detach(ic); ifmedia_removeall(&ic->ic_media); + bpfdetach(ifp); + ether_ifdetach(ifp); + IEEE80211_LOCK_DESTROY(ic); - IEEE80211_BEACON_LOCK_DESTROY(ic); + if_detach(ifp); +} + +/* + * Default reset method for use with the ioctl support. This + * method is invoked after any state change in the 802.11 + * layer that should be propagated to the hardware but not + * require re-initialization of the 802.11 state machine (e.g + * rescanning for an ap). We always return ENETRESET which + * should cause the driver to re-initialize the device. Drivers + * can override this method to implement more optimized support. + */ +static int +default_reset(struct ieee80211vap *vap) +{ + return ENETRESET; +} + +/* + * Prepare a vap for use. Drivers use this call to + * setup net80211 state in new vap's prior attaching + * them with ieee80211_vap_attach (below). + */ +int +ieee80211_vap_setup(struct ieee80211com *ic, struct ieee80211vap *vap, + const char name[IFNAMSIZ], int unit, int opmode, int flags, + const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t macaddr[IEEE80211_ADDR_LEN]) +{ +#define IEEE80211_C_OPMODE \ + (IEEE80211_C_IBSS | IEEE80211_C_HOSTAP | IEEE80211_C_AHDEMO | \ + IEEE80211_C_MONITOR | IEEE80211_C_WDS) + struct ifnet *ifp; + + ifp = if_alloc(IFT_ETHER); + if (ifp == NULL) { + /* XXX msg,stat? */ + return 0; + } + if_initname(ifp, name, unit); + ifp->if_softc = vap; /* back pointer */ + ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST; + ifp->if_start = ieee80211_start; + ifp->if_ioctl = ieee80211_ioctl; + ifp->if_watchdog = NULL; /* NB: no watchdog routine */ + ifp->if_init = ieee80211_init; + /* NB: input+output filled in by ether_ifattach */ + IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); + ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; + IFQ_SET_READY(&ifp->if_snd); + + vap->iv_ifp = ifp; + vap->iv_ic = ic; + vap->iv_flags = ic->ic_flags; /* propagate common flags */ + vap->iv_flags_ext = ic->ic_flags_ext; + vap->iv_flags_ven = ic->ic_flags_ven; + vap->iv_caps = ic->ic_caps &~ IEEE80211_C_OPMODE; + vap->iv_htcaps = ic->ic_htcaps; + vap->iv_opmode = opmode; + switch (opmode) { + case IEEE80211_M_STA: + /* auto-enable s/w beacon miss support */ + if (flags & IEEE80211_CLONE_NOBEACONS) + vap->iv_flags_ext |= IEEE80211_FEXT_SWBMISS; + break; + case IEEE80211_M_IBSS: + vap->iv_caps |= IEEE80211_C_IBSS; + break; + case IEEE80211_M_AHDEMO: + vap->iv_caps |= IEEE80211_C_AHDEMO; + break; + case IEEE80211_M_HOSTAP: + vap->iv_caps |= IEEE80211_C_HOSTAP; + break; + case IEEE80211_M_MONITOR: + vap->iv_caps |= IEEE80211_C_MONITOR; + break; + case IEEE80211_M_WDS: + vap->iv_caps |= IEEE80211_C_WDS; + /* + * WDS links must specify the bssid of the far end. + * For legacy operation this is a static relationship. + * For non-legacy operation the station must associate + * and be authorized to pass traffic. Plumbing the + * vap to the proper node happens when the vap + * transitions to RUN state. + */ + IEEE80211_ADDR_COPY(vap->iv_des_bssid, bssid); + vap->iv_flags |= IEEE80211_F_DESBSSID; + if (flags & IEEE80211_CLONE_WDSLEGACY) + vap->iv_flags_ext |= IEEE80211_FEXT_WDSLEGACY; + break; + } + /* + * Enable various functionality by default if we're + * capable; the driver can override us if it knows better. + */ + if (vap->iv_caps & IEEE80211_C_WME) + vap->iv_flags |= IEEE80211_F_WME; + if (vap->iv_caps & IEEE80211_C_BURST) + vap->iv_flags |= IEEE80211_F_BURST; + if (vap->iv_caps & IEEE80211_C_FF) + vap->iv_flags |= IEEE80211_F_FF; + if (vap->iv_caps & IEEE80211_C_TURBOP) + vap->iv_flags |= IEEE80211_F_TURBOP; + /* NB: bg scanning only makes sense for station mode right now */ + if (vap->iv_opmode == IEEE80211_M_STA && + (vap->iv_caps & IEEE80211_C_BGSCAN)) + vap->iv_flags |= IEEE80211_F_BGSCAN; + vap->iv_flags |= IEEE80211_F_DOTH; /* XXX out of caps, just ena */ + /* XXX out of caps, just ena */ + if (vap->iv_opmode == IEEE80211_M_HOSTAP) + vap->iv_flags_ext |= IEEE80211_FEXT_DFS; + + vap->iv_des_chan = IEEE80211_CHAN_ANYC; /* any channel is ok */ + vap->iv_bmissthreshold = IEEE80211_HWBMISS_DEFAULT; + vap->iv_dtim_period = IEEE80211_DTIM_DEFAULT; + /* + * Install a default reset method for the ioctl support; + * the driver can override this. + */ + vap->iv_reset = default_reset; + + IEEE80211_ADDR_COPY(vap->iv_myaddr, macaddr); + + ieee80211_sysctl_vattach(vap); + ieee80211_crypto_vattach(vap); + ieee80211_node_vattach(vap); + ieee80211_power_vattach(vap); + ieee80211_proto_vattach(vap); + ieee80211_ht_vattach(vap); + ieee80211_scan_vattach(vap); + ieee80211_regdomain_vattach(vap); + + return 1; +#undef IEEE80211_C_OPMODE +} + +/* + * Activate a vap. State should have been prepared with a + * call to ieee80211_vap_setup and by the driver. On return + * from this call the vap is ready for use. + */ +int +ieee80211_vap_attach(struct ieee80211vap *vap, + ifm_change_cb_t media_change, ifm_stat_cb_t media_stat) +{ + struct ifnet *ifp = vap->iv_ifp; + struct ieee80211com *ic = vap->iv_ic; + struct ifmediareq imr; + int maxrate; + + IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, + "%s: %s parent %s flags 0x%x flags_ext 0x%x\n", + __func__, ieee80211_opmode_name[vap->iv_opmode], + ic->ic_ifp->if_xname, vap->iv_flags, vap->iv_flags_ext); + + /* + * Do late attach work that cannot happen until after + * the driver has had a chance to override defaults. + */ + ieee80211_node_latevattach(vap); + ieee80211_power_latevattach(vap); + + maxrate = ieee80211_media_setup(ic, &vap->iv_media, vap->iv_caps, + vap->iv_opmode == IEEE80211_M_STA, media_change, media_stat); + ieee80211_media_status(ifp, &imr); + /* NB: strip explicit mode; we're actually in autoselect */ + ifmedia_set(&vap->iv_media, imr.ifm_active &~ IFM_MMASK); + if (maxrate) + ifp->if_baudrate = IF_Mbps(maxrate); + + ether_ifattach(ifp, vap->iv_myaddr); + /* hook output method setup by ether_ifattach */ + vap->iv_output = ifp->if_output; + ifp->if_output = ieee80211_output; + /* NB: if_mtu set by ether_ifattach to ETHERMTU */ + bpfattach2(ifp, DLT_IEEE802_11, ifp->if_hdrlen, &vap->iv_rawbpf); + + IEEE80211_LOCK(ic); + TAILQ_INSERT_TAIL(&ic->ic_vaps, vap, iv_next); + ieee80211_syncflag_locked(ic, IEEE80211_F_WME); + ieee80211_syncflag_locked(ic, IEEE80211_F_TURBOP); + ieee80211_syncflag_locked(ic, IEEE80211_F_PCF); + ieee80211_syncflag_locked(ic, IEEE80211_F_BURST); + ieee80211_syncflag_ext_locked(ic, IEEE80211_FEXT_HT); + ieee80211_syncflag_ext_locked(ic, IEEE80211_FEXT_USEHT40); + ieee80211_syncifflag_locked(ic, IFF_PROMISC); + ieee80211_syncifflag_locked(ic, IFF_ALLMULTI); + IEEE80211_UNLOCK(ic); + + return 1; +} + +/* + * Tear down vap state prior to reclaiming the ifnet. + */ +void +ieee80211_vap_detach(struct ieee80211vap *vap) +{ + struct ieee80211com *ic = vap->iv_ic; + struct ifnet *ifp = vap->iv_ifp; + + IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, "%s: %s parent %s\n", + __func__, ieee80211_opmode_name[vap->iv_opmode], + ic->ic_ifp->if_xname); + /* + * Mark interface down so we ignore calls by the bridge + * to turn off promiscuous mode as a result of calling + * ether_ifdetach. + */ + ifp->if_flags &= ~IFF_UP; + ieee80211_stop(vap); bpfdetach(ifp); ether_ifdetach(ifp); + + IEEE80211_LOCK(ic); + TAILQ_REMOVE(&ic->ic_vaps, vap, iv_next); + ieee80211_syncflag_locked(ic, IEEE80211_F_WME); + ieee80211_syncflag_locked(ic, IEEE80211_F_TURBOP); + ieee80211_syncflag_locked(ic, IEEE80211_F_PCF); + ieee80211_syncflag_locked(ic, IEEE80211_F_BURST); + ieee80211_syncflag_ext_locked(ic, IEEE80211_FEXT_HT); + ieee80211_syncflag_ext_locked(ic, IEEE80211_FEXT_USEHT40); + ieee80211_syncifflag_locked(ic, IFF_PROMISC); + ieee80211_syncifflag_locked(ic, IFF_ALLMULTI); + IEEE80211_UNLOCK(ic); + + ifmedia_removeall(&vap->iv_media); + + ieee80211_regdomain_vdetach(vap); + ieee80211_scan_vdetach(vap); + ieee80211_ht_vdetach(vap); + /* NB: must be before ieee80211_node_vdetach */ + ieee80211_proto_vdetach(vap); + ieee80211_crypto_vdetach(vap); + ieee80211_power_vdetach(vap); + ieee80211_node_vdetach(vap); + ieee80211_sysctl_vdetach(vap); +} + +/* + * Synchronize flag bit state in the parent ifnet structure + * according to the state of all vap ifnet's. This is used, + * for example, to handle IFF_PROMISC and IFF_ALLMULTI. + */ +void +ieee80211_syncifflag_locked(struct ieee80211com *ic, int flag) +{ + struct ieee80211vap *vap; + int bit; + + IEEE80211_LOCK_ASSERT(ic); + + bit = 0; + TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) + if (vap->iv_ifp->if_flags & flag) { + bit = 1; + break; + } + if (bit) + ic->ic_ifp->if_flags |= flag; + else + ic->ic_ifp->if_flags &= ~flag; +} + +/* + * Synchronize flag bit state in the com structure + * according to the state of all vap's. This is used, + * for example, to handle state changes via ioctls. + */ +static void +ieee80211_syncflag_locked(struct ieee80211com *ic, int flag) +{ + struct ieee80211vap *vap; + int bit; + + IEEE80211_LOCK_ASSERT(ic); + + bit = 0; + TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) + if (vap->iv_flags & flag) { + bit = 1; + break; + } + if (bit) + ic->ic_flags |= flag; + else + ic->ic_flags &= ~flag; } +void +ieee80211_syncflag(struct ieee80211vap *vap, int flag) +{ + struct ieee80211com *ic = vap->iv_ic; + + IEEE80211_LOCK(ic); + if (flag < 0) { + flag = -flag; + vap->iv_flags &= ~flag; + } else + vap->iv_flags |= flag; + ieee80211_syncflag_locked(ic, flag); + IEEE80211_UNLOCK(ic); +} + +/* + * Synchronize flag bit state in the com structure + * according to the state of all vap's. This is used, + * for example, to handle state changes via ioctls. + */ +static void +ieee80211_syncflag_ext_locked(struct ieee80211com *ic, int flag) +{ + struct ieee80211vap *vap; + int bit; + + IEEE80211_LOCK_ASSERT(ic); + + bit = 0; + TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) + if (vap->iv_flags_ext & flag) { + bit = 1; + break; + } + if (bit) + ic->ic_flags_ext |= flag; + else + ic->ic_flags_ext &= ~flag; +} + +void +ieee80211_syncflag_ext(struct ieee80211vap *vap, int flag) +{ + struct ieee80211com *ic = vap->iv_ic; + + IEEE80211_LOCK(ic); + if (flag < 0) { + flag = -flag; + vap->iv_flags_ext &= ~flag; + } else + vap->iv_flags_ext |= flag; + ieee80211_syncflag_ext_locked(ic, flag); + IEEE80211_UNLOCK(ic); +} + static __inline int mapgsm(u_int freq, u_int flags) { @@ -416,7 +727,7 @@ /* * Locate a channel given a frequency+flags. We cache - * the previous lookup to optimize swithing between two + * the previous lookup to optimize switching between two * channels--as happens with dynamic turbo. */ struct ieee80211_channel * @@ -467,80 +778,58 @@ } static void -addmedia(struct ieee80211com *ic, int mode, int mword) +addmedia(struct ifmedia *media, int caps, int addsta, int mode, int mword) { -#define TURBO(m) ((m) | IFM_IEEE80211_TURBO) #define ADD(_ic, _s, _o) \ - ifmedia_add(&(_ic)->ic_media, \ + ifmedia_add(media, \ IFM_MAKEWORD(IFM_IEEE80211, (_s), (_o), 0), 0, NULL) static const u_int mopts[IEEE80211_MODE_MAX] = { - IFM_AUTO, /* IEEE80211_MODE_AUTO */ - IFM_IEEE80211_11A, /* IEEE80211_MODE_11A */ - IFM_IEEE80211_11B, /* IEEE80211_MODE_11B */ - IFM_IEEE80211_11G, /* IEEE80211_MODE_11G */ - IFM_IEEE80211_FH, /* IEEE80211_MODE_FH */ - TURBO(IFM_IEEE80211_11A), /* IEEE80211_MODE_TURBO_A */ - TURBO(IFM_IEEE80211_11G), /* IEEE80211_MODE_TURBO_G */ - TURBO(IFM_IEEE80211_11A), /* IEEE80211_MODE_STURBO_A */ - IFM_IEEE80211_11NA, /* IEEE80211_MODE_11NA */ - IFM_IEEE80211_11NG, /* IEEE80211_MODE_11NG */ + IFM_AUTO, + IFM_IEEE80211_11A, + IFM_IEEE80211_11B, + IFM_IEEE80211_11G, + IFM_IEEE80211_FH, + IFM_IEEE80211_11A | IFM_IEEE80211_TURBO, + IFM_IEEE80211_11G | IFM_IEEE80211_TURBO, + IFM_IEEE80211_11A | IFM_IEEE80211_TURBO, + IFM_IEEE80211_11NA, + IFM_IEEE80211_11NG, }; u_int mopt; - KASSERT(mode < IEEE80211_MODE_MAX, ("bad mode %u", mode)); mopt = mopts[mode]; - KASSERT(mopt != 0 || mode == IEEE80211_MODE_AUTO, - ("no media mapping for mode %u", mode)); - - ADD(ic, mword, mopt); /* e.g. 11a auto */ - if (ic->ic_caps & IEEE80211_C_IBSS) - ADD(ic, mword, mopt | IFM_IEEE80211_ADHOC); - if (ic->ic_caps & IEEE80211_C_HOSTAP) - ADD(ic, mword, mopt | IFM_IEEE80211_HOSTAP); - if (ic->ic_caps & IEEE80211_C_AHDEMO) - ADD(ic, mword, mopt | IFM_IEEE80211_ADHOC | IFM_FLAG0); - if (ic->ic_caps & IEEE80211_C_MONITOR) - ADD(ic, mword, mopt | IFM_IEEE80211_MONITOR); + if (addsta) + ADD(ic, mword, mopt); /* STA mode has no cap */ + if (caps & IEEE80211_C_IBSS) + ADD(media, mword, mopt | IFM_IEEE80211_ADHOC); + if (caps & IEEE80211_C_HOSTAP) + ADD(media, mword, mopt | IFM_IEEE80211_HOSTAP); + if (caps & IEEE80211_C_AHDEMO) + ADD(media, mword, mopt | IFM_IEEE80211_ADHOC | IFM_FLAG0); + if (caps & IEEE80211_C_MONITOR) + ADD(media, mword, mopt | IFM_IEEE80211_MONITOR); + if (caps & IEEE80211_C_WDS) + ADD(media, mword, mopt | IFM_IEEE80211_WDS); #undef ADD -#undef TURBO } /* * Setup the media data structures according to the channel and - * rate tables. This must be called by the driver after - * ieee80211_attach and before most anything else. + * rate tables. */ -void -ieee80211_media_init(struct ieee80211com *ic, +static int +ieee80211_media_setup(struct ieee80211com *ic, + struct ifmedia *media, int caps, int addsta, ifm_change_cb_t media_change, ifm_stat_cb_t media_stat) { - struct ifnet *ifp = ic->ic_ifp; int i, j, mode, rate, maxrate, mword, r; const struct ieee80211_rateset *rs; struct ieee80211_rateset allrates; - /* NB: this works because the structure is initialized to zero */ - if (LIST_EMPTY(&ic->ic_media.ifm_list)) { - /* - * Do late attach work that must wait for any subclass - * (i.e. driver) work such as overriding methods. - */ - ieee80211_node_lateattach(ic); - } else { - /* - * We are re-initializing the channel list; clear - * the existing media state as the media routines - * don't suppress duplicates. - */ - ifmedia_removeall(&ic->ic_media); - ieee80211_chan_init(ic); - } - ieee80211_power_lateattach(ic); - /* * Fill in media characteristics. */ - ifmedia_init(&ic->ic_media, 0, media_change, media_stat); + ifmedia_init(media, 0, media_change, media_stat); maxrate = 0; /* * Add media for legacy operating modes. @@ -549,7 +838,7 @@ for (mode = IEEE80211_MODE_AUTO; mode < IEEE80211_MODE_11NA; mode++) { if (isclr(ic->ic_modecaps, mode)) continue; - addmedia(ic, mode, IFM_AUTO); + addmedia(media, caps, addsta, mode, IFM_AUTO); if (mode == IEEE80211_MODE_AUTO) continue; rs = &ic->ic_sup_rates[mode]; @@ -558,7 +847,7 @@ mword = ieee80211_rate2media(ic, rate, mode); if (mword == 0) continue; - addmedia(ic, mode, mword); + addmedia(media, caps, addsta, mode, mword); /* * Add legacy rate to the collection of all rates. */ @@ -582,7 +871,8 @@ if (mword == 0) continue; /* NB: remove media options from mword */ - addmedia(ic, IEEE80211_MODE_AUTO, IFM_SUBTYPE(mword)); + addmedia(media, caps, addsta, + IEEE80211_MODE_AUTO, IFM_SUBTYPE(mword)); } /* * Add HT/11n media. Note that we do not have enough @@ -593,24 +883,52 @@ for (; mode < IEEE80211_MODE_MAX; mode++) { if (isclr(ic->ic_modecaps, mode)) continue; - addmedia(ic, mode, IFM_AUTO); - addmedia(ic, mode, IFM_IEEE80211_MCS); + addmedia(media, caps, addsta, mode, IFM_AUTO); + addmedia(media, caps, addsta, mode, IFM_IEEE80211_MCS); } if (isset(ic->ic_modecaps, IEEE80211_MODE_11NA) || isset(ic->ic_modecaps, IEEE80211_MODE_11NG)) { - addmedia(ic, IEEE80211_MODE_AUTO, IFM_IEEE80211_MCS); + addmedia(media, caps, addsta, + IEEE80211_MODE_AUTO, IFM_IEEE80211_MCS); /* XXX could walk htrates */ /* XXX known array size */ if (ieee80211_htrates[15] > maxrate) maxrate = ieee80211_htrates[15]; } + return maxrate; +} + +void +ieee80211_media_init(struct ieee80211com *ic, + ifm_change_cb_t media_change, ifm_stat_cb_t media_stat) +{ + struct ifnet *ifp = ic->ic_ifp; + int maxrate; + + /* NB: this works because the structure is initialized to zero */ + if (!LIST_EMPTY(&ic->ic_media.ifm_list)) { + /* + * We are re-initializing the channel list; clear + * the existing media state as the media routines + * don't suppress duplicates. + */ + ifmedia_removeall(&ic->ic_media); + } + ieee80211_chan_init(ic); + /* + * Recalculate media settings in case new channel list changes + * the set of available modes. + */ + maxrate = ieee80211_media_setup(ic, &ic->ic_media, ic->ic_caps, 1, + ieee80211com_media_change, ieee80211com_media_status); /* NB: strip explicit mode; we're actually in autoselect */ ifmedia_set(&ic->ic_media, media_status(ic->ic_opmode, ic->ic_curchan) &~ IFM_MMASK); - if (maxrate) ifp->if_baudrate = IF_Mbps(maxrate); + + /* XXX need to propagate new media settings to vap's */ } const struct ieee80211_rateset * @@ -701,216 +1019,134 @@ } } -/* - * Find an instance by it's mac address. - */ -struct ieee80211com * -ieee80211_find_vap(const uint8_t mac[IEEE80211_ADDR_LEN]) -{ - struct ieee80211com *ic; - - /* XXX lock */ - SLIST_FOREACH(ic, &ieee80211_list, ic_next) - if (IEEE80211_ADDR_EQ(mac, ic->ic_myaddr)) - return ic; - return NULL; -} - -static struct ieee80211com * -ieee80211_find_instance(struct ifnet *ifp) -{ - struct ieee80211com *ic; - - /* XXX lock */ - /* XXX not right for multiple instances but works for now */ - SLIST_FOREACH(ic, &ieee80211_list, ic_next) - if (ic->ic_ifp == ifp) - return ic; - return NULL; -} - static int -findrate(struct ieee80211com *ic, enum ieee80211_phymode mode, int rate) -{ -#define IEEERATE(_ic,_m,_i) \ - ((_ic)->ic_sup_rates[_m].rs_rates[_i] & IEEE80211_RATE_VAL) - int i, nrates = ic->ic_sup_rates[mode].rs_nrates; - for (i = 0; i < nrates; i++) - if (IEEERATE(ic, mode, i) == rate) - return i; - return -1; -#undef IEEERATE -} - -/* - * Convert a media specification to a rate index and possibly a mode - * (if the rate is fixed and the mode is specified as ``auto'' then - * we need to lock down the mode so the index is meanginful). - */ -static int -checkrate(struct ieee80211com *ic, enum ieee80211_phymode mode, int rate) -{ - - /* - * Check the rate table for the specified/current phy. - */ - if (mode == IEEE80211_MODE_AUTO) { - int i; - /* - * In autoselect mode search for the rate. - */ - for (i = IEEE80211_MODE_11A; i < IEEE80211_MODE_MAX; i++) { - if (isset(ic->ic_modecaps, i) && - findrate(ic, i, rate) != -1) - return 1; - } - return 0; - } else { - /* - * Mode is fixed, check for rate. - */ - return (findrate(ic, mode, rate) != -1); - } -} - -/* - * Handle a media change request. - */ -int -ieee80211_media_change(struct ifnet *ifp) +media2mode(const struct ieee80211com *ic, + const struct ifmedia_entry *ime, enum ieee80211_phymode *mode) { - struct ieee80211com *ic; - struct ifmedia_entry *ime; - enum ieee80211_opmode newopmode; - enum ieee80211_phymode newphymode; - int newrate, error = 0; - - ic = ieee80211_find_instance(ifp); - if (!ic) { - if_printf(ifp, "%s: no 802.11 instance!\n", __func__); - return EINVAL; - } - ime = ic->ic_media.ifm_cur; - /* - * First, identify the phy mode. - */ switch (IFM_MODE(ime->ifm_media)) { case IFM_IEEE80211_11A: - newphymode = IEEE80211_MODE_11A; + *mode = IEEE80211_MODE_11A; break; case IFM_IEEE80211_11B: - newphymode = IEEE80211_MODE_11B; + *mode = IEEE80211_MODE_11B; break; case IFM_IEEE80211_11G: - newphymode = IEEE80211_MODE_11G; + *mode = IEEE80211_MODE_11G; break; case IFM_IEEE80211_FH: - newphymode = IEEE80211_MODE_FH; + *mode = IEEE80211_MODE_FH; break; case IFM_IEEE80211_11NA: - newphymode = IEEE80211_MODE_11NA; + *mode = IEEE80211_MODE_11NA; break; case IFM_IEEE80211_11NG: - newphymode = IEEE80211_MODE_11NG; + *mode = IEEE80211_MODE_11NG; break; case IFM_AUTO: - newphymode = IEEE80211_MODE_AUTO; + *mode = IEEE80211_MODE_AUTO; break; default: - return EINVAL; + return 0; } /* * Turbo mode is an ``option''. * XXX does not apply to AUTO */ if (ime->ifm_media & IFM_IEEE80211_TURBO) { - if (newphymode == IEEE80211_MODE_11A) { + if (*mode == IEEE80211_MODE_11A) { if (ic->ic_flags & IEEE80211_F_TURBOP) - newphymode = IEEE80211_MODE_TURBO_A; + *mode = IEEE80211_MODE_TURBO_A; else - newphymode = IEEE80211_MODE_STURBO_A; - } else if (newphymode == IEEE80211_MODE_11G) - newphymode = IEEE80211_MODE_TURBO_G; + *mode = IEEE80211_MODE_STURBO_A; + } else if (*mode == IEEE80211_MODE_11G) + *mode = IEEE80211_MODE_TURBO_G; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 15 22:49:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA82D16A47C; Tue, 15 Jan 2008 22:49:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 800B716A418 for ; Tue, 15 Jan 2008 22:49:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6E4FF13C4E3 for ; Tue, 15 Jan 2008 22:49:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FMnPj1079322 for ; Tue, 15 Jan 2008 22:49:25 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FMnP0S079319 for perforce@freebsd.org; Tue, 15 Jan 2008 22:49:25 GMT (envelope-from sam@freebsd.org) Date: Tue, 15 Jan 2008 22:49:25 GMT Message-Id: <200801152249.m0FMnP0S079319@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133358 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 22:49:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=133358 Change 133358 by sam@sam_ebb on 2008/01/15 22:48:50 handle null rd Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#5 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#5 (text+ko) ==== @@ -116,7 +116,10 @@ ic->ic_nchans = 0; if (isset(bands, IEEE80211_MODE_11B) || isset(bands, IEEE80211_MODE_11G)) { - for (i = 1; i <= (rd->ecm ? 14 : 11); i++) { + int maxchan = 11; + if (rd != NULL && rd->ecm) + maxchan = 14; + for (i = 1; i <= maxchan; i++) { if (isset(bands, IEEE80211_MODE_11B)) addchan(ic, i, IEEE80211_CHAN_B); if (isset(bands, IEEE80211_MODE_11G)) From owner-p4-projects@FreeBSD.ORG Tue Jan 15 22:51:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D469C16A46B; Tue, 15 Jan 2008 22:51:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 816CD16A421 for ; Tue, 15 Jan 2008 22:51:28 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 580AC13C442 for ; Tue, 15 Jan 2008 22:51:28 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FMpSPq080291 for ; Tue, 15 Jan 2008 22:51:28 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FMpSnF080288 for perforce@freebsd.org; Tue, 15 Jan 2008 22:51:28 GMT (envelope-from imp@freebsd.org) Date: Tue, 15 Jan 2008 22:51:28 GMT Message-Id: <200801152251.m0FMpSnF080288@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133359 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 22:51:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=133359 Change 133359 by imp@imp_lighthouse on 2008/01/15 22:50:40 We're loading pcpup->pc_curthread->td_pcb->pcb_reg_sp into k0 and then discarding it. Remove this entirely, as it isn't necessary. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/locore.S#20 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/locore.S#20 (text+ko) ==== @@ -133,11 +133,6 @@ jal platform_start nop - lw k0, pcpup - lw k0, PC_CURTHREAD(k0) - lw k0, TD_PCB(k0) - lw k0, PCB_REG_SP(k0) - /* Start MI things rolling. */ jal mi_startup nop From owner-p4-projects@FreeBSD.ORG Tue Jan 15 22:52:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF24316A418; Tue, 15 Jan 2008 22:52:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B4BC316A41B for ; Tue, 15 Jan 2008 22:52:29 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8B04B13C45A for ; Tue, 15 Jan 2008 22:52:29 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FMqTZW080794 for ; Tue, 15 Jan 2008 22:52:29 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FMqTlE080790 for perforce@freebsd.org; Tue, 15 Jan 2008 22:52:29 GMT (envelope-from imp@freebsd.org) Date: Tue, 15 Jan 2008 22:52:29 GMT Message-Id: <200801152252.m0FMqTlE080790@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133360 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 22:52:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=133360 Change 133360 by imp@imp_lighthouse on 2008/01/15 22:51:32 NO_DMA define. This is uber-lame, but gets the kernel boot. Its root cause needs to be tracked down. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/busdma_machdep.c#9 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/busdma_machdep.c#9 (text+ko) ==== @@ -25,6 +25,8 @@ * */ +#define NO_DMA + /*- * Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc. * All rights reserved. From owner-p4-projects@FreeBSD.ORG Tue Jan 15 22:57:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 204F216A41B; Tue, 15 Jan 2008 22:57:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D9FBC16A41A for ; Tue, 15 Jan 2008 22:57:49 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C6F5A13C448 for ; Tue, 15 Jan 2008 22:57:49 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FMvnsP082684 for ; Tue, 15 Jan 2008 22:57:49 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FMvncj082681 for perforce@freebsd.org; Tue, 15 Jan 2008 22:57:49 GMT (envelope-from imp@freebsd.org) Date: Tue, 15 Jan 2008 22:57:49 GMT Message-Id: <200801152257.m0FMvncj082681@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133362 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 22:57:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=133362 Change 133362 by imp@imp_lighthouse on 2008/01/15 22:57:10 Integrate changes 133359 and 133360 from mips2 branch Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/busdma_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#10 integrate Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/busdma_machdep.c#2 (text+ko) ==== @@ -25,6 +25,8 @@ * */ +#define NO_DMA + /*- * Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc. * All rights reserved. ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#10 (text+ko) ==== @@ -196,8 +196,8 @@ /* Call the platform-specific startup code. */ jal platform_start sw zero, START_FRAME - 8(sp) # Zero out old fp for debugger - nop + /* Is this necessary here? -- xxximp */ la sp, _C_LABEL(thread0) lw a0, TD_PCB(sp) subu sp, a0, START_FRAME From owner-p4-projects@FreeBSD.ORG Tue Jan 15 22:58:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EA3416A418; Tue, 15 Jan 2008 22:58:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1450716A419 for ; Tue, 15 Jan 2008 22:58:51 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 01EA313C461 for ; Tue, 15 Jan 2008 22:58:51 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FMwoM6083014 for ; Tue, 15 Jan 2008 22:58:50 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FMwoKd083011 for perforce@freebsd.org; Tue, 15 Jan 2008 22:58:50 GMT (envelope-from imp@freebsd.org) Date: Tue, 15 Jan 2008 22:58:50 GMT Message-Id: <200801152258.m0FMwoKd083011@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133363 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 22:58:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=133363 Change 133363 by imp@imp_lighthouse on 2008/01/15 22:58:37 More Affected files ... .. //depot/projects/mips2-jnpr/src/sys/TODO#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/TODO#3 (text+ko) ==== @@ -14,3 +14,8 @@ things are in libc. o What does that assmbler before mi_startup do in locore.S Comment or remove. +o juniper mips adds some mucking with the FPU in after the platform_init + call (well, it was called mips_init in Jmips). Is this relevant to the + merged code, since mips2 did this earlier... +o Don't forget John Baldwin's comments on the user switch stuff. XXX add more + here XXX From owner-p4-projects@FreeBSD.ORG Tue Jan 15 23:03:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 727BA16A419; Tue, 15 Jan 2008 23:03:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 381A316A418 for ; Tue, 15 Jan 2008 23:03:57 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0CA0313C447 for ; Tue, 15 Jan 2008 23:03:57 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FN3uxR086963 for ; Tue, 15 Jan 2008 23:03:56 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FN3uT2086960 for perforce@freebsd.org; Tue, 15 Jan 2008 23:03:56 GMT (envelope-from imp@freebsd.org) Date: Tue, 15 Jan 2008 23:03:56 GMT Message-Id: <200801152303.m0FN3uT2086960@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133364 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 23:03:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=133364 Change 133364 by imp@imp_lighthouse on 2008/01/15 23:03:38 Make a note of the machine/param.h vs assym.s stuff Affected files ... .. //depot/projects/mips2-jnpr/src/sys/TODO#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/TODO#4 (text+ko) ==== @@ -19,3 +19,5 @@ merged code, since mips2 did this earlier... o Don't forget John Baldwin's comments on the user switch stuff. XXX add more here XXX +o What's defined in assym.s and param.h varies somewhat between the two + code strains. Figure out why and how to resolve. From owner-p4-projects@FreeBSD.ORG Tue Jan 15 23:18:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5E3D16A469; Tue, 15 Jan 2008 23:18:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AB49416A41A for ; Tue, 15 Jan 2008 23:18:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7DE0313C468 for ; Tue, 15 Jan 2008 23:18:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FNIFBf093188 for ; Tue, 15 Jan 2008 23:18:15 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FNIEkx093179 for perforce@freebsd.org; Tue, 15 Jan 2008 23:18:14 GMT (envelope-from sam@freebsd.org) Date: Tue, 15 Jan 2008 23:18:14 GMT Message-Id: <200801152318.m0FNIEkx093179@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133365 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 23:18:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=133365 Change 133365 by sam@sam_ebb on 2008/01/15 23:17:53 gotta register the cloner Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#16 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#16 (text+ko) ==== @@ -586,6 +586,7 @@ case MOD_LOAD: if (bootverbose) printf("wlan: <802.11 Link Layer>\n"); + if_clone_attach(&wlan_cloner); return 0; case MOD_UNLOAD: return 0; From owner-p4-projects@FreeBSD.ORG Tue Jan 15 23:19:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E36E16A421; Tue, 15 Jan 2008 23:19:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0340016A41B for ; Tue, 15 Jan 2008 23:19:17 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E2C2D13C43E for ; Tue, 15 Jan 2008 23:19:16 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FNJGrO093576 for ; Tue, 15 Jan 2008 23:19:16 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FNJGIa093573 for perforce@freebsd.org; Tue, 15 Jan 2008 23:19:16 GMT (envelope-from sam@freebsd.org) Date: Tue, 15 Jan 2008 23:19:16 GMT Message-Id: <200801152319.m0FNJGIa093573@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 23:19:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=133366 Change 133366 by sam@sam_ebb on 2008/01/15 23:19:08 don't see a reason to hookup ether stuff for the device; doing it caused the ifnet mutex's to get double-initialized anyway Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211.c#21 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211.c#21 (text+ko) ==== @@ -192,8 +192,6 @@ struct sockaddr_dl *sdl; struct ifaddr *ifa; - ether_ifattach(ifp, ic->ic_myaddr); - IEEE80211_LOCK_INIT(ic, "ieee80211com"); TAILQ_INIT(&ic->ic_vaps); /* @@ -225,15 +223,15 @@ ifp->if_addrlen = IEEE80211_ADDR_LEN; ifp->if_hdrlen = 0; if_attach(ifp); - /* NB: must do after 'cuz if_attach resets state */ ifp->if_mtu = IEEE80211_MTU_MAX; + ifp->if_broadcastaddr = ieee80211broadcastaddr; + ifa = ifaddr_byindex(ifp->if_index); KASSERT(ifa != NULL, ("%s: no lladdr!\n", __func__)); sdl = (struct sockaddr_dl *)ifa->ifa_addr; sdl->sdl_type = IFT_ETHER; /* XXX IFT_IEEE80211? */ sdl->sdl_alen = IEEE80211_ADDR_LEN; IEEE80211_ADDR_COPY(LLADDR(sdl), ic->ic_myaddr); - ifp->if_broadcastaddr = ieee80211broadcastaddr; } /* @@ -263,9 +261,6 @@ ieee80211_node_detach(ic); ifmedia_removeall(&ic->ic_media); - bpfdetach(ifp); - ether_ifdetach(ifp); - IEEE80211_LOCK_DESTROY(ic); if_detach(ifp); } From owner-p4-projects@FreeBSD.ORG Tue Jan 15 23:30:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8421616A468; Tue, 15 Jan 2008 23:30:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2C40416A419 for ; Tue, 15 Jan 2008 23:30:30 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1691613C46B for ; Tue, 15 Jan 2008 23:30:28 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FNUSHF098537 for ; Tue, 15 Jan 2008 23:30:28 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FNUSSR098531 for perforce@freebsd.org; Tue, 15 Jan 2008 23:30:28 GMT (envelope-from sam@freebsd.org) Date: Tue, 15 Jan 2008 23:30:28 GMT Message-Id: <200801152330.m0FNUSSR098531@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133369 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 23:30:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=133369 Change 133369 by sam@sam_ebb on 2008/01/15 23:30:17 must hold mtx over callout_stop when callout setup with init_mtx Affected files ... .. //depot/projects/vap/sys/dev/ral/rt2560.c#6 edit .. //depot/projects/vap/sys/dev/ral/rt2661.c#6 edit Differences ... ==== //depot/projects/vap/sys/dev/ral/rt2560.c#6 (text) ==== @@ -348,6 +348,7 @@ struct ifnet *ifp = ic->ic_ifp; rt2560_stop(sc); + RAL_LOCK(sc); callout_stop(&sc->watchdog_ch); callout_stop(&sc->rssadapt_ch); ==== //depot/projects/vap/sys/dev/ral/rt2661.c#6 (text) ==== @@ -365,7 +365,8 @@ struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = ic->ic_ifp; - rt2661_stop(sc); + RAL_LOCK(sc); + rt2661_stop_locked(sc); callout_stop(&sc->watchdog_ch); callout_stop(&sc->rssadapt_ch); From owner-p4-projects@FreeBSD.ORG Tue Jan 15 23:31:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 58F9E16A496; Tue, 15 Jan 2008 23:31:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1D00016A621 for ; Tue, 15 Jan 2008 23:31:30 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0697B13C469 for ; Tue, 15 Jan 2008 23:31:30 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FNVTDU099177 for ; Tue, 15 Jan 2008 23:31:29 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FNVTBc099174 for perforce@freebsd.org; Tue, 15 Jan 2008 23:31:29 GMT (envelope-from sam@freebsd.org) Date: Tue, 15 Jan 2008 23:31:29 GMT Message-Id: <200801152331.m0FNVTBc099174@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133370 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 23:31:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=133370 Change 133370 by sam@sam_ebb on 2008/01/15 23:30:50 ieee80211com must be at the front of the softc for now so net80211 can locate it Affected files ... .. //depot/projects/vap/sys/dev/ral/rt2560var.h#4 edit .. //depot/projects/vap/sys/dev/ral/rt2661var.h#4 edit Differences ... ==== //depot/projects/vap/sys/dev/ral/rt2560var.h#4 (text) ==== @@ -107,8 +107,8 @@ #define RT2560_VAP(vap) ((struct rt2560_vap *)(vap)) struct rt2560_softc { + struct ieee80211com sc_ic; struct ifnet *sc_ifp; - struct ieee80211com sc_ic; device_t sc_dev; bus_space_tag_t sc_st; bus_space_handle_t sc_sh; ==== //depot/projects/vap/sys/dev/ral/rt2661var.h#4 (text) ==== @@ -99,8 +99,8 @@ #define RT2661_VAP(vap) ((struct rt2661_vap *)(vap)) struct rt2661_softc { + struct ieee80211com sc_ic; struct ifnet *sc_ifp; - struct ieee80211com sc_ic; device_t sc_dev; bus_space_tag_t sc_st; bus_space_handle_t sc_sh; From owner-p4-projects@FreeBSD.ORG Tue Jan 15 23:40:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EA2E16A41A; Tue, 15 Jan 2008 23:40:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D7BFA16A420 for ; Tue, 15 Jan 2008 23:40:39 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C151C13C468 for ; Tue, 15 Jan 2008 23:40:39 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FNedYr002566 for ; Tue, 15 Jan 2008 23:40:39 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FNedIB002563 for perforce@freebsd.org; Tue, 15 Jan 2008 23:40:39 GMT (envelope-from sam@freebsd.org) Date: Tue, 15 Jan 2008 23:40:39 GMT Message-Id: <200801152340.m0FNedIB002563@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133371 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 23:40:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=133371 Change 133371 by sam@sam_ebb on 2008/01/15 23:39:42 if_init takes the softc, not the ifp Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#21 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#21 (text+ko) ==== @@ -3048,7 +3048,7 @@ * side-effect of bringing ourself up. */ if (vap->iv_state < IEEE80211_S_RUN) - ieee80211_init(ifp); + ieee80211_init(vap); } else if (ifp->if_drv_flags & IFF_DRV_RUNNING) { /* * Stop ourself. If we are the last vap to be @@ -3153,7 +3153,7 @@ */ if (error == ENETRESET) { if (IFNET_IS_UP_RUNNING(ifp)) - ieee80211_init(ifp); + ieee80211_init(vap); error = 0; } else if (error == ERESTART) { error = IFNET_IS_UP_RUNNING(ifp) ? vap->iv_reset(vap) : 0; From owner-p4-projects@FreeBSD.ORG Wed Jan 16 00:44:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 242CE16A469; Wed, 16 Jan 2008 00:44:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D4C7216A41B for ; Wed, 16 Jan 2008 00:44:46 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B87D613C447 for ; Wed, 16 Jan 2008 00:44:46 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0G0ikZT033256 for ; Wed, 16 Jan 2008 00:44:46 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0G0ikNJ033247 for perforce@freebsd.org; Wed, 16 Jan 2008 00:44:46 GMT (envelope-from jb@freebsd.org) Date: Wed, 16 Jan 2008 00:44:46 GMT Message-Id: <200801160044.m0G0ikNJ033247@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133374 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 00:44:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=133374 Change 133374 by jb@jb_freebsd1 on 2008/01/16 00:44:18 Update to build teh Statically Defined Trace (sdt) provider with the current design. Affected files ... .. //depot/projects/dtrace/src/sys/modules/dtrace/sdt/Makefile#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/modules/dtrace/sdt/Makefile#4 (text+ko) ==== @@ -3,13 +3,11 @@ .PATH: ${.CURDIR}/../../../cddl/dev/sdt KMOD= sdt -SRCS= sdt.c sdt_subr.c -SRCS+= bus_if.h device_if.h vnode_if.h +SRCS= sdt.c +SRCS+= vnode_if.h -CFLAGS+= -I${.CURDIR}/../../../cddl/dev/sdt \ +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris \ -I${.CURDIR}/../../../contrib/opensolaris/uts/common \ - -I${.CURDIR}/../../../contrib/opensolaris/compat \ - -I${.CURDIR}/../../../contrib \ -I${.CURDIR}/../../.. .include From owner-p4-projects@FreeBSD.ORG Wed Jan 16 00:45:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E77F16A41B; Wed, 16 Jan 2008 00:45:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23A1916A41A for ; Wed, 16 Jan 2008 00:45:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E36F513C442 for ; Wed, 16 Jan 2008 00:45:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0G0jlgw033657 for ; Wed, 16 Jan 2008 00:45:47 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0G0jlO2033654 for perforce@freebsd.org; Wed, 16 Jan 2008 00:45:47 GMT (envelope-from jb@freebsd.org) Date: Wed, 16 Jan 2008 00:45:47 GMT Message-Id: <200801160045.m0G0jlO2033654@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133375 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 00:45:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=133375 Change 133375 by jb@jb_freebsd1 on 2008/01/16 00:45:32 Scrap this. Our current, simplified design doesn't require it. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/sdt/sdt_subr.c#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jan 16 00:48:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A965516A46D; Wed, 16 Jan 2008 00:48:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6EAA316A469 for ; Wed, 16 Jan 2008 00:48:51 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5208713C4DB for ; Wed, 16 Jan 2008 00:48:51 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0G0mpbV043606 for ; Wed, 16 Jan 2008 00:48:51 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0G0mpqX043603 for perforce@freebsd.org; Wed, 16 Jan 2008 00:48:51 GMT (envelope-from imp@freebsd.org) Date: Wed, 16 Jan 2008 00:48:51 GMT Message-Id: <200801160048.m0G0mpqX043603@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133376 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 00:48:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=133376 Change 133376 by imp@imp_lighthouse on 2008/01/16 00:48:25 Create a mips_proc0_init() (name stole from Juniper code) to encapsulate the 8 lines of code that were being cut and paste. We may be able to have a routine that's from init_param2() through the kdb_init too that would save another 8 lines of code from all the init functions, but one step at a time. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/md_var.h#5 edit .. //depot/projects/mips2/src/sys/mips/mips/machdep.c#35 edit .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/adm5120_machdep.c#5 edit .. //depot/projects/mips2/src/sys/mips/mips32/idt/idt_machdep.c#7 edit .. //depot/projects/mips2/src/sys/mips/mips32/malta/malta_machdep.c#8 edit .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/s5_machdep.c#6 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/md_var.h#5 (text+ko) ==== @@ -41,6 +41,7 @@ void cpu_identify(void); void mips_cpu_init(void); +void mips_proc0_init(void); /* Platform call-downs. */ void platform_identify(void); ==== //depot/projects/mips2/src/sys/mips/mips/machdep.c#35 (text+ko) ==== @@ -468,4 +468,18 @@ } - +void +mips_proc0_init(void) +{ + proc_linkup(&proc0, &thread0); + thread0.td_kstack = kstack0; + /* Initialize pcpu info of cpu-zero */ +#ifdef SMP + pcpu_init(&__pcpu[0], 0, sizeof(struct pcpu)); +#else + pcpu_init(pcpup, 0, sizeof(struct pcpu)); +#endif + pcpup->pc_curthread = &thread0; + cpu_thread_alloc(curthread); + pcpup->pc_curpcb = curthread->td_pcb; +} ==== //depot/projects/mips2/src/sys/mips/mips32/adm5120/adm5120_machdep.c#5 (text+ko) ==== @@ -94,19 +94,10 @@ init_param1(); init_param2(physmem); - mips_cpu_init(); pmap_bootstrap(); - - proc_linkup(&proc0, &thread0); - thread0.td_kstack = kstack0; - pcpu_init(pcpup, 0, sizeof(struct pcpu)); - pcpup->pc_curthread = &thread0; - cpu_thread_alloc(curthread); - pcpup->pc_curpcb = curthread->td_pcb; - + mips_proc0_init(); mutex_init(); - #ifdef DDB kdb_init(); #endif ==== //depot/projects/mips2/src/sys/mips/mips32/idt/idt_machdep.c#7 (text+ko) ==== @@ -145,19 +145,10 @@ cninit(); init_param2(physmem); - mips_cpu_init(); pmap_bootstrap(); - - proc_linkup(&proc0, &thread0); - thread0.td_kstack = kstack0; - pcpu_init(pcpup, 0, sizeof(struct pcpu)); - pcpup->pc_curthread = &thread0; - cpu_thread_alloc(curthread); - pcpup->pc_curpcb = curthread->td_pcb; - + mips_proc0_init(); mutex_init(); - #ifdef DDB kdb_init(); #endif ==== //depot/projects/mips2/src/sys/mips/mips32/malta/malta_machdep.c#8 (text+ko) ==== @@ -181,16 +181,8 @@ mips_cpu_init(); pmap_bootstrap(); - - proc_linkup(&proc0, &thread0); - thread0.td_kstack = kstack0; - pcpu_init(pcpup, 0, sizeof(struct pcpu)); - pcpup->pc_curthread = &thread0; - cpu_thread_alloc(curthread); - pcpup->pc_curpcb = curthread->td_pcb; - + mips_proc0_init(); mutex_init(); - #ifdef DDB kdb_init(); #endif ==== //depot/projects/mips2/src/sys/mips/mips32/sentry5/s5_machdep.c#6 (text+ko) ==== @@ -132,19 +132,10 @@ init_param1(); init_param2(physmem); - mips_cpu_init(); pmap_bootstrap(); - - proc_linkup(&proc0, &thread0); - thread0.td_kstack = kstack0; - pcpu_init(pcpup, 0, sizeof(struct pcpu)); - pcpup->pc_curthread = &thread0; - cpu_thread_alloc(curthread); - pcpup->pc_curpcb = curthread->td_pcb; - + mips_proc0_init(); mutex_init(); - #ifdef DDB kdb_init(); #endif From owner-p4-projects@FreeBSD.ORG Wed Jan 16 00:53:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F91116A421; Wed, 16 Jan 2008 00:53:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 14CFA16A418 for ; Wed, 16 Jan 2008 00:53:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EB21613C4CC for ; Wed, 16 Jan 2008 00:53:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0G0ruSe047171 for ; Wed, 16 Jan 2008 00:53:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0G0rug7047168 for perforce@freebsd.org; Wed, 16 Jan 2008 00:53:56 GMT (envelope-from jb@freebsd.org) Date: Wed, 16 Jan 2008 00:53:56 GMT Message-Id: <200801160053.m0G0rug7047168@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133377 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 00:53:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=133377 Change 133377 by jb@jb_freebsd1 on 2008/01/16 00:53:50 A big change to the design of the Statically Defined Probe (sdt) provider. This utilises the SYSINIT/SYSINIT to keep a list of sdt providers and sub-lists of sdt probes, all statically defined and just linked via queue(3) so that they can be recursed. Since the sdt.h header is included thoroughout the kernel source where static probes are defined, it has to be BSD licensed. This means a complete departure from the sdt design in Solaris. Readers are encouraged to compare the unenabled probe overhead in this implementation with that in the Solaris design. :-) Note that the presence of the KDTRACE_HOOKS kernel option causes the kern_sdt.c file to be compiled in, so that the SYSINIT/SYSUNINIT routines are called even if the DTrace modules aren't loaded. This is necessary so that if the DTrace modules are loaded later, they have an up-to-date set of data to use. The overhead is minimal. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/sdt/sdt.c#8 edit .. //depot/projects/dtrace/src/sys/kern/kern_sdt.c#5 add .. //depot/projects/dtrace/src/sys/sys/sdt.h#10 add Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/sdt/sdt.c#8 (text+ko) ==== @@ -18,67 +18,39 @@ * * CDDL HEADER END * - * Portions Copyright 2006 John Birrell jb@freebsd.org + * Portions Copyright 2006-2008 John Birrell jb@freebsd.org * * $FreeBSD$ * */ -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ +#ifndef KDTRACE_HOOKS +#define KDTRACE_HOOKS +#endif #include #include #include -#include #include -#include -#include -#include -#include #include -#include -#include #include +#include #include -#include -#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include -MALLOC_DECLARE(M_SDT); -MALLOC_DEFINE(M_SDT, "sdt", "Static Dtrace Tracing"); - -#define SDT_PATCHVAL 0xf0 -#define SDT_ADDR2NDX(addr) ((((uintptr_t)(addr)) >> 4) & sdt_probetab_mask) -#define SDT_PROBETAB_SIZE 0x1000/* 4k entries -- 16K total */ +#define SDT_ADDR2NDX(addr) (((uintptr_t)(addr)) >> 4) static d_open_t sdt_open; static int sdt_unload(void); -static void sdt_provide_module(void *, modctl_t *); +static void sdt_provide_probes(void *, dtrace_probedesc_t *); static void sdt_destroy(void *, dtrace_id_t, void *); static void sdt_enable(void *, dtrace_id_t, void *); static void sdt_disable(void *, dtrace_id_t, void *); static void sdt_load(void *); -static void sdt_suspend(void *, dtrace_id_t, void *); -static void sdt_resume(void *, dtrace_id_t, void *); static struct cdevsw sdt_cdevsw = { .d_version = D_VERSION, @@ -86,339 +58,127 @@ .d_name = "sdt", }; +static dtrace_pattr_t sdt_attr = { +{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_COMMON }, +{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN }, +{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA }, +{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_COMMON }, +{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA }, +}; + static dtrace_pops_t sdt_pops = { + sdt_provide_probes, NULL, - sdt_provide_module, sdt_enable, sdt_disable, - sdt_suspend, - sdt_resume, - sdt_getargdesc, + NULL, + NULL, + NULL, NULL, NULL, sdt_destroy }; static struct cdev *sdt_cdev; -static sdt_probe_t **sdt_probetab; -static int sdt_probetab_size; -static int sdt_probetab_mask; -static int sdt_verbose = 0; static int -sdt_invop(uintptr_t addr, uintptr_t *stack, uintptr_t rval) +sdt_probe_callback(struct sdt_probe *probe, void *arg __unused) { - struct pcpu *cpu = pcpu_find(curcpu); - uintptr_t stack0, stack1, stack2, stack3, stack4; - sdt_probe_t *sdt = sdt_probetab[SDT_ADDR2NDX(addr)]; + struct sdt_provider *prov = probe->prov; + char mod[64]; + char func[64]; + char name[64]; + + /* + * Unfortunately this is necessary because the Solaris DTrace + * code mixes consts and non-consts with casts to override + * the incompatibilies. On FreeBSD, we use strict warnings + * in gcc, so we have to respect const vs non-const. + */ + strlcpy(mod, probe->mod, sizeof(mod)); + strlcpy(func, probe->func, sizeof(func)); + strlcpy(name, probe->name, sizeof(name)); - for (; sdt != NULL; sdt = sdt->sdp_hashnext) { - if ((uintptr_t)sdt->sdp_patchpoint == addr) { - int i = 0; - /* - * When accessing the arguments on the stack, - * we must protect against accessing beyond - * the stack. We can safely set NOFAULT here - * -- we know that interrupts are already - * disabled. - */ - DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT); - cpu->pc_dtrace_caller = addr; - stack0 = stack[i++]; - stack1 = stack[i++]; - stack2 = stack[i++]; - stack3 = stack[i++]; - stack4 = stack[i++]; - DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT | - CPU_DTRACE_BADADDR); + if (dtrace_probe_lookup(prov->id, mod, func, name) != 0) + return (0); - dtrace_probe(sdt->sdp_id, stack0, stack1, - stack2, stack3, stack4); - return (DTRACE_INVOP_NOP); - } - } + (void) dtrace_probe_create(prov->id, probe->mod, probe->func, + probe->name, 0, probe); - return (0); + return (0); } static int -sdt_create_module_probes(linker_file_t lf, char *modname) -{ - sdt_probedesc_t *sdpd; - sdt_probe_t *sdp, *old; - sdt_provider_t *prov; - int len; - - /* - * One for all, and all for one: if we haven't yet registered all of - * our providers, we'll refuse to provide anything. - */ - for (prov = sdt_providers; prov->sdtp_name != NULL; prov++) { - if (prov->sdtp_id == DTRACE_PROVNONE) - return (0); - } - - if (lf->sdt_nprobes != 0 || (sdpd = lf->sdt_probes) == NULL) - return (0); - - for (; sdpd != NULL; sdpd = sdpd->sdpd_next) { - char *name = sdpd->sdpd_name, *nname; - int i, j; - sdt_provider_t *prov; - dtrace_id_t id; - - for (prov = sdt_providers; prov->sdtp_prefix != NULL; prov++) { - char *prefix = prov->sdtp_prefix; - - if (strncmp(name, prefix, strlen(prefix)) == 0) { - name += strlen(prefix); - break; - } - } - - while (*name != '\0') { - if (*name <= '9' && *name>='0') - name++; - else - break; - } - - nname = malloc(len = strlen(name) + 1, M_SDT, M_WAITOK); - - for (i = 0, j = 0; name[j] != '\0'; i++) { - if (name[j] == '_' && name[j + 1] == '_') { - nname[i] = '-'; - j += 2; - } else { - nname[i] = name[j++]; - } - } - - nname[i] = '\0'; - - sdp = malloc(sizeof (sdt_probe_t), M_SDT, M_WAITOK | M_ZERO); - sdp->sdp_loadcnt = lf->loadcnt; - sdp->sdp_ctl = lf; - sdp->sdp_name = nname; - sdp->sdp_namelen = len; - sdp->sdp_provider = prov; - - /* - * We have our provider. Now create the probe. - */ - if ((id = dtrace_probe_lookup(prov->sdtp_id, modname, - NULL, nname)) != DTRACE_IDNONE) { - old = dtrace_probe_arg(prov->sdtp_id, id); - ASSERT(old != NULL); - - sdp->sdp_next = old->sdp_next; - sdp->sdp_id = id; - old->sdp_next = sdp; - } else { - sdp->sdp_id = dtrace_probe_create(prov->sdtp_id, - modname, NULL, nname, 3, sdp); - - lf->sdt_nprobes++; - } - - sdp->sdp_hashnext = - sdt_probetab[SDT_ADDR2NDX(sdpd->sdpd_offset)]; - sdt_probetab[SDT_ADDR2NDX(sdpd->sdpd_offset)] = sdp; - - sdp->sdp_patchval = SDT_PATCHVAL; - sdp->sdp_patchpoint = (uint8_t *)sdpd->sdpd_offset; - sdp->sdp_savedval = *sdp->sdp_patchpoint; - } - return (0); +sdt_provider_entry(struct sdt_provider *prov, void *arg) +{ + return (sdt_probe_listall(prov, sdt_probe_callback, NULL)); } -/*ARGSUSED*/ static void -sdt_provide_module(void *arg, modctl_t *lf) +sdt_provide_probes(void *arg, dtrace_probedesc_t *desc) { - char modname[MAXPATHLEN]; - size_t len; + if (desc != NULL) + return; - strlcpy(modname, lf->filename, sizeof(modname)); - len = strlen(modname); - if (len > 3 && strcmp(modname + len - 3, ".ko") == 0) - modname[len - 3] = '\0'; - - sdt_create_module_probes(lf, modname); + (void) sdt_provider_listall(sdt_provider_entry, NULL); } -/* ARGSUSED */ static void sdt_destroy(void *arg, dtrace_id_t id, void *parg) { - sdt_probe_t *sdt = parg, *next, *hash, *last; - modctl_t *ctl = sdt->sdp_ctl; - int ndx; - - if (ctl->loadcnt == sdt->sdp_loadcnt) - ctl->sdt_nprobes--; - - do { - /* - * Now we need to remove this probe from the sdt_probetab. - */ - ndx = SDT_ADDR2NDX(sdt->sdp_patchpoint); - last = NULL; - hash = sdt_probetab[ndx]; - - while (hash != sdt) { - ASSERT(hash != NULL); - last = hash; - hash = hash->sdp_hashnext; - } - - if (last != NULL) { - last->sdp_hashnext = sdt->sdp_hashnext; - } else { - sdt_probetab[ndx] = sdt->sdp_hashnext; - } - - free(sdt->sdp_name, M_SDT); - next = sdt->sdp_next; - free(sdt, M_SDT); - - sdt = next; - } while (sdt != NULL); + /* Nothing to do here. */ } -/* ARGSUSED */ static void sdt_enable(void *arg, dtrace_id_t id, void *parg) { - sdt_probe_t *sdt = parg; - modctl_t *ctl = sdt->sdp_ctl; + struct sdt_probe *probe = parg; - ctl->nenabled++; - - /* - * Now check that our modctl has the expected load count. If it - * doesn't, this module must have been unloaded and reloaded -- and - * we're not going to touch it. - */ - if (ctl->loadcnt != sdt->sdp_loadcnt) { - if (sdt_verbose) { - printf("sdt is failing for probe %s " - "(module %s reloaded)", - sdt->sdp_name, ctl->filename); - } - - return; - } - - for (; sdt != NULL; sdt = sdt->sdp_next) { - if (sdt_verbose) - printf("sdt_enable %s\n",sdt->sdp_name); - *sdt->sdp_patchpoint = sdt->sdp_patchval; - } + probe->id = id; } -/* ARGSUSED */ static void sdt_disable(void *arg, dtrace_id_t id, void *parg) { - sdt_probe_t *sdt = parg; - modctl_t *ctl = sdt->sdp_ctl; + struct sdt_probe *probe = parg; - ASSERT(ctl->nenabled > 0); - ctl->nenabled--; - - if ((ctl->loadcnt != sdt->sdp_loadcnt)) - return; - - for (; sdt != NULL; sdt = sdt->sdp_next) - *sdt->sdp_patchpoint = sdt->sdp_savedval; + probe->id = 0; } -/*ARGSUSED*/ -static void -sdt_suspend(void *arg, dtrace_id_t id, void *parg) +static int +sdt_provider_reg_callback(struct sdt_provider *prov, void *arg __unused) { - sdt_probe_t *sdt = parg; - modctl_t *ctl = sdt->sdp_ctl; - - ASSERT(ctl->nenabled > 0); - - if ((ctl->loadcnt != sdt->sdp_loadcnt)) - return; - - for (; sdt != NULL; sdt = sdt->sdp_next) - *sdt->sdp_patchpoint = sdt->sdp_savedval; + return (dtrace_register(prov->name, &sdt_attr, DTRACE_PRIV_USER, + NULL, &sdt_pops, NULL, (dtrace_provider_id_t *) &prov->id)); } -/*ARGSUSED*/ static void -sdt_resume(void *arg, dtrace_id_t id, void *parg) +sdt_load(void *dummy) { - sdt_probe_t *sdt = parg; - modctl_t *ctl = sdt->sdp_ctl; + /* Create the /dev/dtrace/sdt entry. */ + sdt_cdev = make_dev(&sdt_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, + "dtrace/sdt"); - ASSERT(ctl->nenabled > 0); + sdt_probe_func = dtrace_probe; - if ((ctl->loadcnt != sdt->sdp_loadcnt)) - return; - - for (; sdt != NULL; sdt = sdt->sdp_next) - *sdt->sdp_patchpoint = sdt->sdp_patchval; + (void) sdt_provider_listall(sdt_provider_reg_callback, NULL); } -static void -sdt_load(void *dummy) +static int +sdt_provider_unreg_callback(struct sdt_provider *prov, void *arg __unused) { - sdt_provider_t *prov; - - /* Default the probe table size if not specified. */ - if (sdt_probetab_size == 0) - sdt_probetab_size = SDT_PROBETAB_SIZE; - - /* Choose the hash mask for the probe table. */ - sdt_probetab_mask = sdt_probetab_size - 1; - - /* Allocate memory for the probe table. */ - sdt_probetab = malloc(sdt_probetab_size * sizeof - (sdt_probe_t *), M_SDT, M_WAITOK | M_ZERO); - - dtrace_invop_add(sdt_invop); - - for (prov = sdt_providers; prov->sdtp_name != NULL; prov++) { - if (dtrace_register(prov->sdtp_name, prov->sdtp_attr, - DTRACE_PRIV_USER, NULL, - &sdt_pops, prov, &prov->sdtp_id) != 0) { - printf("failed to register sdt provider %s", - prov->sdtp_name); - } - } + return (dtrace_unregister(prov->id)); } - static int sdt_unload() { int error = 0; - sdt_provider_t *prov; - - /* De-register the invalid opcode handler. */ - dtrace_invop_remove(sdt_invop); + + sdt_probe_func = sdt_probe_stub; - /* De-register this DTrace provider. */ - for (prov = sdt_providers; prov->sdtp_name != NULL; prov++) { - if ((error = dtrace_unregister(prov->sdtp_id)) != 0) { - return (error); - } - else { - prov->sdtp_id = 0; - } - } + (void) sdt_provider_listall(sdt_provider_unreg_callback, NULL); - /* Free the probe table. */ - free(sdt_probetab, M_SDT); - sdt_probetab = NULL; - sdt_probetab_mask = 0; - destroy_dev(sdt_cdev); return (error); @@ -432,13 +192,9 @@ switch (type) { case MOD_LOAD: - /* Create the /dev/dtrace/sdt entry. */ - sdt_cdev = make_dev(&sdt_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, - "dtrace/sdt"); break; case MOD_UNLOAD: - error = sdt_unload(); break; case MOD_SHUTDOWN: @@ -460,8 +216,10 @@ return (0); } -SYSINIT(sdt_load, SI_SUB_DTRACE_PROVIDER, SI_ORDER_ANY, sdt_load, NULL) +SYSINIT(sdt_load, SI_SUB_DTRACE_PROVIDER, SI_ORDER_ANY, sdt_load, NULL); +SYSUNINIT(sdt_unload, SI_SUB_DTRACE_PROVIDER, SI_ORDER_ANY, sdt_unload, NULL); DEV_MODULE(sdt, sdt_modevent, NULL); MODULE_VERSION(sdt, 1); MODULE_DEPEND(sdt, dtrace, 1, 1, 1); +MODULE_DEPEND(sdt, opensolaris, 1, 1, 1); From owner-p4-projects@FreeBSD.ORG Wed Jan 16 01:00:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B05816A41B; Wed, 16 Jan 2008 01:00:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4C0A16A419 for ; Wed, 16 Jan 2008 01:00:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C78EA13C44B for ; Wed, 16 Jan 2008 01:00:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0G103wk049473 for ; Wed, 16 Jan 2008 01:00:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0G103Q9049470 for perforce@freebsd.org; Wed, 16 Jan 2008 01:00:03 GMT (envelope-from jb@freebsd.org) Date: Wed, 16 Jan 2008 01:00:03 GMT Message-Id: <200801160100.m0G103Q9049470@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133378 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 01:00:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=133378 Change 133378 by jb@jb_freebsd1 on 2008/01/16 00:59:37 Add some statically defined DTrace probes to the process ctor, init and dtor. If the KDTRACE_HOOKS kernel option isn't set, these macros expand to nothing. If KDTRACE_HOOKS is defined, the extra instructions executed for an unenabled probe are effectively: if (sdt_global_struct.id) { ... probe } where 'sdt_global_struct' is the global instance of 'struct sdt_probe'. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_proc.c#17 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_proc.c#17 (text+ko) ==== @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.261 2008/01/10 22:11:20 rwatson Exp $"); #include "opt_ddb.h" +#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_kstack_pages.h" #include "opt_stack.h" @@ -55,6 +56,7 @@ #include #include #include +#include #include #include #include @@ -76,6 +78,8 @@ #include #include +SDT_PROVIDER_DEFINE(proc); + MALLOC_DEFINE(M_PGRP, "pgrp", "process group header"); MALLOC_DEFINE(M_SESSION, "session", "session header"); static MALLOC_DEFINE(M_PROC, "proc", "Proc structures"); @@ -142,7 +146,9 @@ struct proc *p; p = (struct proc *)mem; + SDT_PROBE(proc, kernel, ctor , entry, p, size, arg, flags, 0); EVENTHANDLER_INVOKE(process_ctor, p); + SDT_PROBE(proc, kernel, ctor , return, p, size, arg, flags, 0); return (0); } @@ -158,6 +164,7 @@ /* INVARIANTS checks go here */ p = (struct proc *)mem; td = FIRST_THREAD_IN_PROC(p); + SDT_PROBE(proc, kernel, dtor , entry, p, size, arg, td, 0); if (td != NULL) { #ifdef INVARIANTS KASSERT((p->p_numthreads == 1), @@ -175,6 +182,7 @@ EVENTHANDLER_INVOKE(process_dtor, p); if (p->p_ksi != NULL) KASSERT(! KSI_ONQ(p->p_ksi), ("SIGCHLD queue")); + SDT_PROBE(proc, kernel, dtor , return, p, size, arg, 0, 0); } /* @@ -186,6 +194,7 @@ struct proc *p; p = (struct proc *)mem; + SDT_PROBE(proc, kernel, init , entry, p, size, flags, 0, 0); p->p_sched = (struct p_sched *)&p[1]; bzero(&p->p_mtx, sizeof(struct mtx)); mtx_init(&p->p_mtx, "process lock", NULL, MTX_DEF | MTX_DUPOK); @@ -193,6 +202,7 @@ TAILQ_INIT(&p->p_threads); /* all threads in proc */ EVENTHANDLER_INVOKE(process_init, p); p->p_stats = pstats_alloc(); + SDT_PROBE(proc, kernel, init , return, p, size, flags, 0, 0); return (0); } From owner-p4-projects@FreeBSD.ORG Wed Jan 16 01:02:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BAA016A421; Wed, 16 Jan 2008 01:02:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 279A816A418 for ; Wed, 16 Jan 2008 01:02:08 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 07E2013C461 for ; Wed, 16 Jan 2008 01:02:08 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0G127BC051215 for ; Wed, 16 Jan 2008 01:02:07 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0G125Pq051182 for perforce@freebsd.org; Wed, 16 Jan 2008 01:02:05 GMT (envelope-from gcooper@FreeBSD.org) Date: Wed, 16 Jan 2008 01:02:05 GMT Message-Id: <200801160102.m0G125Pq051182@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 133379 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 01:02:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=133379 Change 133379 by gcooper@shiina-ibook on 2008/01/16 01:01:15 Updating to properly reflect current interfaces. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/Makefile#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/Makefile.inc#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/README#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/Makefile#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/add.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/extract.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/futil.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/main.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/perform.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/pkg_add.1#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/Makefile#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/create.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/main.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/perform.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/pkg_create.1#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/pl.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/delete/Makefile#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/delete/delete.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/delete/main.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/delete/perform.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/delete/pkg_delete.1#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/Makefile#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/info.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/main.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/perform.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/pkg_info.1#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/show.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/.match.c.swp#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/Makefile#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/add_del.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/deps.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/exec.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/file.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/global.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/lib.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/match.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/msg.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/pen.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/pkgwrap.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/plist.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/str.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/url.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/version.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lsof.gmon#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/prof_scripts/prof_postprocess.pl#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/prof_scripts/prof_process.pl#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/prof_scripts/run_prof.sh#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/Makefile#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/README#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/check.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/common.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/extern.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/gzip.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/gzip.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/main.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/pgp.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/pgp_check.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/pgp_sign.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/pkg_sign.1#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/sha1.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/sign.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/stand.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/stand.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/x509.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/tkpkg#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/unlocker.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/Makefile#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/main.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/perform.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/perform.old.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/pkg_version.1#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/test-pkg_version.sh#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/version.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/archive_read_open_stream.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/macros.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg.c#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg.h#6 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db.c#7 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db.h#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_freebsd.c#9 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_match.c#6 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_private.h#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd.c#8 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_contents.c#6 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_lexer.l#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_parser.y#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_private.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_manifest.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_manifest_freebsd.c#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_private.h#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo.c#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_files.c#6 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_ftp.c#6 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_local_freebsd.c#7 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_private.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox.c#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox.h#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox_private.h#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_util.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkgfile.c#7 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/scripts/styleify.pl#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_add/main.c#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_delete/main.c#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_info/main.c#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_info/match.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_info/pkg_info.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_info/show.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_sign/main.c#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_version/main.c#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/add/arg_parser.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/add/arg_parser.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/check/arg_parser.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/check/arg_parser.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/clean/arg_parser.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/clean/arg_parser.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/create/arg_parser.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/create/arg_parser.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/delete/arg_parser.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/delete/arg_parser.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/info/arg_parser.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/info/arg_parser.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/show/arg_parser.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/show/arg_parser.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/sign/arg_parser.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/sign/arg_parser.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/update/arg_parser.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/update/pkg_action_update_arg_parser.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/version/arg_parser.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/version/arg_parser.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/main.c#7 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/Makefile#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/Makefile.inc#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/README#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/Makefile#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/add.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/extract.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/futil.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/main.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/perform.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/pkg_add.1#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/Makefile#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/create.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/main.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/perform.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/pkg_create.1#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/pl.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/delete/Makefile#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/delete/delete.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/delete/main.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/delete/perform.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/delete/pkg_delete.1#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/Makefile#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/info.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/main.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/perform.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/pkg_info.1#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/show.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/.match.c.swp#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/Makefile#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/add_del.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/deps.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/exec.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/file.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/global.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/lib.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/match.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/msg.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/pen.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/pkgwrap.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/plist.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/str.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/url.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/version.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lsof.gmon#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/prof_scripts/prof_postprocess.pl#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/prof_scripts/prof_process.pl#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/prof_scripts/run_prof.sh#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/Makefile#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/README#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/check.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/common.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/extern.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/gzip.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/gzip.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/main.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/pgp.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/pgp_check.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/pgp_sign.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/pkg_sign.1#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/sha1.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/sign.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/stand.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/stand.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/x509.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/tkpkg#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/unlocker.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/Makefile#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/main.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/perform.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/perform.old.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/pkg_version.1#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/test-pkg_version.sh#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/version.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/archive_read_open_stream.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/macros.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg.c#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg.h#6 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db.c#7 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db.h#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_freebsd.c#9 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_match.c#6 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_private.h#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd.c#8 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_contents.c#6 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_lexer.l#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_parser.y#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_private.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_manifest.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_manifest_freebsd.c#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_private.h#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo.c#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_files.c#6 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_ftp.c#6 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_local_freebsd.c#7 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_private.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox.c#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox.h#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox_private.h#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_util.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkgfile.c#7 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/scripts/styleify.pl#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_add/main.c#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_delete/main.c#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_info/main.c#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_info/match.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_info/pkg_info.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_info/show.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_sign/main.c#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_version/main.c#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/add/arg_parser.c#2 (text+ko) ==== @@ -1,7 +1,8 @@ -#include "pkg_add_arg_parser.h" +#include "ap/add/arg_parser.h" -void -parse_args() +int +pkg_action_add_parse_args(pkg_action_settings *settings, int optind, + char **optarg) { while ((ch = getopt(argc, argv, options)) != -1) { ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/add/arg_parser.h#2 (text+ko) ==== @@ -2,6 +2,7 @@ #define __PKG_ACT_ADD_AP_H - +int pkg_action_add_parse_args(pkg_action_settings *, int, char **); +void pkg_action_add_print_usage(); #endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/check/arg_parser.c#2 (text+ko) ==== @@ -1,1 +1,8 @@ -#include "pkg_add_arg_parser.h" +#include "ap/check/arg_parser.h" + +int +pkg_action_check_parse_args(pkg_action_settings *settings, int optind, + char **optarg) +{ + /** Same ole song **/ +} ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/check/arg_parser.h#2 (text+ko) ==== @@ -2,6 +2,7 @@ #define __PKG_ACT_CHECK_AP_H - +int pkg_action_check_parse_args(pkg_action_settings*, int, char **); +void pkg_action_check_print_usage(); #endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/clean/arg_parser.c#2 (text+ko) ==== @@ -1,3 +1,9 @@ -#include "pkg_action_clean_arg_parser.h" +#include "ap/clean/arg_parser.h" + +int +parse_clean_args(pkg_settings **settings, int settings_offset, char *opt_string, + int opt_cnt) +{ +} ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/clean/arg_parser.h#2 (text+ko) ==== @@ -2,6 +2,8 @@ #define __PKG_ACT_CLEAN_AP_H +int pkg_action_clean_parse_args(pkg_action_settings*, int, char **); +void pkg_action_clean_print_usage(); #endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/create/arg_parser.c#2 (text+ko) ==== @@ -1,3 +1,5 @@ +#include "ap/create/arg_parser.h" + /* * Parse arguments specific to pkg_create(1). * @@ -6,7 +8,9 @@ * @return 1 on failure (argument supported; invalid input). */ int -parse_create_args(pkg_settings **settings, int settings_offset, char *opt_string, int opt_cnt) { +parse_create_args(pkg_settings **settings, int settings_offset, char *opt_string, + int opt_cnt) +{ char opt_char; ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/create/arg_parser.h#2 (text+ko) ==== @@ -1,0 +1,8 @@ +#ifndef __PKG_ACT_CREATE_AP_H + +#define __PKG_ACT_CREATE_AP_H + +int pkg_action_create_parse_args(pkg_action_settings*, int, char **); +void pkg_action_create_print_usage(); + +#endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/delete/arg_parser.c#2 (text+ko) ==== @@ -1,7 +1,8 @@ -#include "pkg_add_arg_parser.h" +#include "ap/delete/arg_parser.h" int -parse() +pkg_action_delete_parse_args(pkg_settings **settings, int settings_offset, + char *opt_string, int opt_cnt) { /** Parse args **/ ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/delete/arg_parser.h#2 (text+ko) ==== @@ -2,6 +2,7 @@ #define __PKG_ACT_DELETE_AP_H - +int pkg_action_delete_parse_args(pkg_action_settings*, int, char **); +void pkg_action_delete_print_usage(); #endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/info/arg_parser.c#2 (text+ko) ==== @@ -1,7 +1,8 @@ -#include "pkg_add_arg_parser.h" +#include "ap/info/arg_parser.h" int -parse() +pkg_action_info_parse_args(pkg_action_settings *settings, int optind, + char **optarg) { /** getopt blah goes here.. **/ ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/info/arg_parser.h#2 (text+ko) ==== @@ -2,6 +2,8 @@ #define __PKG_ACT_INFO_AP_H +int pkg_action_info_parse_args(pkg_action_settings*, int, char **); +void pkg_action_info_print_usage(); #endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/show/arg_parser.c#2 (text+ko) ==== @@ -1,1 +1,14 @@ -#include "pkg_add_arg_parser.h" +#include "ap/show/arg_parser.h" + +/* + * The steps req'd should be similar for pkg_show, as for pkg_version, as far + * as searching for the pkgs is concerned.. + */ +int +pkg_action_show_parse_args(pkg_action_settings *settings, int optind, + char **optarg) +{ + + return -1; + +} ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/show/arg_parser.h#2 (text+ko) ==== @@ -2,6 +2,7 @@ #define __PKG_ACT_SHOW_AP_H - +int pkg_action_show_parse_args(pkg_action_settings*, int, char **); +void pkg_action_show_print_usage(); #endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/sign/arg_parser.c#2 (text+ko) ==== @@ -1,9 +1,12 @@ -#include "pkg_add_arg_parser.h" +#include "ap/sign/arg_parser.h" int -parse() +pkg_action_sign_parse_args(pkg_action_settings *settings, int optind, + char **optarg) { + { + case 't': if (strcmp(optarg, "pgp") == 0) type = TAG_PGP; @@ -34,4 +37,6 @@ case 'c': mode = CHECK; + } + } ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/sign/arg_parser.h#2 (text+ko) ==== @@ -2,6 +2,7 @@ #define __PKG_ACT_SIGN_AP_H - +int pkg_action_sign_parse_args(pkg_action_settings*, int, char **); +void pkg_action_sign_print_usage(); #endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/update/arg_parser.h#2 (text+ko) ==== @@ -2,6 +2,7 @@ #define __PKG_ACT_UPDATE_AP_H - +int pkg_action_update_parse_args(pkg_action_settings*, int, char **); +void pkg_action_update_print_usage(); #endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/update/pkg_action_update_arg_parser.c#2 (text+ko) ==== @@ -1,1 +1,12 @@ -#include "pkg_add_arg_parser.h" +#include "ap/update/arg_parser.h" + +/* + * Finish off implementation. Should be pkg_version junk, followed up by + * with pkg_delete and pkg_add commands. + */ +int +pkg_action_update_parse_args(pkg_action_settings *settings, int optind, + char **optarg) +{ + return -1; +} ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/version/arg_parser.c#2 (text+ko) ==== @@ -1,7 +1,8 @@ -#include "pkg_add_arg_parser.h" +#include "ap/version/arg_parser.h" int -parse() +pkg_action_version_parse_args(pkg_action_settings *settings, int optind, + char **optarg) { /* ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/version/arg_parser.h#2 (text+ko) ==== @@ -2,6 +2,7 @@ #define __PKG_ACT_VERSION_AP_H - +int pkg_action_version_parse_args(pkg_action_settings*, int, char **); +void pkg_action_version_print_usage(); #endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/main.c#7 (text+ko) ==== @@ -1,6 +1,5 @@ #include "pkgman.h" -#include "pkgman_action.h" -#include "pkgman_arg_parser.h" +#include "ap/pkg_action_settings.h" pkg_action init_action(int, freebsd_pkg_q_item); @@ -100,7 +99,8 @@ /** Prefix **/ case 'p': if (optarg != NULL && strlen(optarg)) { - strdup(global_settings->prefix_path_str, optarg); + strdup(global_settings->prefix_path_str, + optarg); } else { } @@ -152,8 +152,9 @@ * If arguments usage was invalid, print usage message for specific command * and exit.. */ - if (0 < parsers[action_type]->parse_args(parsers[action_type], - global_settings, optional_opts_ind+1, optional_opt_str_p)) { + if (0 < parsers[action_type]->parse_args(global_settings, + optional_opts_ind+1, optional_opt_str_p) + ) { /** Display the main usage arguments **/ if (action_type != _pkg_null) { parsers[_pkg_null]->print_use(); From owner-p4-projects@FreeBSD.ORG Wed Jan 16 01:03:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A2E6516A41B; Wed, 16 Jan 2008 01:03:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6833916A418 for ; Wed, 16 Jan 2008 01:03:09 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3234D13C455 for ; Wed, 16 Jan 2008 01:03:09 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0G139Df053322 for ; Wed, 16 Jan 2008 01:03:09 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0G1399f053319 for perforce@freebsd.org; Wed, 16 Jan 2008 01:03:09 GMT (envelope-from gcooper@FreeBSD.org) Date: Wed, 16 Jan 2008 01:03:09 GMT Message-Id: <200801160103.m0G1399f053319@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 133380 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 01:03:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=133380 Change 133380 by gcooper@shiina-ibook on 2008/01/16 01:03:01 Forgotten rename from 2 days ago.. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/update/arg_parser.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jan 16 01:05:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 061DD16A418; Wed, 16 Jan 2008 01:05:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A798516A474 for ; Wed, 16 Jan 2008 01:05:11 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 897B113C469 for ; Wed, 16 Jan 2008 01:05:11 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0G15BNP054233 for ; Wed, 16 Jan 2008 01:05:11 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0G15Bxf054224 for perforce@freebsd.org; Wed, 16 Jan 2008 01:05:11 GMT (envelope-from imp@freebsd.org) Date: Wed, 16 Jan 2008 01:05:11 GMT Message-Id: <200801160105.m0G15Bxf054224@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133381 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 01:05:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=133381 Change 133381 by imp@imp_lighthouse on 2008/01/16 01:04:10 integrate from mips2 Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/md_var.h#7 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#13 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/pmap.c#16 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/adm5120/adm5120_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/idt_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/malta_machdep.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/sentry5/s5_machdep.c#2 integrate Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/md_var.h#7 (text+ko) ==== ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#13 (text+ko) ==== @@ -267,21 +267,17 @@ void mips_proc0_init(void) { - kstack0 = pmap_steal_memory(KSTACK_PAGES * PAGE_SIZE); + proc_linkup(&proc0, &thread0); thread0.td_kstack = kstack0; - thread0.td_pcb = (struct pcb *) - (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; - - thread0.td_frame = &thread0.td_pcb->pcb_regs; - - /* Initialize pcpu info of cpu-zero */ + /* Initialize pcpu info of cpu-zero */ #ifdef SMP pcpu_init(&__pcpu[0], 0, sizeof(struct pcpu)); #else pcpu_init(pcpup, 0, sizeof(struct pcpu)); #endif - - proc_linkup(&proc0, &thread0); + pcpup->pc_curthread = &thread0; + cpu_thread_alloc(curthread); + pcpup->pc_curpcb = curthread->td_pcb; PCPU_SET(curthread, &thread0); PCPU_SET(curpcb, thread0.td_pcb); } ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/pmap.c#16 (text+ko) ==== @@ -1,3 +1,4 @@ + kstack0 = pmap_steal_memory(KSTACK_PAGES * PAGE_SIZE); /* * Copyright (c) 1991 Regents of the University of California. * All rights reserved. ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/adm5120/adm5120_machdep.c#2 (text+ko) ==== @@ -94,19 +94,10 @@ init_param1(); init_param2(physmem); - mips_cpu_init(); pmap_bootstrap(); - - proc_linkup(&proc0, &thread0); - thread0.td_kstack = kstack0; - pcpu_init(pcpup, 0, sizeof(struct pcpu)); - pcpup->pc_curthread = &thread0; - cpu_thread_alloc(curthread); - pcpup->pc_curpcb = curthread->td_pcb; - + mips_proc0_init(); mutex_init(); - #ifdef DDB kdb_init(); #endif ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/idt_machdep.c#2 (text+ko) ==== @@ -145,19 +145,10 @@ cninit(); init_param2(physmem); - mips_cpu_init(); pmap_bootstrap(); - - proc_linkup(&proc0, &thread0); - thread0.td_kstack = kstack0; - pcpu_init(pcpup, 0, sizeof(struct pcpu)); - pcpup->pc_curthread = &thread0; - cpu_thread_alloc(curthread); - pcpup->pc_curpcb = curthread->td_pcb; - + mips_proc0_init(); mutex_init(); - #ifdef DDB kdb_init(); #endif ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/malta_machdep.c#5 (text+ko) ==== @@ -179,23 +179,10 @@ init_param1(); init_param2(physmem); - mips_cpu_init(); pmap_bootstrap(); - -#if 0 - proc_linkup(&proc0, &thread0); - thread0.td_kstack = kstack0; - pcpu_init(pcpup, 0, sizeof(struct pcpu)); - pcpup->pc_curthread = &thread0; - cpu_thread_alloc(curthread); - pcpup->pc_curpcb = curthread->td_pcb; -#else mips_proc0_init(); -#endif - mutex_init(); - #ifdef DDB kdb_init(); #endif ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/sentry5/s5_machdep.c#2 (text+ko) ==== @@ -132,19 +132,10 @@ init_param1(); init_param2(physmem); - mips_cpu_init(); pmap_bootstrap(); - - proc_linkup(&proc0, &thread0); - thread0.td_kstack = kstack0; - pcpu_init(pcpup, 0, sizeof(struct pcpu)); - pcpup->pc_curthread = &thread0; - cpu_thread_alloc(curthread); - pcpup->pc_curpcb = curthread->td_pcb; - + mips_proc0_init(); mutex_init(); - #ifdef DDB kdb_init(); #endif From owner-p4-projects@FreeBSD.ORG Wed Jan 16 01:08:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 551D816A419; Wed, 16 Jan 2008 01:08:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 00F1316A46B; Wed, 16 Jan 2008 01:08:30 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mxout1.cac.washington.edu (mxout1.cac.washington.edu [140.142.32.134]) by mx1.freebsd.org (Postfix) with ESMTP id C3C1313C458; Wed, 16 Jan 2008 01:08:29 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from smtp.washington.edu (smtp.washington.edu [140.142.32.139]) by mxout1.cac.washington.edu (8.13.7+UW06.06/8.13.7+UW07.09) with ESMTP id m0G18TQH015086 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 15 Jan 2008 17:08:29 -0800 X-Auth-Received: from [128.208.5.22] (shiina-1.dyn.cs.washington.edu [128.208.5.22]) (authenticated authid=youshi10) by smtp.washington.edu (8.13.7+UW06.06/8.13.7+UW07.09) with ESMTP id m0G18T71028459 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Tue, 15 Jan 2008 17:08:29 -0800 In-Reply-To: <200801160102.m0G125Pq051182@repoman.freebsd.org> References: <200801160102.m0G125Pq051182@repoman.freebsd.org> Mime-Version: 1.0 (Apple Message framework v753) X-Gpgmail-State: !signed Content-Type: text/plain; charset=US-ASCII; format=flowed Message-Id: <6D80B7A5-2E86-4D18-A798-7A1A2208D4ED@gmail.com> Content-Transfer-Encoding: 7bit From: Garrett Cooper Date: Tue, 15 Jan 2008 17:08:30 -0800 To: Garrett Cooper X-Mailer: Apple Mail (2.753) X-PMX-Version: 5.4.1.325704, Antispam-Engine: 2.6.0.325393, Antispam-Data: 2008.1.15.165445 X-Uwash-Spam: Gauge=IIIIIII, Probability=7%, Report='FORGED_FROM_GMAIL 0.1, BODY_SIZE_300_399 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FRAUD_419_WEBMAIL 0, __FRAUD_419_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __SANE_MSGID 0' Cc: perforce@FreeBSD.org Subject: Re: PERFORCE change 133379 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 01:08:30 -0000 On Jan 16, 2008, at 1:02 AM, Garrett Cooper wrote: > http://perforce.freebsd.org/chv.cgi?CH=133379 > > Change 133379 by gcooper@shiina-ibook on 2008/01/16 01:01:15 > > Updating to properly reflect current interfaces. > > Affected files ... [...] Please ignore the empty edits. That was accidental. -Garrett From owner-p4-projects@FreeBSD.ORG Wed Jan 16 01:16:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D104416A46C; Wed, 16 Jan 2008 01:16:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9688416A419 for ; Wed, 16 Jan 2008 01:16:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 772A113C467 for ; Wed, 16 Jan 2008 01:16:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0G1GNQB059018 for ; Wed, 16 Jan 2008 01:16:23 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0G1GNRD059015 for perforce@freebsd.org; Wed, 16 Jan 2008 01:16:23 GMT (envelope-from sam@freebsd.org) Date: Wed, 16 Jan 2008 01:16:23 GMT Message-Id: <200801160116.m0G1GNRD059015@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133383 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 01:16:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=133383 Change 133383 by sam@sam_ebb on 2008/01/16 01:15:36 kludge kludge kludge: make the com lock recursive Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#14 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#14 (text+ko) ==== @@ -33,7 +33,7 @@ */ typedef struct mtx ieee80211_com_lock_t; #define IEEE80211_LOCK_INIT(_ic, _name) \ - mtx_init(&(_ic)->ic_comlock, _name, "802.11 com lock", MTX_DEF) + mtx_init(&(_ic)->ic_comlock, _name, "802.11 com lock", MTX_DEF | MTX_RECURSE) #define IEEE80211_LOCK_DESTROY(_ic) mtx_destroy(&(_ic)->ic_comlock) #define IEEE80211_LOCK(_ic) mtx_lock(&(_ic)->ic_comlock) #define IEEE80211_UNLOCK(_ic) mtx_unlock(&(_ic)->ic_comlock) From owner-p4-projects@FreeBSD.ORG Wed Jan 16 01:27:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38BEA16A51F; Wed, 16 Jan 2008 01:27:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D3B8B16A501 for ; Wed, 16 Jan 2008 01:27:44 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B225013C4E1 for ; Wed, 16 Jan 2008 01:27:44 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0G1RiPc065050 for ; Wed, 16 Jan 2008 01:27:44 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0G1Risb065046 for perforce@freebsd.org; Wed, 16 Jan 2008 01:27:44 GMT (envelope-from imp@freebsd.org) Date: Wed, 16 Jan 2008 01:27:44 GMT Message-Id: <200801160127.m0G1Risb065046@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133384 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 01:27:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=133384 Change 133384 by imp@imp_lighthouse on 2008/01/16 01:26:43 Initialize kstack0 in the mips2 way rather than in the jmips way. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/md_var.h#8 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/pmap.c#17 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/md_var.h#8 (text+ko) ==== @@ -43,6 +43,8 @@ extern char sigcode[]; extern int szsigcode, szosigcode; +extern vm_offset_t kstack0; + void MipsSaveCurFPState(struct thread *); void fork_trampoline(void); void cpu_swapin(struct proc *); ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/pmap.c#17 (text+ko) ==== @@ -1,4 +1,3 @@ - kstack0 = pmap_steal_memory(KSTACK_PAGES * PAGE_SIZE); /* * Copyright (c) 1991 Regents of the University of California. * All rights reserved. @@ -256,7 +255,8 @@ } /* - * Bootstrap the system enough to run with virtual memory. + * Bootstrap the system enough to run with virtual memory. This + * assumes that the phys_avail array has been initialized. */ void pmap_bootstrap(void) @@ -265,6 +265,51 @@ pt_entry_t *pte; int i, j; + /* Sort. */ +again: + for (i = 0; phys_avail[i + 1] != 0; i += 2) { + if (i < 2) + continue; + if (phys_avail[i - 2] > phys_avail[i]) { + vm_paddr_t ptemp[2]; + + ptemp[0] = phys_avail[i+0]; + ptemp[1] = phys_avail[i+1]; + + phys_avail[i + 0] = phys_avail[i - 2]; + phys_avail[i + 1] = phys_avail[i - 1]; + + phys_avail[i - 2] = ptemp[0]; + phys_avail[i - 1] = ptemp[1]; + goto again; + } + } + + if (bootverbose) { + printf("Physical memory chunk(s):\n"); + for (i = 0; phys_avail[i + 1] != 0; i += 2) { + vm_paddr_t size; + + size = phys_avail[i + 1] - phys_avail[i]; + printf("%#08jx - %#08jx, %ju bytes (%ju pages)\n", + (uintmax_t)phys_avail[i], + (uintmax_t)phys_avail[i + 1] - 1, + (uintmax_t)size, (uintmax_t)size / PAGE_SIZE); + } + } + + + /* + * Steal the message buffer from the beginning of memory. + */ + msgbufp = (struct msgbuf *) pmap_steal_memory(MSGBUF_SIZE); + msgbufinit(msgbufp, MSGBUF_SIZE); + + /* + * Steal thread0 kstack. + */ + kstack0 = pmap_steal_memory(KSTACK_PAGES << PAGE_SHIFT); + /* * Allocate segment table for the kernel */ From owner-p4-projects@FreeBSD.ORG Wed Jan 16 01:31:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4EF016A420; Wed, 16 Jan 2008 01:31:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9A59A16A418 for ; Wed, 16 Jan 2008 01:31:50 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7BAEA13C43E for ; Wed, 16 Jan 2008 01:31:50 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0G1Vo2f067238 for ; Wed, 16 Jan 2008 01:31:50 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0G1Vogc067233 for perforce@freebsd.org; Wed, 16 Jan 2008 01:31:50 GMT (envelope-from sam@freebsd.org) Date: Wed, 16 Jan 2008 01:31:50 GMT Message-Id: <200801160131.m0G1Vogc067233@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133385 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 01:31:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=133385 Change 133385 by sam@sam_ebb on 2008/01/16 01:31:41 you cannot tape 802.3 frames off the underyling device any more (only radiotap); remove the tap calls as they do a null ptr deref (don't see a clean way to make this a noop) Affected files ... .. //depot/projects/vap/sys/dev/ral/rt2560.c#7 edit .. //depot/projects/vap/sys/dev/ral/rt2661.c#7 edit Differences ... ==== //depot/projects/vap/sys/dev/ral/rt2560.c#7 (text) ==== @@ -2029,8 +2029,6 @@ break; } - BPF_MTAP(ifp, m); - ni = (struct ieee80211_node *) m->m_pkthdr.rcvif; m = ieee80211_encap(ni, m); if (m == NULL) { ==== //depot/projects/vap/sys/dev/ral/rt2661.c#7 (text) ==== @@ -1794,8 +1794,6 @@ break; } - BPF_MTAP(ifp, m); - ni = (struct ieee80211_node *) m->m_pkthdr.rcvif; m = ieee80211_encap(ni, m); if (m == NULL) { From owner-p4-projects@FreeBSD.ORG Wed Jan 16 02:06:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E488416A421; Wed, 16 Jan 2008 02:06:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9140516A418 for ; Wed, 16 Jan 2008 02:06:54 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7000413C465 for ; Wed, 16 Jan 2008 02:06:54 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0G26ssj090060 for ; Wed, 16 Jan 2008 02:06:54 GMT (envelope-from qingli@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0G26rGm090040 for perforce@freebsd.org; Wed, 16 Jan 2008 02:06:53 GMT (envelope-from qingli@freebsd.org) Date: Wed, 16 Jan 2008 02:06:53 GMT Message-Id: <200801160206.m0G26rGm090040@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to qingli@freebsd.org using -f From: Qing Li To: Perforce Change Reviews Cc: Subject: PERFORCE change 133386 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 02:06:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=133386 Change 133386 by qingli@FreeBSD-newarp on 2008/01/16 02:06:47 Provide equal cost multi-path support in the routing infrastructure. Affected files ... .. //depot/projects/arp-v2/src/sys/net/route.c#4 edit .. //depot/projects/qingli_mpath/src/COPYRIGHT#1 branch .. //depot/projects/qingli_mpath/src/LOCKS#1 branch .. //depot/projects/qingli_mpath/src/MAINTAINERS#1 branch .. //depot/projects/qingli_mpath/src/Makefile#1 branch .. //depot/projects/qingli_mpath/src/Makefile.inc1#1 branch .. //depot/projects/qingli_mpath/src/ObsoleteFiles.inc#1 branch .. //depot/projects/qingli_mpath/src/README#1 branch .. //depot/projects/qingli_mpath/src/UPDATING#1 branch .. //depot/projects/qingli_mpath/src/bin/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/Makefile.inc#1 branch .. //depot/projects/qingli_mpath/src/bin/cat/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/cat/cat.1#1 branch .. //depot/projects/qingli_mpath/src/bin/cat/cat.c#1 branch .. //depot/projects/qingli_mpath/src/bin/chflags/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/chflags/chflags.1#1 branch .. //depot/projects/qingli_mpath/src/bin/chflags/chflags.c#1 branch .. //depot/projects/qingli_mpath/src/bin/chio/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/chio/chio.1#1 branch .. //depot/projects/qingli_mpath/src/bin/chio/chio.c#1 branch .. //depot/projects/qingli_mpath/src/bin/chio/defs.h#1 branch .. //depot/projects/qingli_mpath/src/bin/chio/pathnames.h#1 branch .. //depot/projects/qingli_mpath/src/bin/chmod/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/chmod/chmod.1#1 branch .. //depot/projects/qingli_mpath/src/bin/chmod/chmod.c#1 branch .. //depot/projects/qingli_mpath/src/bin/cp/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/cp/cp.1#1 branch .. //depot/projects/qingli_mpath/src/bin/cp/cp.c#1 branch .. //depot/projects/qingli_mpath/src/bin/cp/extern.h#1 branch .. //depot/projects/qingli_mpath/src/bin/cp/utils.c#1 branch .. //depot/projects/qingli_mpath/src/bin/csh/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/qingli_mpath/src/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/qingli_mpath/src/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/qingli_mpath/src/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/qingli_mpath/src/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/qingli_mpath/src/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/qingli_mpath/src/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/qingli_mpath/src/bin/csh/config.h#1 branch .. //depot/projects/qingli_mpath/src/bin/csh/config_p.h#1 branch .. //depot/projects/qingli_mpath/src/bin/csh/host.defs#1 branch .. //depot/projects/qingli_mpath/src/bin/csh/iconv.h#1 branch .. //depot/projects/qingli_mpath/src/bin/csh/iconv_stub.c#1 branch .. //depot/projects/qingli_mpath/src/bin/date/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/date/date.1#1 branch .. //depot/projects/qingli_mpath/src/bin/date/date.c#1 branch .. //depot/projects/qingli_mpath/src/bin/date/extern.h#1 branch .. //depot/projects/qingli_mpath/src/bin/date/netdate.c#1 branch .. //depot/projects/qingli_mpath/src/bin/date/vary.c#1 branch .. //depot/projects/qingli_mpath/src/bin/date/vary.h#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/args.c#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/conv.c#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/conv_tab.c#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/dd.1#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/dd.c#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/dd.h#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/extern.h#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/gen.c#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/misc.c#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/position.c#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/ref.ascii#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/ref.ebcdic#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/ref.ibm#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/ref.lcase#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/ref.oldascii#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/ref.oldibm#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/ref.pareven#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/ref.parnone#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/ref.parodd#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/ref.parset#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/ref.swab#1 branch .. //depot/projects/qingli_mpath/src/bin/dd/ref.ucase#1 branch .. //depot/projects/qingli_mpath/src/bin/df/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/df/df.1#1 branch .. //depot/projects/qingli_mpath/src/bin/df/df.c#1 branch .. //depot/projects/qingli_mpath/src/bin/domainname/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/domainname/domainname.1#1 branch .. //depot/projects/qingli_mpath/src/bin/domainname/domainname.c#1 branch .. //depot/projects/qingli_mpath/src/bin/echo/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/echo/echo.1#1 branch .. //depot/projects/qingli_mpath/src/bin/echo/echo.c#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/POSIX#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/README#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/buf.c#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/cbc.c#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/ed.1#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/ed.h#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/glbl.c#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/io.c#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/main.c#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/re.c#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/sub.c#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/=.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/README#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/TODO#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/a.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/a.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/a.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/a1.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/a2.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/addr.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/addr.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/addr.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/addr1.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/addr2.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/ascii.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/bang1.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/bang1.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/bang1.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/bang1.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/bang2.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/c.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/c.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/c.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/c1.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/c2.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/d.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/d.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/d.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/d.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/e1.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/e1.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/e1.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/e1.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/e2.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/e2.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/e2.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/e2.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/e3.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/e3.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/e3.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/e3.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/e4.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/e4.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/e4.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/f1.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/f2.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/g1.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/g1.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/g1.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/g1.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/g2.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/g2.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/g2.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/g2.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/g3.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/g3.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/g3.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/g3.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/g4.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/g4.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/g4.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/g5.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/g5.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/g5.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/h.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/i.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/i.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/i.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/i1.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/i2.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/i3.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/j.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/j.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/j.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/k.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/k.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/k.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/k1.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/k2.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/k3.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/k4.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/l.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/l.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/l.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/m.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/m.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/m.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/m.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/n.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/n.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/n.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/nl.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/nl1.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/nl1.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/nl1.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/nl2.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/nl2.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/nl2.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/p.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/p.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/p.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/q.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/q.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/q.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/q1.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/r1.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/r1.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/r1.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/r1.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/r2.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/r2.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/r2.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/r2.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/r3.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/r3.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/r3.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/s1.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/s1.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/s1.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/s1.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/s10.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/s2.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/s2.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/s2.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/s2.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/s3.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/s3.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/s3.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/s3.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/s4.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/s5.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/s6.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/s7.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/s8.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/s9.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/t.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/t.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/t1.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/t1.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/t1.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/t1.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/t2.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/t2.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/t2.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/t2.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/u.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/u.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/u.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/u.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/v.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/v.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/v.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/w.d#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/w.r#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/w.t#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/w1.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/w2.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/w3.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/x.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/test/z.err#1 branch .. //depot/projects/qingli_mpath/src/bin/ed/undo.c#1 branch .. //depot/projects/qingli_mpath/src/bin/expr/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/expr/expr.1#1 branch .. //depot/projects/qingli_mpath/src/bin/expr/expr.y#1 branch .. //depot/projects/qingli_mpath/src/bin/getfacl/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/getfacl/getfacl.1#1 branch .. //depot/projects/qingli_mpath/src/bin/getfacl/getfacl.c#1 branch .. //depot/projects/qingli_mpath/src/bin/hostname/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/hostname/hostname.1#1 branch .. //depot/projects/qingli_mpath/src/bin/hostname/hostname.c#1 branch .. //depot/projects/qingli_mpath/src/bin/kenv/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/kenv/kenv.1#1 branch .. //depot/projects/qingli_mpath/src/bin/kenv/kenv.c#1 branch .. //depot/projects/qingli_mpath/src/bin/kill/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/kill/kill.1#1 branch .. //depot/projects/qingli_mpath/src/bin/kill/kill.c#1 branch .. //depot/projects/qingli_mpath/src/bin/ln/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/ln/ln.1#1 branch .. //depot/projects/qingli_mpath/src/bin/ln/ln.c#1 branch .. //depot/projects/qingli_mpath/src/bin/ln/symlink.7#1 branch .. //depot/projects/qingli_mpath/src/bin/ls/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/ls/cmp.c#1 branch .. //depot/projects/qingli_mpath/src/bin/ls/extern.h#1 branch .. //depot/projects/qingli_mpath/src/bin/ls/ls.1#1 branch .. //depot/projects/qingli_mpath/src/bin/ls/ls.c#1 branch .. //depot/projects/qingli_mpath/src/bin/ls/ls.h#1 branch .. //depot/projects/qingli_mpath/src/bin/ls/print.c#1 branch .. //depot/projects/qingli_mpath/src/bin/ls/util.c#1 branch .. //depot/projects/qingli_mpath/src/bin/mkdir/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/mkdir/mkdir.1#1 branch .. //depot/projects/qingli_mpath/src/bin/mkdir/mkdir.c#1 branch .. //depot/projects/qingli_mpath/src/bin/mv/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/mv/mv.1#1 branch .. //depot/projects/qingli_mpath/src/bin/mv/mv.c#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/ar_io.c#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/ar_subs.c#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/buf_subs.c#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/cache.c#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/cache.h#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/cpio.1#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/cpio.c#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/cpio.h#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/extern.h#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/file_subs.c#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/ftree.c#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/ftree.h#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/gen_subs.c#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/getoldopt.c#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/options.c#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/options.h#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/pat_rep.c#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/pat_rep.h#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/pax.1#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/pax.c#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/pax.h#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/sel_subs.c#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/sel_subs.h#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/tables.c#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/tables.h#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/tar.1#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/tar.c#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/tar.h#1 branch .. //depot/projects/qingli_mpath/src/bin/pax/tty_subs.c#1 branch .. //depot/projects/qingli_mpath/src/bin/ps/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/ps/extern.h#1 branch .. //depot/projects/qingli_mpath/src/bin/ps/fmt.c#1 branch .. //depot/projects/qingli_mpath/src/bin/ps/keyword.c#1 branch .. //depot/projects/qingli_mpath/src/bin/ps/nlist.c#1 branch .. //depot/projects/qingli_mpath/src/bin/ps/print.c#1 branch .. //depot/projects/qingli_mpath/src/bin/ps/ps.1#1 branch .. //depot/projects/qingli_mpath/src/bin/ps/ps.c#1 branch .. //depot/projects/qingli_mpath/src/bin/ps/ps.h#1 branch .. //depot/projects/qingli_mpath/src/bin/pwd/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/pwd/pwd.1#1 branch .. //depot/projects/qingli_mpath/src/bin/pwd/pwd.c#1 branch .. //depot/projects/qingli_mpath/src/bin/rcp/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/rcp/extern.h#1 branch .. //depot/projects/qingli_mpath/src/bin/rcp/rcp.1#1 branch .. //depot/projects/qingli_mpath/src/bin/rcp/rcp.c#1 branch .. //depot/projects/qingli_mpath/src/bin/rcp/util.c#1 branch .. //depot/projects/qingli_mpath/src/bin/realpath/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/realpath/realpath.1#1 branch .. //depot/projects/qingli_mpath/src/bin/realpath/realpath.c#1 branch .. //depot/projects/qingli_mpath/src/bin/rm/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/rm/rm.1#1 branch .. //depot/projects/qingli_mpath/src/bin/rm/rm.c#1 branch .. //depot/projects/qingli_mpath/src/bin/rmail/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/rmdir/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/rmdir/rmdir.1#1 branch .. //depot/projects/qingli_mpath/src/bin/rmdir/rmdir.c#1 branch .. //depot/projects/qingli_mpath/src/bin/setfacl/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/setfacl/file.c#1 branch .. //depot/projects/qingli_mpath/src/bin/setfacl/mask.c#1 branch .. //depot/projects/qingli_mpath/src/bin/setfacl/merge.c#1 branch .. //depot/projects/qingli_mpath/src/bin/setfacl/remove.c#1 branch .. //depot/projects/qingli_mpath/src/bin/setfacl/setfacl.1#1 branch .. //depot/projects/qingli_mpath/src/bin/setfacl/setfacl.c#1 branch .. //depot/projects/qingli_mpath/src/bin/setfacl/setfacl.h#1 branch .. //depot/projects/qingli_mpath/src/bin/setfacl/util.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/TOUR#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/alias.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/alias.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/arith.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/arith.y#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/arith_lex.l#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/bltin/echo.1#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/bltin/echo.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/builtins.def#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/cd.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/cd.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/error.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/error.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/eval.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/eval.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/exec.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/exec.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/expand.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/expand.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/funcs/cmv#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/funcs/dirs#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/funcs/kill#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/funcs/login#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/funcs/newgrp#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/funcs/popd#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/funcs/pushd#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/funcs/suspend#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/histedit.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/init.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/input.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/input.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/jobs.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/jobs.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/mail.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/mail.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/main.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/main.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/memalloc.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/memalloc.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/miscbltin.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/mkbuiltins#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/mkinit.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/mknodes.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/mksyntax.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/mktokens#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/myhistedit.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/mystring.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/mystring.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/nodes.c.pat#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/nodetypes#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/options.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/options.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/output.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/output.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/parser.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/parser.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/redir.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/redir.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/sh.1#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/shell.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/show.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/show.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/trap.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/trap.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/var.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sh/var.h#1 branch .. //depot/projects/qingli_mpath/src/bin/sleep/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/sleep/sleep.1#1 branch .. //depot/projects/qingli_mpath/src/bin/sleep/sleep.c#1 branch .. //depot/projects/qingli_mpath/src/bin/stty/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/stty/cchar.c#1 branch .. //depot/projects/qingli_mpath/src/bin/stty/extern.h#1 branch .. //depot/projects/qingli_mpath/src/bin/stty/gfmt.c#1 branch .. //depot/projects/qingli_mpath/src/bin/stty/key.c#1 branch .. //depot/projects/qingli_mpath/src/bin/stty/modes.c#1 branch .. //depot/projects/qingli_mpath/src/bin/stty/print.c#1 branch .. //depot/projects/qingli_mpath/src/bin/stty/stty.1#1 branch .. //depot/projects/qingli_mpath/src/bin/stty/stty.c#1 branch .. //depot/projects/qingli_mpath/src/bin/stty/stty.h#1 branch .. //depot/projects/qingli_mpath/src/bin/stty/util.c#1 branch .. //depot/projects/qingli_mpath/src/bin/sync/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/sync/sync.8#1 branch .. //depot/projects/qingli_mpath/src/bin/sync/sync.c#1 branch .. //depot/projects/qingli_mpath/src/bin/test/Makefile#1 branch .. //depot/projects/qingli_mpath/src/bin/test/TEST.README#1 branch .. //depot/projects/qingli_mpath/src/bin/test/TEST.csh#1 branch .. //depot/projects/qingli_mpath/src/bin/test/TEST.sh#1 branch .. //depot/projects/qingli_mpath/src/bin/test/test.1#1 branch .. //depot/projects/qingli_mpath/src/bin/test/test.c#1 branch .. //depot/projects/qingli_mpath/src/cddl/Makefile#1 branch .. //depot/projects/qingli_mpath/src/cddl/Makefile.inc#1 branch .. //depot/projects/qingli_mpath/src/cddl/lib/Makefile#1 branch .. //depot/projects/qingli_mpath/src/cddl/lib/Makefile.inc#1 branch .. //depot/projects/qingli_mpath/src/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/qingli_mpath/src/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/qingli_mpath/src/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/qingli_mpath/src/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/qingli_mpath/src/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/qingli_mpath/src/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/qingli_mpath/src/cddl/sbin/Makefile#1 branch .. //depot/projects/qingli_mpath/src/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/qingli_mpath/src/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/qingli_mpath/src/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/qingli_mpath/src/cddl/usr.bin/Makefile#1 branch .. //depot/projects/qingli_mpath/src/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/qingli_mpath/src/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/qingli_mpath/src/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/qingli_mpath/src/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/qingli_mpath/src/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/qingli_mpath/src/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/qingli_mpath/src/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/qingli_mpath/src/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/qingli_mpath/src/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/qingli_mpath/src/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/qingli_mpath/src/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/qingli_mpath/src/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/qingli_mpath/src/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/qingli_mpath/src/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/qingli_mpath/src/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/qingli_mpath/src/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/qingli_mpath/src/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/qingli_mpath/src/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/qingli_mpath/src/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/qingli_mpath/src/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/qingli_mpath/src/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/qingli_mpath/src/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/qingli_mpath/src/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/qingli_mpath/src/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/qingli_mpath/src/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/qingli_mpath/src/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/AUTHORS#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/BUGS#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/COPYING#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/ChangeLog#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/FAQ#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/INSTALL#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/NEWS#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/README#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/README.attrcache#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/README.ldap#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/README.y2k#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/amd.8#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/amd.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/amd.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/amfs_generic.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/autil.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/clock.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/conf.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/info_exec.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/map.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/opts.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/readdir.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/restart.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/sched.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amq/amq.8#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amq/amq.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amq/amq.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/bootstrap#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/doc/stamp-vti#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/doc/version.texi#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/ldap.schema#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/libamu/strutil.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/scripts/test-attrcache.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/tasks#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/vers.m4#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/qingli_mpath/src/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/AUTHORS#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/ChangeLog#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/FAQ#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/INSTALL#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Makefile.am#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Makefile.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/NEWS#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/README#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Test/array.b#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Test/atan.b#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Test/div.b#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Test/exp.b#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Test/fact.b#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Test/jn.b#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Test/ln.b#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Test/mul.b#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Test/raise.b#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Test/signum#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Test/sine.b#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/Test/timetest#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/acconfig.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/aclocal.m4#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/bc/bc.y#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/bc/const.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/bc/execute.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/bc/global.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/bc/global.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/bc/load.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/bc/main.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/bc/proto.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/bc/scan.l#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/bc/storage.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/bc/util.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/config.h.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/configure#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/configure.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/dc/array.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/dc/dc.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/dc/dc.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/dc/eval.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/dc/misc.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/dc/stack.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/dc/string.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/doc/bc.1#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/doc/dc.1#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/h/number.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/install-sh#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/lib/number.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/missing#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/qingli_mpath/src/contrib/bc/stamp-h.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/CHANGES#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/FAQ#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/Makefile.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/README#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/README.idnkit#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/acconfig.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/config.guess#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/config.sub#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/config.threads.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/configure.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/Bv9ARM.ch10.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/isc-logo.eps#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/isc-logo.pdf#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/man.dig.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/man.dnssec-keygen.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/man.dnssec-signzone.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/man.host.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/man.named-checkconf.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/man.named-checkzone.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/man.named.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/man.rndc-confgen.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/man.rndc.conf.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/arm/man.rndc.html#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/qingli_mpath/src/contrib/bind9/doc/rfc/rfc1995.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 16 02:10:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6532016A49A; Wed, 16 Jan 2008 02:10:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A4BC16A481 for ; Wed, 16 Jan 2008 02:10:02 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0B57413C461 for ; Wed, 16 Jan 2008 02:10:02 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0G2A1nB091095 for ; Wed, 16 Jan 2008 02:10:01 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0G2A1Lk091092 for perforce@freebsd.org; Wed, 16 Jan 2008 02:10:01 GMT (envelope-from imp@freebsd.org) Date: Wed, 16 Jan 2008 02:10:01 GMT Message-Id: <200801160210.m0G2A1Lk091092@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133388 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 02:10:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=133388 Change 133388 by imp@imp_lighthouse on 2008/01/16 02:09:01 fix obvious typo in the dcache printing routine. Obtained from: cavium Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/cpu.c#20 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/cpu.c#20 (text+ko) ==== @@ -243,15 +243,15 @@ } printf(" L1 d-cache: "); - if (cpuinfo.l1.ic_linesize == 0) { + if (cpuinfo.l1.dc_linesize == 0) { printf("disabled"); } else { - if (cpuinfo.l1.ic_nways == 1) { + if (cpuinfo.l1.dc_nways == 1) { printf("direct-mapped with"); } else { - printf ("%d ways of", cpuinfo.l1.ic_nways); + printf ("%d ways of", cpuinfo.l1.dc_nways); } - printf(" %d sets, %d bytes per line\n", cpuinfo.l1.ic_nsets, cpuinfo.l1.ic_linesize); + printf(" %d sets, %d bytes per line\n", cpuinfo.l1.dc_nsets, cpuinfo.l1.dc_linesize); } } From owner-p4-projects@FreeBSD.ORG Wed Jan 16 03:08:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8613A16A420; Wed, 16 Jan 2008 03:08:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 48AD216A41B for ; Wed, 16 Jan 2008 03:08:34 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2896413C455 for ; Wed, 16 Jan 2008 03:08:34 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0G38YIs022255 for ; Wed, 16 Jan 2008 03:08:34 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0G384Zs021961 for perforce@freebsd.org; Wed, 16 Jan 2008 03:08:04 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 16 Jan 2008 03:08:04 GMT Message-Id: <200801160308.m0G384Zs021961@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133392 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 03:08:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=133392 Change 133392 by kmacy@kmacy:storage:toehead on 2008/01/16 03:07:51 IFC 133391 Affected files ... .. //depot/projects/toehead/COPYRIGHT#2 integrate .. //depot/projects/toehead/ObsoleteFiles.inc#2 integrate .. //depot/projects/toehead/bin/cp/cp.c#2 integrate .. //depot/projects/toehead/bin/mv/mv.c#3 integrate .. //depot/projects/toehead/contrib/cvs/AUTHORS#2 integrate .. //depot/projects/toehead/contrib/cvs/BUGS#2 integrate .. //depot/projects/toehead/contrib/cvs/ChangeLog#2 integrate .. //depot/projects/toehead/contrib/cvs/FAQ#2 integrate .. //depot/projects/toehead/contrib/cvs/FREEBSD-Xlist#2 integrate .. //depot/projects/toehead/contrib/cvs/FREEBSD-upgrade#2 integrate .. //depot/projects/toehead/contrib/cvs/HACKING#2 integrate .. //depot/projects/toehead/contrib/cvs/INSTALL#2 integrate .. //depot/projects/toehead/contrib/cvs/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/cvs/NEWS#2 integrate .. //depot/projects/toehead/contrib/cvs/README#2 integrate .. //depot/projects/toehead/contrib/cvs/TESTS#2 integrate .. //depot/projects/toehead/contrib/cvs/TODO#2 integrate .. //depot/projects/toehead/contrib/cvs/acinclude.m4#2 integrate .. //depot/projects/toehead/contrib/cvs/aclocal.m4#2 integrate .. //depot/projects/toehead/contrib/cvs/config.h.in#2 integrate .. //depot/projects/toehead/contrib/cvs/configure#2 integrate .. //depot/projects/toehead/contrib/cvs/configure.in#2 integrate .. //depot/projects/toehead/contrib/cvs/contrib/ChangeLog#2 integrate .. //depot/projects/toehead/contrib/cvs/contrib/Makefile.am#2 integrate .. //depot/projects/toehead/contrib/cvs/contrib/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/cvs/contrib/README#2 integrate .. //depot/projects/toehead/contrib/cvs/contrib/clmerge.in#2 integrate .. //depot/projects/toehead/contrib/cvs/contrib/cln_hist.in#2 integrate .. //depot/projects/toehead/contrib/cvs/contrib/commit_prep.in#2 integrate .. //depot/projects/toehead/contrib/cvs/contrib/cvs2vendor.sh#2 integrate .. //depot/projects/toehead/contrib/cvs/contrib/cvs_acls.html#1 branch .. //depot/projects/toehead/contrib/cvs/contrib/cvs_acls.in#2 integrate .. //depot/projects/toehead/contrib/cvs/contrib/cvscheck.sh#2 integrate .. //depot/projects/toehead/contrib/cvs/contrib/debug_check_log.sh#2 integrate .. //depot/projects/toehead/contrib/cvs/contrib/descend.sh#2 integrate .. //depot/projects/toehead/contrib/cvs/contrib/log.in#2 integrate .. //depot/projects/toehead/contrib/cvs/contrib/log_accum.in#2 integrate .. //depot/projects/toehead/contrib/cvs/contrib/mfpipe.in#2 integrate .. //depot/projects/toehead/contrib/cvs/contrib/pvcs2rcs.in#2 integrate .. //depot/projects/toehead/contrib/cvs/contrib/rcs-to-cvs.sh#2 integrate .. //depot/projects/toehead/contrib/cvs/contrib/rcs2log.sh#2 integrate .. //depot/projects/toehead/contrib/cvs/contrib/rcs2sccs.sh#2 integrate .. //depot/projects/toehead/contrib/cvs/contrib/rcslock.in#2 integrate .. //depot/projects/toehead/contrib/cvs/contrib/sccs2rcs.in#2 integrate .. //depot/projects/toehead/contrib/cvs/diff/ChangeLog#2 integrate .. //depot/projects/toehead/contrib/cvs/diff/Makefile.am#2 integrate .. //depot/projects/toehead/contrib/cvs/diff/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/cvs/doc/ChangeLog#2 integrate .. //depot/projects/toehead/contrib/cvs/doc/Makefile.am#2 integrate .. //depot/projects/toehead/contrib/cvs/doc/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/cvs/doc/cvs.1#2 integrate .. //depot/projects/toehead/contrib/cvs/doc/cvs.man.footer#2 integrate .. //depot/projects/toehead/contrib/cvs/doc/cvs.man.header#2 integrate .. //depot/projects/toehead/contrib/cvs/doc/cvs.texinfo#2 integrate .. //depot/projects/toehead/contrib/cvs/doc/cvsclient.texi#2 integrate .. //depot/projects/toehead/contrib/cvs/doc/mkman.in#2 delete .. //depot/projects/toehead/contrib/cvs/doc/mkman.pl#1 branch .. //depot/projects/toehead/contrib/cvs/doc/stamp-1#2 integrate .. //depot/projects/toehead/contrib/cvs/doc/stamp-vti#2 integrate .. //depot/projects/toehead/contrib/cvs/doc/version-client.texi#2 integrate .. //depot/projects/toehead/contrib/cvs/doc/version.texi#2 integrate .. //depot/projects/toehead/contrib/cvs/lib/ChangeLog#2 integrate .. //depot/projects/toehead/contrib/cvs/lib/Makefile.am#2 integrate .. //depot/projects/toehead/contrib/cvs/lib/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/cvs/lib/fncase.c#2 integrate .. //depot/projects/toehead/contrib/cvs/lib/getdate#1 branch .. //depot/projects/toehead/contrib/cvs/lib/getpass.c#2 integrate .. //depot/projects/toehead/contrib/cvs/lib/regex.c#2 integrate .. //depot/projects/toehead/contrib/cvs/lib/system.h#2 integrate .. //depot/projects/toehead/contrib/cvs/lib/test-getdate.sh#1 branch .. //depot/projects/toehead/contrib/cvs/lib/xtime.h#2 integrate .. //depot/projects/toehead/contrib/cvs/man/ChangeLog#2 integrate .. //depot/projects/toehead/contrib/cvs/man/Makefile.am#2 integrate .. //depot/projects/toehead/contrib/cvs/man/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/cvs/man/cvs.1#2 integrate .. //depot/projects/toehead/contrib/cvs/src/ChangeLog#2 integrate .. //depot/projects/toehead/contrib/cvs/src/Makefile.am#2 integrate .. //depot/projects/toehead/contrib/cvs/src/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/cvs/src/add.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/admin.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/annotate.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/buffer.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/buffer.h#2 integrate .. //depot/projects/toehead/contrib/cvs/src/checkin.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/checkout.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/classify.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/client.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/client.h#2 integrate .. //depot/projects/toehead/contrib/cvs/src/commit.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/create_adm.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/cvs.h#2 integrate .. //depot/projects/toehead/contrib/cvs/src/cvsrc.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/diff.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/edit.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/entries.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/expand_path.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/fileattr.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/filesubr.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/find_names.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/hardlink.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/hardlink.h#2 integrate .. //depot/projects/toehead/contrib/cvs/src/hash.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/hash.h#2 integrate .. //depot/projects/toehead/contrib/cvs/src/history.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/history.h#2 integrate .. //depot/projects/toehead/contrib/cvs/src/ignore.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/import.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/lock.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/log.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/login.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/logmsg.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/main.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/mkmodules.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/modules.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/myndbm.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/myndbm.h#2 integrate .. //depot/projects/toehead/contrib/cvs/src/no_diff.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/parseinfo.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/patch.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/rcs.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/rcs.h#2 integrate .. //depot/projects/toehead/contrib/cvs/src/rcscmds.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/recurse.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/release.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/remove.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/repos.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/root.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/root.h#2 integrate .. //depot/projects/toehead/contrib/cvs/src/run.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/sanity.sh#2 integrate .. //depot/projects/toehead/contrib/cvs/src/server.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/server.h#2 integrate .. //depot/projects/toehead/contrib/cvs/src/stack.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/stack.h#2 integrate .. //depot/projects/toehead/contrib/cvs/src/status.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/subr.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/tag.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/update.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/vers_ts.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/version.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/watch.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/wrapper.c#2 integrate .. //depot/projects/toehead/contrib/cvs/src/zlib.c#2 integrate .. //depot/projects/toehead/contrib/cvs/tools/ChangeLog#2 integrate .. //depot/projects/toehead/contrib/cvs/tools/Makefile.am#2 integrate .. //depot/projects/toehead/contrib/cvs/tools/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/cvs/tools/README#2 integrate .. //depot/projects/toehead/contrib/file/ChangeLog#2 integrate .. //depot/projects/toehead/contrib/file/Magdir/acorn#2 integrate .. //depot/projects/toehead/contrib/file/Magdir/animation#2 integrate .. //depot/projects/toehead/contrib/file/Magdir/apple#2 integrate .. //depot/projects/toehead/contrib/file/Magdir/archive#2 integrate .. //depot/projects/toehead/contrib/file/Magdir/audio#2 integrate .. //depot/projects/toehead/contrib/file/Magdir/blender#2 integrate .. //depot/projects/toehead/contrib/file/Magdir/commands#2 integrate .. //depot/projects/toehead/contrib/file/Magdir/console#2 integrate .. //depot/projects/toehead/contrib/file/Magdir/database#2 integrate .. //depot/projects/toehead/contrib/file/Magdir/efi#1 branch .. //depot/projects/toehead/contrib/file/Magdir/elf#2 integrate .. //depot/projects/toehead/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/toehead/contrib/file/Magdir/fortran#1 branch .. //depot/projects/toehead/contrib/file/Magdir/java#2 integrate .. //depot/projects/toehead/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/toehead/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/toehead/contrib/file/Magdir/pdf#2 integrate .. //depot/projects/toehead/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/toehead/contrib/file/Makefile.am#2 integrate .. //depot/projects/toehead/contrib/file/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/file/acinclude.m4#2 integrate .. //depot/projects/toehead/contrib/file/aclocal.m4#2 integrate .. //depot/projects/toehead/contrib/file/apprentice.c#2 integrate .. //depot/projects/toehead/contrib/file/ascmagic.c#2 integrate .. //depot/projects/toehead/contrib/file/compress.c#2 integrate .. //depot/projects/toehead/contrib/file/config.h.in#2 integrate .. //depot/projects/toehead/contrib/file/configure#2 integrate .. //depot/projects/toehead/contrib/file/configure.in#2 integrate .. //depot/projects/toehead/contrib/file/file.c#2 integrate .. //depot/projects/toehead/contrib/file/file.h#2 integrate .. //depot/projects/toehead/contrib/file/file.man#2 integrate .. //depot/projects/toehead/contrib/file/file_opts.h#1 branch .. //depot/projects/toehead/contrib/file/fsmagic.c#2 integrate .. //depot/projects/toehead/contrib/file/funcs.c#2 integrate .. //depot/projects/toehead/contrib/file/install-sh#2 integrate .. //depot/projects/toehead/contrib/file/is_tar.c#2 integrate .. //depot/projects/toehead/contrib/file/libmagic.man#2 integrate .. //depot/projects/toehead/contrib/file/magic.c#2 integrate .. //depot/projects/toehead/contrib/file/magic.h#2 integrate .. //depot/projects/toehead/contrib/file/magic.man#2 integrate .. //depot/projects/toehead/contrib/file/magic.mime#2 integrate .. //depot/projects/toehead/contrib/file/mkinstalldirs#2 integrate .. //depot/projects/toehead/contrib/file/names.h#2 integrate .. //depot/projects/toehead/contrib/file/patchlevel.h#2 integrate .. //depot/projects/toehead/contrib/file/print.c#2 integrate .. //depot/projects/toehead/contrib/file/readelf.c#2 integrate .. //depot/projects/toehead/contrib/file/readelf.h#2 integrate .. //depot/projects/toehead/contrib/file/softmagic.c#2 integrate .. //depot/projects/toehead/contrib/libiberty/cp-demangle.c#1 branch .. //depot/projects/toehead/contrib/ncurses/FREEBSD-upgrade#2 integrate .. //depot/projects/toehead/contrib/ncurses/INSTALL#2 integrate .. //depot/projects/toehead/contrib/ncurses/MANIFEST#2 integrate .. //depot/projects/toehead/contrib/ncurses/NEWS#2 integrate .. //depot/projects/toehead/contrib/ncurses/TO-DO#2 integrate .. //depot/projects/toehead/contrib/ncurses/aclocal.m4#2 integrate .. //depot/projects/toehead/contrib/ncurses/config.guess#2 integrate .. //depot/projects/toehead/contrib/ncurses/config.sub#2 integrate .. //depot/projects/toehead/contrib/ncurses/configure#2 integrate .. //depot/projects/toehead/contrib/ncurses/configure.in#2 integrate .. //depot/projects/toehead/contrib/ncurses/dist.mk#2 integrate .. //depot/projects/toehead/contrib/ncurses/doc/hackguide.doc#2 integrate .. //depot/projects/toehead/contrib/ncurses/doc/html/ncurses-intro.html#2 integrate .. //depot/projects/toehead/contrib/ncurses/doc/ncurses-intro.doc#2 integrate .. //depot/projects/toehead/contrib/ncurses/form/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/ncurses/form/fld_def.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/form/fld_dup.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/form/fld_ftlink.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/form/fld_link.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/form/fld_newftyp.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/form/frm_def.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/form/frm_driver.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/form/fty_alnum.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/form/fty_alpha.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/form/fty_enum.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/form/fty_int.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/form/fty_num.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/form/fty_regex.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/form/headers#2 integrate .. //depot/projects/toehead/contrib/ncurses/form/modules#2 integrate .. //depot/projects/toehead/contrib/ncurses/include/MKterm.h.awk.in#2 integrate .. //depot/projects/toehead/contrib/ncurses/include/curses.h.in#2 integrate .. //depot/projects/toehead/contrib/ncurses/include/curses.tail#2 integrate .. //depot/projects/toehead/contrib/ncurses/include/curses.wide#2 integrate .. //depot/projects/toehead/contrib/ncurses/include/headers#2 integrate .. //depot/projects/toehead/contrib/ncurses/include/nc_alloc.h#2 integrate .. //depot/projects/toehead/contrib/ncurses/include/ncurses_defs#2 integrate .. //depot/projects/toehead/contrib/ncurses/include/ncurses_dll.h#2 integrate .. //depot/projects/toehead/contrib/ncurses/include/tic.h#2 integrate .. //depot/projects/toehead/contrib/ncurses/install-sh#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/captoinfo.1m#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/clear.1#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/curs_add_wch.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/curs_addch.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/curs_attr.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/curs_border.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/curs_deleteln.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/curs_extend.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/curs_getcchar.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/curs_getyx.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/curs_insstr.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/curs_legacy.3x#1 branch .. //depot/projects/toehead/contrib/ncurses/man/curs_mouse.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/curs_opaque.3x#1 branch .. //depot/projects/toehead/contrib/ncurses/man/curs_outopts.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/curs_printw.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/curs_scanw.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/curs_scr_dump.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/curs_slk.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/curs_termattrs.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/curs_termcap.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/curs_terminfo.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/curs_trace.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/curs_util.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/default_colors.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/form_driver.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/form_field_new.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/form_field_opts.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/form_field_validation.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/form_hook.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/form_opts.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/infocmp.1m#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/infotocap.1m#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/legacy_coding.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/man_db.renames#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/menu_driver.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/menu_hook.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/menu_opts.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/mitem_opts.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/ncurses.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/panel.3x#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/term.5#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/term.7#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/terminfo.head#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/terminfo.tail#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/tic.1m#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/toe.1m#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/tput.1#2 integrate .. //depot/projects/toehead/contrib/ncurses/man/tset.1#2 integrate .. //depot/projects/toehead/contrib/ncurses/menu/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/ncurses/menu/headers#2 integrate .. //depot/projects/toehead/contrib/ncurses/menu/menu.h#2 integrate .. //depot/projects/toehead/contrib/ncurses/menu/modules#2 integrate .. //depot/projects/toehead/contrib/ncurses/misc/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/ncurses/misc/ncurses-config.in#2 integrate .. //depot/projects/toehead/contrib/ncurses/misc/shlib#2 integrate .. //depot/projects/toehead/contrib/ncurses/misc/terminfo.src#2 integrate .. //depot/projects/toehead/contrib/ncurses/mk-1st.awk#2 integrate .. //depot/projects/toehead/contrib/ncurses/mk-hdr.awk#1 branch .. //depot/projects/toehead/contrib/ncurses/mkdirs.sh#1 branch .. //depot/projects/toehead/contrib/ncurses/mkinstalldirs#2 delete .. //depot/projects/toehead/contrib/ncurses/ncurses/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/MKkeyname.awk#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/MKlib_gen.sh#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/MKunctrl.awk#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/define_key.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/key_defined.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/keyok.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/lib_addstr.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/lib_color.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/lib_delwin.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/lib_freeall.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/lib_getch.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/lib_initscr.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/lib_instr.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/lib_mouse.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/lib_newterm.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/lib_newwin.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/lib_overlay.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/lib_redrawln.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/lib_refresh.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/lib_restart.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/lib_screen.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/lib_set_term.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/lib_slkinit.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/lib_slkset.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/lib_ungetch.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/lib_window.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/memmove.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/resizeterm.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/safe_sprintf.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/tries.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/base/use_window.c#1 branch .. //depot/projects/toehead/contrib/ncurses/ncurses/base/wresize.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/curses.priv.h#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/llib-lncurses#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/llib-lncursesw#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/modules#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/MKcaptab.sh#1 branch .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/MKcodes.awk#1 branch .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/MKnames.awk#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/access.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/add_tries.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/comp_error.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/comp_hash.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/comp_parse.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/db_iterator.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/entries.c#1 branch .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/home_terminfo.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/init_keytry.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/lib_acs.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/lib_data.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/lib_options.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/lib_raw.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/lib_setup.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/lib_termcap.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/lib_tparm.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/lib_tputs.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/make_keys.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/name_match.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/parse_entry.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/read_entry.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/setbuf.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/strings.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/use_screen.c#1 branch .. //depot/projects/toehead/contrib/ncurses/ncurses/tinfo/write_entry.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/trace/lib_trace.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/trace/lib_traceatr.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/trace/lib_tracebits.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/trace/lib_tracechr.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/trace/lib_tracedmp.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/trace/lib_tracemse.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/trace/trace_buf.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/trace/trace_tries.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/trace/varargs.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/trace/visbuf.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tty/hardscroll.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tty/hashmap.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tty/lib_mvcur.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tty/lib_tstp.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tty/lib_twait.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tty/lib_vidattr.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/tty/tty_update.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/widechar/lib_cchar.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/widechar/lib_get_wch.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/widechar/lib_key_name.c#1 branch .. //depot/projects/toehead/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/panel/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/ncurses/panel/headers#2 integrate .. //depot/projects/toehead/contrib/ncurses/panel/modules#2 integrate .. //depot/projects/toehead/contrib/ncurses/progs/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/ncurses/progs/clear.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/progs/dump_entry.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/progs/infocmp.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/progs/modules#2 integrate .. //depot/projects/toehead/contrib/ncurses/progs/progs.priv.h#2 integrate .. //depot/projects/toehead/contrib/ncurses/progs/tic.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/progs/toe.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/progs/tput.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/progs/tset.c#2 integrate .. //depot/projects/toehead/contrib/ncurses/tack/COPYING#2 delete .. //depot/projects/toehead/contrib/ncurses/tack/HISTORY#2 delete .. //depot/projects/toehead/contrib/ncurses/tack/Makefile.in#2 delete .. //depot/projects/toehead/contrib/ncurses/tack/README#2 delete .. //depot/projects/toehead/contrib/ncurses/tack/ansi.c#2 delete .. //depot/projects/toehead/contrib/ncurses/tack/charset.c#2 delete .. //depot/projects/toehead/contrib/ncurses/tack/color.c#2 delete .. //depot/projects/toehead/contrib/ncurses/tack/control.c#2 delete .. //depot/projects/toehead/contrib/ncurses/tack/crum.c#2 delete .. //depot/projects/toehead/contrib/ncurses/tack/edit.c#2 delete .. //depot/projects/toehead/contrib/ncurses/tack/fun.c#2 delete .. //depot/projects/toehead/contrib/ncurses/tack/init.c#2 delete .. //depot/projects/toehead/contrib/ncurses/tack/menu.c#2 delete .. //depot/projects/toehead/contrib/ncurses/tack/modes.c#2 delete .. //depot/projects/toehead/contrib/ncurses/tack/modules#2 delete .. //depot/projects/toehead/contrib/ncurses/tack/output.c#2 delete .. //depot/projects/toehead/contrib/ncurses/tack/pad.c#2 delete .. //depot/projects/toehead/contrib/ncurses/tack/scan.c#2 delete .. //depot/projects/toehead/contrib/ncurses/tack/sync.c#2 delete .. //depot/projects/toehead/contrib/ncurses/tack/sysdep.c#2 delete .. //depot/projects/toehead/contrib/ncurses/tack/tack.1#2 delete .. //depot/projects/toehead/contrib/ncurses/tack/tack.c#2 delete .. //depot/projects/toehead/contrib/ncurses/tack/tack.h#2 delete .. //depot/projects/toehead/contrib/openpam/CREDITS#2 integrate .. //depot/projects/toehead/contrib/openpam/HISTORY#2 integrate .. //depot/projects/toehead/contrib/openpam/INSTALL#2 integrate .. //depot/projects/toehead/contrib/openpam/LICENSE#2 integrate .. //depot/projects/toehead/contrib/openpam/MANIFEST#2 delete .. //depot/projects/toehead/contrib/openpam/Makefile.am#2 integrate .. //depot/projects/toehead/contrib/openpam/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/openpam/README#2 integrate .. //depot/projects/toehead/contrib/openpam/RELNOTES#2 integrate .. //depot/projects/toehead/contrib/openpam/aclocal.m4#2 integrate .. //depot/projects/toehead/contrib/openpam/autogen.sh#2 integrate .. //depot/projects/toehead/contrib/openpam/bin/Makefile.am#2 integrate .. //depot/projects/toehead/contrib/openpam/bin/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/openpam/bin/su/Makefile.am#2 integrate .. //depot/projects/toehead/contrib/openpam/bin/su/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/openpam/bin/su/su.c#2 integrate .. //depot/projects/toehead/contrib/openpam/compile#1 branch .. //depot/projects/toehead/contrib/openpam/config.h.in#2 integrate .. //depot/projects/toehead/contrib/openpam/configure#2 integrate .. //depot/projects/toehead/contrib/openpam/configure.ac#2 integrate .. //depot/projects/toehead/contrib/openpam/configure.in#2 delete .. //depot/projects/toehead/contrib/openpam/depcomp#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/Makefile.am#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/Makefile.am#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/openpam.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/openpam.man#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/openpam_borrow_cred.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/openpam_free_data.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/openpam_free_envlist.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/openpam_get_option.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/openpam_log.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/openpam_nullconv.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/openpam_readline.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/openpam_restore_cred.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/openpam_set_option.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/openpam_ttyconv.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam.conf.5#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam.man#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_acct_mgmt.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_authenticate.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_chauthtok.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_close_session.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_conv.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_end.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_error.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_get_authtok.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_get_data.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_get_item.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_get_user.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_getenv.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_getenvlist.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_info.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_open_session.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_prompt.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_putenv.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_set_data.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_set_item.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_setcred.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_setenv.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_sm_authenticate.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_sm_chauthtok.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_sm_close_session.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_sm_open_session.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_sm_setcred.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_start.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_strerror.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_verror.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_vinfo.3#2 integrate .. //depot/projects/toehead/contrib/openpam/doc/man/pam_vprompt.3#2 integrate .. //depot/projects/toehead/contrib/openpam/include/Makefile.am#2 integrate .. //depot/projects/toehead/contrib/openpam/include/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/openpam/include/security/Makefile.am#2 integrate .. //depot/projects/toehead/contrib/openpam/include/security/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/openpam/include/security/openpam.h#2 integrate .. //depot/projects/toehead/contrib/openpam/include/security/openpam_attr.h#1 branch .. //depot/projects/toehead/contrib/openpam/include/security/openpam_version.h#2 integrate .. //depot/projects/toehead/contrib/openpam/include/security/pam_appl.h#2 integrate .. //depot/projects/toehead/contrib/openpam/include/security/pam_constants.h#2 integrate .. //depot/projects/toehead/contrib/openpam/include/security/pam_modules.h#2 integrate .. //depot/projects/toehead/contrib/openpam/include/security/pam_types.h#2 integrate .. //depot/projects/toehead/contrib/openpam/install-sh#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/Makefile.am#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/openpam_borrow_cred.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/openpam_configure.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/openpam_dispatch.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/openpam_dynamic.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/openpam_findenv.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/openpam_free_data.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/openpam_free_envlist.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/openpam_get_option.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/openpam_impl.h#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/openpam_load.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/openpam_log.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/openpam_nullconv.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/openpam_readline.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/openpam_restore_cred.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/openpam_set_option.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/openpam_static.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/openpam_ttyconv.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_acct_mgmt.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_authenticate.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_authenticate_secondary.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_chauthtok.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_close_session.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_end.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_error.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_get_authtok.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_get_data.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_get_item.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_get_mapped_authtok.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_get_mapped_username.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_get_user.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_getenv.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_getenvlist.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_info.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_open_session.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_prompt.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_putenv.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_set_data.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_set_item.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_set_mapped_authtok.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_set_mapped_username.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_setcred.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_setenv.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_sm_acct_mgmt.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_sm_authenticate.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_sm_authenticate_secondary.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_sm_chauthtok.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_sm_close_session.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_sm_get_mapped_username.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_sm_open_session.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_sm_set_mapped_username.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_sm_setcred.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_start.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_strerror.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_verror.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_vinfo.c#2 integrate .. //depot/projects/toehead/contrib/openpam/lib/pam_vprompt.c#2 integrate .. //depot/projects/toehead/contrib/openpam/ltconfig#2 delete .. //depot/projects/toehead/contrib/openpam/ltmain.sh#2 integrate .. //depot/projects/toehead/contrib/openpam/misc/gendoc.pl#2 integrate .. //depot/projects/toehead/contrib/openpam/missing#2 integrate .. //depot/projects/toehead/contrib/openpam/mkinstalldirs#2 delete .. //depot/projects/toehead/contrib/openpam/modules/Makefile.am#2 integrate .. //depot/projects/toehead/contrib/openpam/modules/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/openpam/modules/pam_deny/Makefile.am#2 integrate .. //depot/projects/toehead/contrib/openpam/modules/pam_deny/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/openpam/modules/pam_deny/pam_deny.c#2 integrate .. //depot/projects/toehead/contrib/openpam/modules/pam_permit/Makefile.am#2 integrate .. //depot/projects/toehead/contrib/openpam/modules/pam_permit/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/openpam/modules/pam_permit/pam_permit.c#2 integrate .. //depot/projects/toehead/contrib/openpam/modules/pam_unix/Makefile.am#2 integrate .. //depot/projects/toehead/contrib/openpam/modules/pam_unix/Makefile.in#2 integrate .. //depot/projects/toehead/contrib/openpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/toehead/contrib/openpam/stamp-h.in#2 delete .. //depot/projects/toehead/contrib/top/top.c#2 integrate .. //depot/projects/toehead/crypto/openssl/crypto/engine/eng_cryptodev.c#2 integrate .. //depot/projects/toehead/etc/defaults/periodic.conf#2 integrate .. //depot/projects/toehead/etc/defaults/rc.conf#2 integrate .. //depot/projects/toehead/etc/namedb/named.conf#2 integrate .. //depot/projects/toehead/etc/periodic/daily/460.status-mail-rejects#2 integrate .. //depot/projects/toehead/etc/rc.d/jail#2 integrate .. //depot/projects/toehead/etc/rc.firewall#2 integrate .. //depot/projects/toehead/etc/rc.firewall6#2 integrate .. //depot/projects/toehead/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/toehead/games/fortune/datfiles/gerrold.limerick#2 integrate .. //depot/projects/toehead/games/fortune/datfiles/limerick#2 integrate .. //depot/projects/toehead/gnu/usr.bin/Makefile#2 integrate .. //depot/projects/toehead/gnu/usr.bin/cvs/Makefile#2 integrate .. //depot/projects/toehead/gnu/usr.bin/cvs/contrib/Makefile#2 integrate .. //depot/projects/toehead/include/unistd.h#2 integrate .. //depot/projects/toehead/lib/libarchive/Makefile#2 integrate .. //depot/projects/toehead/lib/libarchive/archive.h.in#2 integrate .. //depot/projects/toehead/lib/libarchive/archive_endian.h#1 branch .. //depot/projects/toehead/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/toehead/lib/libarchive/archive_entry.h#2 integrate .. //depot/projects/toehead/lib/libarchive/archive_entry_link_resolver.c#1 branch .. //depot/projects/toehead/lib/libarchive/archive_entry_private.h#2 integrate .. //depot/projects/toehead/lib/libarchive/archive_entry_strmode.c#1 branch .. //depot/projects/toehead/lib/libarchive/archive_platform.h#2 integrate .. //depot/projects/toehead/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/toehead/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/toehead/lib/libarchive/archive_read_support_compression_none.c#2 integrate .. //depot/projects/toehead/lib/libarchive/archive_read_support_format_all.c#2 integrate .. //depot/projects/toehead/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/toehead/lib/libarchive/archive_read_support_format_cpio.c#2 integrate .. //depot/projects/toehead/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate .. //depot/projects/toehead/lib/libarchive/archive_read_support_format_mtree.c#1 branch .. //depot/projects/toehead/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/toehead/lib/libarchive/archive_read_support_format_zip.c#2 integrate .. //depot/projects/toehead/lib/libarchive/archive_util.c#2 integrate .. //depot/projects/toehead/lib/libarchive/archive_write_disk.c#2 integrate .. //depot/projects/toehead/lib/libarchive/archive_write_set_compression_bzip2.c#2 integrate .. //depot/projects/toehead/lib/libarchive/archive_write_set_compression_gzip.c#2 integrate .. //depot/projects/toehead/lib/libarchive/archive_write_set_compression_none.c#2 integrate .. //depot/projects/toehead/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/toehead/lib/libarchive/archive_write_set_format_cpio.c#2 integrate .. //depot/projects/toehead/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/toehead/lib/libarchive/archive_write_set_format_ustar.c#2 integrate .. //depot/projects/toehead/lib/libarchive/cpio.5#1 branch .. //depot/projects/toehead/lib/libarchive/filter_fork.c#2 integrate .. //depot/projects/toehead/lib/libarchive/libarchive-formats.5#2 integrate .. //depot/projects/toehead/lib/libarchive/libarchive_internals.3#2 integrate .. //depot/projects/toehead/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/toehead/lib/libarchive/test/README#2 integrate .. //depot/projects/toehead/lib/libarchive/test/main.c#2 integrate .. //depot/projects/toehead/lib/libarchive/test/read_open_memory.c#2 integrate .. //depot/projects/toehead/lib/libarchive/test/test.h#2 integrate .. //depot/projects/toehead/lib/libarchive/test/test_compat_gtar.c#1 branch .. //depot/projects/toehead/lib/libarchive/test/test_compat_gtar_1.tgz.uu#1 branch .. //depot/projects/toehead/lib/libarchive/test/test_compat_zip.c#1 branch .. //depot/projects/toehead/lib/libarchive/test/test_compat_zip_1.zip.uu#1 branch .. //depot/projects/toehead/lib/libarchive/test/test_empty_write.c#1 branch .. //depot/projects/toehead/lib/libarchive/test/test_entry_strmode.c#1 branch .. //depot/projects/toehead/lib/libarchive/test/test_read_format_cpio_odc.c#2 integrate .. //depot/projects/toehead/lib/libarchive/test/test_read_format_gtar_sparse.c#2 integrate .. //depot/projects/toehead/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu#1 branch .. //depot/projects/toehead/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu#1 branch .. //depot/projects/toehead/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu#1 branch .. //depot/projects/toehead/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu#1 branch .. //depot/projects/toehead/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu#1 branch .. //depot/projects/toehead/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu#1 branch .. //depot/projects/toehead/lib/libarchive/test/test_read_format_isorr_bz2.c#2 integrate .. //depot/projects/toehead/lib/libarchive/test/test_read_format_mtree.c#1 branch .. //depot/projects/toehead/lib/libarchive/test/test_read_format_tar.c#2 integrate .. //depot/projects/toehead/lib/libarchive/test/test_read_format_zip.c#2 integrate .. //depot/projects/toehead/lib/libarchive/test/test_read_pax_truncated.c#2 integrate .. //depot/projects/toehead/lib/libarchive/test/test_tar_filenames.c#2 integrate .. //depot/projects/toehead/lib/libarchive/test/test_tar_large.c#1 branch .. //depot/projects/toehead/lib/libarchive/test/test_write_disk_perms.c#2 integrate .. //depot/projects/toehead/lib/libarchive/test/test_write_format_cpio.c#2 integrate .. //depot/projects/toehead/lib/libarchive/test/test_write_format_cpio_newc.c#1 branch .. //depot/projects/toehead/lib/libarchive/test/test_write_format_cpio_odc.c#1 branch .. //depot/projects/toehead/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/toehead/lib/libc/gen/feature_present.3#1 branch .. //depot/projects/toehead/lib/libc/gen/feature_present.c#1 branch .. //depot/projects/toehead/lib/libc/gen/getttyent.c#2 integrate .. //depot/projects/toehead/lib/libc/gen/posixshm.c#2 delete .. //depot/projects/toehead/lib/libc/gen/sem_open.3#2 integrate .. //depot/projects/toehead/lib/libc/gen/shm_open.3#2 delete .. //depot/projects/toehead/lib/libc/inet/inet_network.c#2 integrate .. //depot/projects/toehead/lib/libc/stdlib/grantpt.c#3 integrate .. //depot/projects/toehead/lib/libc/stdlib/heapsort.c#2 integrate .. //depot/projects/toehead/lib/libc/stdlib/malloc.3#2 integrate .. //depot/projects/toehead/lib/libc/stdlib/malloc.c#3 integrate .. //depot/projects/toehead/lib/libc/stdlib/qsort.c#2 integrate .. //depot/projects/toehead/lib/libc/sys/Makefile.inc#2 integrate .. //depot/projects/toehead/lib/libc/sys/shm_open.2#1 branch .. //depot/projects/toehead/lib/libkvm/kvm.c#2 integrate .. //depot/projects/toehead/lib/libkvm/kvm_file.c#2 integrate .. //depot/projects/toehead/lib/libmagic/config.h#2 integrate .. //depot/projects/toehead/lib/libpam/libpam/Makefile#2 integrate .. //depot/projects/toehead/lib/libpam/modules/pam_krb5/pam_krb5.c#2 integrate .. //depot/projects/toehead/lib/libpam/modules/pam_ssh/pam_ssh.c#2 integrate .. //depot/projects/toehead/lib/libpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/toehead/lib/libthr/thread/thr_sem.c#2 integrate .. //depot/projects/toehead/lib/libutil/pty.3#2 integrate .. //depot/projects/toehead/lib/libutil/pty.c#2 integrate .. //depot/projects/toehead/lib/msun/Makefile#3 integrate .. //depot/projects/toehead/lib/msun/Symbol.map#3 integrate .. //depot/projects/toehead/lib/msun/amd64/Makefile.inc#3 integrate .. //depot/projects/toehead/lib/msun/amd64/s_llrintl.S#1 branch .. //depot/projects/toehead/lib/msun/amd64/s_lrintl.S#1 branch .. //depot/projects/toehead/lib/msun/amd64/s_rintl.S#1 branch .. //depot/projects/toehead/lib/msun/i387/Makefile.inc#3 integrate .. //depot/projects/toehead/lib/msun/i387/s_llrintl.S#1 branch .. //depot/projects/toehead/lib/msun/i387/s_lrintl.S#1 branch .. //depot/projects/toehead/lib/msun/i387/s_rintl.S#1 branch .. //depot/projects/toehead/lib/msun/man/lrint.3#2 integrate .. //depot/projects/toehead/lib/msun/man/rint.3#2 integrate .. //depot/projects/toehead/lib/msun/src/math.h#4 integrate .. //depot/projects/toehead/lib/msun/src/s_csqrt.c#2 integrate .. //depot/projects/toehead/lib/msun/src/s_csqrtf.c#2 integrate .. //depot/projects/toehead/lib/msun/src/s_llrintl.c#1 branch .. //depot/projects/toehead/lib/msun/src/s_lrintl.c#1 branch .. //depot/projects/toehead/lib/msun/src/s_nearbyint.c#2 integrate .. //depot/projects/toehead/lib/msun/src/s_rint.c#2 integrate .. //depot/projects/toehead/lib/msun/src/s_rintl.c#1 branch .. //depot/projects/toehead/lib/ncurses/ncurses/Makefile#2 integrate .. //depot/projects/toehead/lib/ncurses/ncurses/ncurses_cfg.h#2 integrate .. //depot/projects/toehead/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/toehead/sbin/Makefile#2 integrate .. //depot/projects/toehead/sbin/ddb/Makefile#1 branch .. //depot/projects/toehead/sbin/ddb/ddb.8#1 branch .. //depot/projects/toehead/sbin/ddb/ddb.c#1 branch .. //depot/projects/toehead/sbin/ddb/ddb.h#1 branch .. //depot/projects/toehead/sbin/ddb/ddb_script.c#1 branch .. //depot/projects/toehead/sbin/devd/devd.hh#2 integrate .. //depot/projects/toehead/sbin/fsck_msdosfs/boot.c#2 integrate .. //depot/projects/toehead/sbin/quotacheck/quotacheck.c#2 integrate .. //depot/projects/toehead/sbin/savecore/savecore.8#2 integrate .. //depot/projects/toehead/sbin/savecore/savecore.c#2 integrate .. //depot/projects/toehead/sbin/setkey/parse.y#2 integrate .. //depot/projects/toehead/share/colldef/Makefile#2 integrate .. //depot/projects/toehead/share/colldef/README#2 integrate .. //depot/projects/toehead/share/colldef/map.ISO8859-9#1 branch .. //depot/projects/toehead/share/colldef/tr_TR.ISO8859-9.src#1 branch .. //depot/projects/toehead/share/man/man3/tree.3#2 integrate .. //depot/projects/toehead/share/man/man4/Makefile#3 integrate .. //depot/projects/toehead/share/man/man4/bge.4#2 integrate .. //depot/projects/toehead/share/man/man4/ddb.4#2 integrate .. //depot/projects/toehead/share/man/man4/ed.4#2 integrate .. //depot/projects/toehead/share/man/man4/edsc.4#2 integrate .. //depot/projects/toehead/share/man/man4/ipmi.4#2 integrate .. //depot/projects/toehead/share/man/man4/lagg.4#2 integrate .. //depot/projects/toehead/share/man/man4/man4.i386/ep.4#2 integrate .. //depot/projects/toehead/share/man/man4/mxge.4#2 integrate .. //depot/projects/toehead/share/man/man4/ng_car.4#3 integrate .. //depot/projects/toehead/share/man/man4/ng_pppoe.4#2 integrate .. //depot/projects/toehead/share/man/man4/pci.4#2 integrate .. //depot/projects/toehead/share/man/man4/pcib.4#1 branch .. //depot/projects/toehead/share/man/man4/snd_envy24.4#2 integrate .. //depot/projects/toehead/share/man/man4/snd_envy24ht.4#2 integrate .. //depot/projects/toehead/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/toehead/share/man/man4/snd_spicds.4#2 integrate .. //depot/projects/toehead/share/man/man4/textdump.4#1 branch .. //depot/projects/toehead/share/man/man5/boot.config.5#2 integrate .. //depot/projects/toehead/share/man/man5/linsysfs.5#2 integrate .. //depot/projects/toehead/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/toehead/share/man/man5/src.conf.5#4 integrate .. //depot/projects/toehead/share/man/man7/bsd.snmpmod.mk.7#2 integrate .. //depot/projects/toehead/share/man/man7/ports.7#2 integrate .. //depot/projects/toehead/share/man/man9/VOP_LOCK.9#2 integrate .. //depot/projects/toehead/share/man/man9/lock.9#2 integrate .. //depot/projects/toehead/share/man/man9/mbuf_tags.9#2 integrate .. //depot/projects/toehead/share/man/man9/style.9#2 integrate .. //depot/projects/toehead/share/misc/committers-ports.dot#2 integrate .. //depot/projects/toehead/share/misc/committers-src.dot#2 integrate .. //depot/projects/toehead/share/mk/bsd.snmpmod.mk#2 integrate .. //depot/projects/toehead/share/mklocale/Makefile#2 integrate .. //depot/projects/toehead/share/mklocale/tr_TR.ISO8859-9.src#1 branch .. //depot/projects/toehead/share/termcap/termcap.src#2 integrate .. //depot/projects/toehead/share/timedef/am_ET.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/be_BY.CP1131.src#2 integrate .. //depot/projects/toehead/share/timedef/be_BY.CP1251.src#2 integrate .. //depot/projects/toehead/share/timedef/be_BY.ISO8859-5.src#2 integrate .. //depot/projects/toehead/share/timedef/be_BY.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/bg_BG.CP1251.src#2 integrate .. //depot/projects/toehead/share/timedef/bg_BG.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/ca_ES.ISO8859-1.src#2 integrate .. //depot/projects/toehead/share/timedef/ca_ES.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/cs_CZ.ISO8859-2.src#2 integrate .. //depot/projects/toehead/share/timedef/cs_CZ.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/da_DK.ISO8859-1.src#2 integrate .. //depot/projects/toehead/share/timedef/da_DK.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/de_AT.ISO8859-1.src#2 integrate .. //depot/projects/toehead/share/timedef/de_AT.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/de_DE.ISO8859-1.src#2 integrate .. //depot/projects/toehead/share/timedef/de_DE.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/el_GR.ISO8859-7.src#2 integrate .. //depot/projects/toehead/share/timedef/el_GR.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/en_GB.ISO8859-1.src#2 integrate .. //depot/projects/toehead/share/timedef/en_US.ISO8859-1.src#2 integrate .. //depot/projects/toehead/share/timedef/es_ES.ISO8859-1.src#2 integrate .. //depot/projects/toehead/share/timedef/es_ES.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/et_EE.ISO8859-15.src#2 integrate .. //depot/projects/toehead/share/timedef/et_EE.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/eu_ES.ISO8859-1.src#2 integrate .. //depot/projects/toehead/share/timedef/fi_FI.ISO8859-1.src#2 integrate .. //depot/projects/toehead/share/timedef/fi_FI.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/fr_FR.ISO8859-1.src#2 integrate .. //depot/projects/toehead/share/timedef/fr_FR.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/he_IL.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/hi_IN.ISCII-DEV.src#2 integrate .. //depot/projects/toehead/share/timedef/hr_HR.ISO8859-2.src#2 integrate .. //depot/projects/toehead/share/timedef/hr_HR.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/hu_HU.ISO8859-2.src#2 integrate .. //depot/projects/toehead/share/timedef/hu_HU.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/hy_AM.ARMSCII-8.src#2 integrate .. //depot/projects/toehead/share/timedef/hy_AM.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/is_IS.ISO8859-1.src#2 integrate .. //depot/projects/toehead/share/timedef/is_IS.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/it_IT.ISO8859-1.src#2 integrate .. //depot/projects/toehead/share/timedef/it_IT.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/ja_JP.SJIS.src#2 integrate .. //depot/projects/toehead/share/timedef/ja_JP.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/ja_JP.eucJP.src#2 integrate .. //depot/projects/toehead/share/timedef/kk_KZ.PT154.src#2 integrate .. //depot/projects/toehead/share/timedef/kk_KZ.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/ko_KR.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/ko_KR.eucKR.src#2 integrate .. //depot/projects/toehead/share/timedef/la_LN.ISO8859-1.src#2 integrate .. //depot/projects/toehead/share/timedef/lt_LT.ISO8859-13.src#2 integrate .. //depot/projects/toehead/share/timedef/lt_LT.ISO8859-4.src#2 integrate .. //depot/projects/toehead/share/timedef/lt_LT.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/mn_MN.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/nl_NL.ISO8859-1.src#2 integrate .. //depot/projects/toehead/share/timedef/nn_NO.ISO8859-1.src#2 integrate .. //depot/projects/toehead/share/timedef/nn_NO.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/no_NO.ISO8859-1.src#2 integrate .. //depot/projects/toehead/share/timedef/no_NO.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/pl_PL.ISO8859-2.src#2 integrate .. //depot/projects/toehead/share/timedef/pl_PL.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/pt_BR.ISO8859-1.src#2 integrate .. //depot/projects/toehead/share/timedef/pt_BR.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/pt_PT.ISO8859-1.src#2 integrate .. //depot/projects/toehead/share/timedef/pt_PT.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/ro_RO.ISO8859-2.src#2 integrate .. //depot/projects/toehead/share/timedef/ro_RO.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/ru_RU.CP1251.src#2 integrate .. //depot/projects/toehead/share/timedef/ru_RU.CP866.src#2 integrate .. //depot/projects/toehead/share/timedef/ru_RU.ISO8859-5.src#2 integrate .. //depot/projects/toehead/share/timedef/ru_RU.KOI8-R.src#2 integrate .. //depot/projects/toehead/share/timedef/ru_RU.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/sk_SK.ISO8859-2.src#2 integrate .. //depot/projects/toehead/share/timedef/sk_SK.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/sl_SI.ISO8859-2.src#2 integrate .. //depot/projects/toehead/share/timedef/sl_SI.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/sr_YU.ISO8859-2.src#2 integrate .. //depot/projects/toehead/share/timedef/sr_YU.ISO8859-5.src#2 integrate .. //depot/projects/toehead/share/timedef/sr_YU.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/sv_SE.ISO8859-1.src#2 integrate .. //depot/projects/toehead/share/timedef/sv_SE.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/tr_TR.ISO8859-9.src#2 integrate .. //depot/projects/toehead/share/timedef/tr_TR.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/uk_UA.CP1251.src#2 integrate .. //depot/projects/toehead/share/timedef/uk_UA.ISO8859-5.src#2 integrate .. //depot/projects/toehead/share/timedef/uk_UA.KOI8-U.src#2 integrate .. //depot/projects/toehead/share/timedef/uk_UA.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/zh_CN.GB18030.src#2 integrate .. //depot/projects/toehead/share/timedef/zh_CN.GB2312.src#2 integrate .. //depot/projects/toehead/share/timedef/zh_CN.UTF-8.src#2 integrate .. //depot/projects/toehead/share/timedef/zh_CN.eucCN.src#2 integrate .. //depot/projects/toehead/share/timedef/zh_TW.Big5.src#2 integrate .. //depot/projects/toehead/share/timedef/zh_TW.UTF-8.src#2 integrate .. //depot/projects/toehead/share/zoneinfo/backward#2 integrate .. //depot/projects/toehead/share/zoneinfo/europe#2 integrate .. //depot/projects/toehead/share/zoneinfo/southamerica#2 integrate .. //depot/projects/toehead/share/zoneinfo/zone.tab#2 integrate .. //depot/projects/toehead/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/toehead/sys/amd64/amd64/mp_watchdog.c#2 integrate .. //depot/projects/toehead/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/toehead/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/toehead/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/toehead/sys/amd64/include/ieeefp.h#2 integrate .. //depot/projects/toehead/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/toehead/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/toehead/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/toehead/sys/arm/arm/support.S#2 integrate .. //depot/projects/toehead/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/toehead/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/toehead/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/toehead/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/toehead/sys/boot/arm/at91/boot2/bwct_board.c#2 integrate .. //depot/projects/toehead/sys/boot/arm/at91/libat91/spi_flash.c#2 integrate .. //depot/projects/toehead/sys/boot/powerpc/ofw/Makefile#2 integrate .. //depot/projects/toehead/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/toehead/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/toehead/sys/cam/scsi/scsi_low.h#2 integrate .. //depot/projects/toehead/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/toehead/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/toehead/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/toehead/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/toehead/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/toehead/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/toehead/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/toehead/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/toehead/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/toehead/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/toehead/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/toehead/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/toehead/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/toehead/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/toehead/sys/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/toehead/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/toehead/sys/compat/svr4/imgact_svr4.c#2 integrate .. //depot/projects/toehead/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/toehead/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/toehead/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/toehead/sys/conf/NOTES#3 integrate .. //depot/projects/toehead/sys/conf/files#4 integrate .. //depot/projects/toehead/sys/conf/files.i386#3 integrate .. //depot/projects/toehead/sys/conf/options#3 integrate .. //depot/projects/toehead/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/toehead/sys/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/toehead/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/toehead/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/toehead/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/toehead/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/toehead/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/toehead/sys/crypto/rijndael/rijndael-api.c#2 integrate .. //depot/projects/toehead/sys/crypto/rijndael/test00.c#2 integrate .. //depot/projects/toehead/sys/ddb/db_capture.c#1 branch .. //depot/projects/toehead/sys/ddb/db_command.c#2 integrate .. //depot/projects/toehead/sys/ddb/db_command.h#2 integrate .. //depot/projects/toehead/sys/ddb/db_input.c#2 integrate .. //depot/projects/toehead/sys/ddb/db_lex.c#2 integrate .. //depot/projects/toehead/sys/ddb/db_lex.h#2 integrate .. //depot/projects/toehead/sys/ddb/db_main.c#2 integrate .. //depot/projects/toehead/sys/ddb/db_output.c#2 integrate .. //depot/projects/toehead/sys/ddb/db_script.c#1 branch .. //depot/projects/toehead/sys/ddb/db_textdump.c#1 branch .. //depot/projects/toehead/sys/ddb/ddb.h#2 integrate .. //depot/projects/toehead/sys/dev/aac/aac.c#3 integrate .. //depot/projects/toehead/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/toehead/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/toehead/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/toehead/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/toehead/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/toehead/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/toehead/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/toehead/sys/dev/atkbdc/atkbd_atkbdc.c#2 integrate .. //depot/projects/toehead/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/toehead/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/toehead/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/toehead/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/toehead/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/toehead/sys/dev/cxgb/cxgb_l2t.c#3 integrate .. //depot/projects/toehead/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/toehead/sys/dev/cxgb/cxgb_multiq.c#1 branch .. //depot/projects/toehead/sys/dev/cxgb/cxgb_osdep.h#3 integrate .. //depot/projects/toehead/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/toehead/sys/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/toehead/sys/dev/cxgb/sys/mvec.h#3 integrate .. //depot/projects/toehead/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/toehead/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/toehead/sys/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/toehead/sys/dev/ed/if_ed_rtl80x9.c#2 integrate .. //depot/projects/toehead/sys/dev/fb/creator.c#2 integrate .. //depot/projects/toehead/sys/dev/fb/fb.c#2 integrate .. //depot/projects/toehead/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/toehead/sys/dev/fb/machfb.c#2 integrate .. //depot/projects/toehead/sys/dev/fb/splash_bmp.c#2 integrate .. //depot/projects/toehead/sys/dev/fb/splash_pcx.c#2 integrate .. //depot/projects/toehead/sys/dev/fb/vga.c#2 integrate .. //depot/projects/toehead/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/toehead/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/toehead/sys/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/toehead/sys/dev/gem/if_gemreg.h#2 integrate .. //depot/projects/toehead/sys/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/toehead/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate .. //depot/projects/toehead/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/toehead/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/toehead/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/toehead/sys/dev/iir/iir.c#2 integrate .. //depot/projects/toehead/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/toehead/sys/dev/kbd/kbdreg.h#2 integrate .. //depot/projects/toehead/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/toehead/sys/dev/le/am7990.c#2 integrate .. //depot/projects/toehead/sys/dev/le/am79900.c#2 integrate .. //depot/projects/toehead/sys/dev/md/md.c#2 integrate .. //depot/projects/toehead/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/toehead/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/toehead/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/toehead/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/toehead/sys/dev/mxge/mxge_lro.c#2 integrate .. //depot/projects/toehead/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/toehead/sys/dev/mxge/mxge_rss_eth_z8e.c#1 branch .. //depot/projects/toehead/sys/dev/mxge/mxge_rss_ethp_z8e.c#1 branch .. //depot/projects/toehead/sys/dev/mxge/rss_eth_z8e.h#1 branch .. //depot/projects/toehead/sys/dev/mxge/rss_ethp_z8e.h#1 branch .. //depot/projects/toehead/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/toehead/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/toehead/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/toehead/sys/dev/ppbus/ppbconf.h#2 integrate .. //depot/projects/toehead/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/toehead/sys/dev/re/if_re.c#2 integrate .. //depot/projects/toehead/sys/dev/sio/sio.c#2 integrate .. //depot/projects/toehead/sys/dev/snp/snp.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 16 03:09:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0881916A41A; Wed, 16 Jan 2008 03:09:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 91A2F16A417 for ; Wed, 16 Jan 2008 03:09:35 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7393113C4E9 for ; Wed, 16 Jan 2008 03:09:35 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0G39ZQb022643 for ; Wed, 16 Jan 2008 03:09:35 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0G39ZMb022640 for perforce@freebsd.org; Wed, 16 Jan 2008 03:09:35 GMT (envelope-from imp@freebsd.org) Date: Wed, 16 Jan 2008 03:09:35 GMT Message-Id: <200801160309.m0G39ZMb022640@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133393 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 03:09:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=133393 Change 133393 by imp@imp_lighthouse on 2008/01/16 03:08:29 We can finally get rid of mips_init and getbootinfo(). We'll keep a commented out copy of getmemory() because we don't yet know about the mips tlb wiring stuff that was omitted yet. This gets us down to one undefined function, but it is a biggie: mips_cpu_init(). That's going to take some time to sort out. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#14 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#14 (text+ko) ==== @@ -107,8 +107,9 @@ void mips_init(int, int, u_int32_t, struct bootinfo *); void mips_vector_init(void); void hardware_basic_init(void); +#if 0 /* see comment below */ static void getmemsize(void); -static void getbootinfo(int, int, u_int32_t, struct bootinfo *); +#endif #ifdef DEBUG_UART_POLLED void init_bootstrap_console(void); #endif @@ -282,39 +283,6 @@ PCPU_SET(curpcb, thread0.td_pcb); } -static void -getbootinfo(int bootinfo_magic, int boothowto_arg, u_int32_t bootdev_arg, - struct bootinfo *bootinfop) -{ - if (bootinfo_magic == MIPS_BOOTINFO_MAGIC && - bootinfop && bootinfop->bi_version == BOOTINFO_VERSION) { - - bootinfo = *bootinfop; - boothowto = boothowto_arg; - bootdev = bootdev_arg; - - if (bootinfo.bi_modulep) - preload_metadata = (caddr_t)bootinfo.bi_modulep; - - /* set up kern_envp */ - if (bootinfo.bi_envp) - kern_envp = (caddr_t)bootinfo.bi_envp; - } - - /* - * Look at arguments passed to us and compute boothowto. - * Default to SINGLE and ASKNAME if no args or - * SINGLE and DFLTROOT if this is a ramdisk kernel. - */ -#ifdef MD_ROOT - boothowto |= RB_DFLTROOT; -#else - boothowto |= RB_ASKNAME; -#endif /* RAMDISK_HOOKS */ - -} - - #ifdef DEBUG_UART_POLLED void init_bootstrap_console() @@ -329,6 +297,15 @@ #endif struct msgbuf *msgbufp=0; + +#if 0 +/* + * This code has been moved to the platform_init code. The only + * thing that's beign done here that hasn't been moved is the wired tlb + * pool stuff. I'm still trying to understand that feature..., since + * it maps from the end the kernel to 0x08000000 somehow. But the stuff + * was stripped out, so it is hard to say what's going on.... + */ u_int32_t freemem_start; static void @@ -429,7 +406,7 @@ msgbufinit(msgbufp, sz); printf("%s: msgbufp[size=%d] = 0x%p\n", __FUNCTION__, sz, msgbufp); } - +#endif /* * Initialize the hardware exception vectors, and the jump table used to @@ -508,92 +485,6 @@ pcpu->pc_asid_generation = 1; } -#include -/* - * Do all the stuff that locore normally does before calling mi_start(). - * - * We need to migrate to the mips2 way of doing things. There's code in - * locore.S which preserves environment parameters and passes them to - * platform start... - * - * XXXimp - */ -void -mips_init(int bootinfo_magic, int boothowto_arg, u_int32_t bootdev_arg, - struct bootinfo *bootinfop) -{ - char systype[30]; - - /* clear the BSS segment */ - bzero(edata, (vm_offset_t)mips_round_page(end) - (vm_offset_t)edata); - - getbootinfo(bootinfo_magic, boothowto_arg, bootdev_arg, bootinfop); - boothowto = 0x00001820; - - /* - * Identify the processor type by reading the Processor Id register - */ - mfc0_macro(cpu_id, 15); - - switch (mips_proc_type()) { - case MIPS_RM7000: - strcpy(systype, "rm7000"); - need_wired_tlb_page_pool = 0; - break; - - case MIPS_RM9000: - strcpy(systype, "rm9220"); - need_wired_tlb_page_pool = 1; - break; - - default: - break; - } -#ifdef UNIMPLEMENTED - if (cputype >= ncpuinit) { - platform_not_supported(cputype); - /* NOTREACHED */ - } - cpuinit[cputype].init(cputype); -#endif - /* Do basic tuning, hz etc */ - init_param1(); - - hardware_basic_init(); - -#ifdef UNIMPLEMENTED - snprintf(cpu_model, sizeof(cpu_model), "%s", platform.model); -#endif - -#if BOOTINFO_DEBUG - printf("boothowto = %x, bootdev = %x\n", boothowto, bootdev); - printf("bootinfo: version = %x, kernelname = %x, size = %x, memsize_valid = %x, basemem = %x, extmem = %x, symtab = %x, esymtab = %x, modulep = %x, kernend = %x, envp = %x\n", - bootinfo.bi_version, bootinfo.bi_kernelname, bootinfo.bi_size, - bootinfo.bi_memsizes_valid, bootinfo.bi_basemem, - bootinfo.bi_extmem, bootinfo.bi_symtab, bootinfo.bi_esymtab, - bootinfo.bi_modulep, bootinfo.bi_kernend, bootinfo.bi_envp); -#endif - - getmemsize(); - -#if 0 - /* depend on phys_avail being initialized first */ - mips_proc0_init(); - mutex_init(); - -#ifdef DDB - kdb_init(); - if ((boothowto & RB_KDB) || (boothowto & RB_GDB)) - kdb_enter(KDB_WHY_BOOTFLAGS, "Boot flags requested debugger"); -#endif - pmap_bootstrap(); -#else - /* XXXimp need to call platform start */ -#endif - init_param2(physmem); -} - - int sysarch(struct thread *td, register struct sysarch_args *uap) { From owner-p4-projects@FreeBSD.ORG Wed Jan 16 03:50:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B1F016A41A; Wed, 16 Jan 2008 03:50:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C45B116A418 for ; Wed, 16 Jan 2008 03:50:18 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A736013C4EB for ; Wed, 16 Jan 2008 03:50:18 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0G3oIGV044855 for ; Wed, 16 Jan 2008 03:50:18 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0G3oIqB044831 for perforce@freebsd.org; Wed, 16 Jan 2008 03:50:18 GMT (envelope-from sam@freebsd.org) Date: Wed, 16 Jan 2008 03:50:18 GMT Message-Id: <200801160350.m0G3oIqB044831@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133395 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 03:50:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=133395 Change 133395 by sam@sam_ebb on 2008/01/16 03:50:15 move com structure to the front of the softc Affected files ... .. //depot/projects/vap/sys/dev/usb/if_rumvar.h#4 edit .. //depot/projects/vap/sys/dev/usb/if_uralvar.h#6 edit .. //depot/projects/vap/sys/dev/usb/if_zydreg.h#4 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_rumvar.h#4 (text+ko) ==== @@ -82,8 +82,8 @@ #define RUM_VAP(vap) ((struct rum_vap *)(vap)) struct rum_softc { + struct ieee80211com sc_ic; /* NB: must be first */ struct ifnet *sc_ifp; - struct ieee80211com sc_ic; device_t sc_dev; usbd_device_handle sc_udev; ==== //depot/projects/vap/sys/dev/usb/if_uralvar.h#6 (text+ko) ==== @@ -87,8 +87,8 @@ #define URAL_VAP(vap) ((struct ural_vap *)(vap)) struct ural_softc { + struct ieee80211com sc_ic; /* NB: must be first */ struct ifnet *sc_ifp; - struct ieee80211com sc_ic; device_t sc_dev; usbd_device_handle sc_udev; usbd_interface_handle sc_iface; ==== //depot/projects/vap/sys/dev/usb/if_zydreg.h#4 (text+ko) ==== @@ -1184,9 +1184,9 @@ #define ZYD_VAP(vap) ((struct zyd_vap *)(vap)) struct zyd_softc { + struct ieee80211com sc_ic; /* NB: must be first */ device_t sc_dev; struct ifnet *sc_ifp; - struct ieee80211com sc_ic; struct zyd_rf sc_rf; struct usb_task sc_task; From owner-p4-projects@FreeBSD.ORG Wed Jan 16 06:00:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 518E216A421; Wed, 16 Jan 2008 06:00:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F2EA116A417 for ; Wed, 16 Jan 2008 06:00:40 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D5B3213C458 for ; Wed, 16 Jan 2008 06:00:40 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0G60enw029394 for ; Wed, 16 Jan 2008 06:00:40 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0G60eMD029385 for perforce@freebsd.org; Wed, 16 Jan 2008 06:00:40 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Wed, 16 Jan 2008 06:00:40 GMT Message-Id: <200801160600.m0G60eMD029385@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 133398 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 06:00:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=133398 Change 133398 by zhouzhouyi@zhouzhouyi_mactest on 2008/01/16 06:00:39 Style Modification Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/debug/00.t#2 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/debug/00.t#2 (text+ko) ==== @@ -1,75 +1,72 @@ #!/bin/sh -# $FreeBSD: src/tools/regression/mactest/tests/debug/00.t,v 1.2 2007/01/25 20:50:02 zhouzhouyi Exp $ +# $FreeBSD$ -desc="test of bpf" +desc="test of ptrace" dir=`dirname $0` . ${dir}/../misc.sh -echo "1..4" +case "${os}" in +FreeBSD) + + mac_mls_support=`sysctl -n security.mac.mls.enabled 2>/dev/null` + mac_biba_support=`sysctl -n security.mac.biba.enabled 2>/dev/null` + mac_test_support=`sysctl -n security.mac.test.pseudoinit 2>/dev/null` + if [ "${mac_mls_support}" != "" ] && [ "${mac_biba_support}" != "" ] && + [ "${mac_test_support}" != "" ]; then #turn off all the switches -for i in `sysctl security.mac | grep "\.enabled"| - sed 's/\([a-z\.]*\.enabled\)\(:\ \)\([01]\)/\1/`; do -sysctl ${i}=0 -done + for i in `sysctl security.mac | grep "\.enabled"| + sed 's/\([a-z\.]*\.enabled\)\(:\ \)\([01]\)/\1/`; do + sysctl ${i}=0 >/dev/null + done -mac_mls_support=`sysctl -n security.mac.mls.enabled 2>/dev/null` -mac_biba_support=`sysctl -n security.mac.biba.enabled 2>/dev/null` -mac_test_support=`sysctl -n security.mac.test.pseudoinit 2>/dev/null` + if [ -f ${mactest_conf} ]; then + rm ${mactest_conf} + fi + touch ${mactest_conf} + setfmac "mls/equal,biba/equal" ${mactest_conf} + + echo "1..4" -if [ "${mac_mls_support}" != "" ] && [ "${mac_biba_support}" != "" ] && - [ "${mac_test_support}" != "" ]; then - dvplabel=`getfmac ".."| sed 's/\(\.\.:\ \)\([a-z\,\/]*\)/\2/`; - - - if [ -f ${mactest_conf} ]; then - rm ${mactest_conf} - fi - touch ${mactest_conf} - - - -############################################################# - t=`sysctl security.mac.mls.enabled=1` - t=`sysctl security.mac.biba.enabled=1` - echo "enabling mac/mls!" - echo "enabling mac/biba!" - - - + sysctl security.mac.mls.enabled=1 > /dev/null + sysctl security.mac.biba.enabled=1 > /dev/null #case 1: blp can search high - bizarretestexpect ${ptrace} "" \ - "error.attach.proc" -f ${mactest_conf} -t 1 -d "mls/5" \ - -a "mls/6" + bizarretestexpect ${ptrace} "" \ + "error.attach.proc" -f ${mactest_conf} -t 1 -d "mls/5" \ + -a "mls/6" #case 2: blp can attach low - bizarretestexpect ${ptrace} "" \ - "error.attach.proc" -f ${mactest_conf} -t 1 -d "mls/5" \ - -a "mls/4" + bizarretestexpect ${ptrace} "" \ + "error.attach.proc" -f ${mactest_conf} -t 1 -d "mls/5" \ + -a "mls/4" #case 3: biba can search low - bizarretestexpect ${ptrace} "" \ - "error.attach.proc" -f ${mactest_conf} -t 1 -d "biba/5" \ - -a "biba/4" + bizarretestexpect ${ptrace} "" \ + "error.attach.proc" -f ${mactest_conf} -t 1 -d "biba/5" \ + -a "biba/4" #case 4: biba can attach high - echo -n "pid = -2 mac_test_check_proc_debug with cr_label:" > ${mactest_conf} - echo "biba/4(low-high),mls/low(low-high) biba/5(low-high),mls/low(low-high)" \ - >> ${mactest_conf} - bizarretestexpect ${ptrace} "" \ - "error.attach.proc" -f ${mactest_conf} -t 1 -d "biba/4" \ - -a "biba/5" + echo -n "pid = -2 proc_check_debug:" > ${mactest_conf} + echo "biba/4(low-high),mls/low(low-high) biba/5(low-high),mls/low(low-high)" \ + >> ${mactest_conf} + bizarretestexpect ${ptrace} "" \ + "error.attach.proc" -f ${mactest_conf} -t 1 -d "biba/4" -a "biba/5" +#cleanup: + sysctl security.mac.mls.enabled=0 >/dev/null + sysctl security.mac.biba.enabled=0 > /dev/null + rm ${mactest_conf} +#ping received, no firewall + fi +#mac_mls mac_biba and mac_test support + ;; +*) + quick_exit + ;; +esac -#cleanup: - t=`sysctl security.mac.mls.enabled=0` - echo "disabling mac/mls!" - t=`sysctl security.mac.biba.enabled=0` - echo "disabling mac/biba!" - rm ${mactest_conf} -fi From owner-p4-projects@FreeBSD.ORG Wed Jan 16 06:53:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCF1A16A421; Wed, 16 Jan 2008 06:53:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 90FB816A418 for ; Wed, 16 Jan 2008 06:53:33 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7248E13C459 for ; Wed, 16 Jan 2008 06:53:33 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0G6rXpU056726 for ; Wed, 16 Jan 2008 06:53:33 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0G6rGJa056555 for perforce@freebsd.org; Wed, 16 Jan 2008 06:53:16 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 16 Jan 2008 06:53:16 GMT Message-Id: <200801160653.m0G6rGJa056555@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133402 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 06:53:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=133402 Change 133402 by kmacy@pandemonium:kmacy:xen31 on 2008/01/16 06:52:27 IFC 133391 Affected files ... .. //depot/projects/xen31/ObsoleteFiles.inc#8 integrate .. //depot/projects/xen31/contrib/cvs/AUTHORS#2 integrate .. //depot/projects/xen31/contrib/cvs/BUGS#2 integrate .. //depot/projects/xen31/contrib/cvs/ChangeLog#2 integrate .. //depot/projects/xen31/contrib/cvs/FAQ#2 integrate .. //depot/projects/xen31/contrib/cvs/FREEBSD-Xlist#2 integrate .. //depot/projects/xen31/contrib/cvs/FREEBSD-upgrade#2 integrate .. //depot/projects/xen31/contrib/cvs/HACKING#2 integrate .. //depot/projects/xen31/contrib/cvs/INSTALL#2 integrate .. //depot/projects/xen31/contrib/cvs/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/cvs/NEWS#2 integrate .. //depot/projects/xen31/contrib/cvs/README#2 integrate .. //depot/projects/xen31/contrib/cvs/TESTS#2 integrate .. //depot/projects/xen31/contrib/cvs/TODO#2 integrate .. //depot/projects/xen31/contrib/cvs/acinclude.m4#2 integrate .. //depot/projects/xen31/contrib/cvs/aclocal.m4#2 integrate .. //depot/projects/xen31/contrib/cvs/config.h.in#2 integrate .. //depot/projects/xen31/contrib/cvs/configure#2 integrate .. //depot/projects/xen31/contrib/cvs/configure.in#2 integrate .. //depot/projects/xen31/contrib/cvs/contrib/ChangeLog#2 integrate .. //depot/projects/xen31/contrib/cvs/contrib/Makefile.am#2 integrate .. //depot/projects/xen31/contrib/cvs/contrib/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/cvs/contrib/README#2 integrate .. //depot/projects/xen31/contrib/cvs/contrib/clmerge.in#2 integrate .. //depot/projects/xen31/contrib/cvs/contrib/cln_hist.in#2 integrate .. //depot/projects/xen31/contrib/cvs/contrib/commit_prep.in#2 integrate .. //depot/projects/xen31/contrib/cvs/contrib/cvs2vendor.sh#2 integrate .. //depot/projects/xen31/contrib/cvs/contrib/cvs_acls.html#1 branch .. //depot/projects/xen31/contrib/cvs/contrib/cvs_acls.in#2 integrate .. //depot/projects/xen31/contrib/cvs/contrib/cvscheck.sh#2 integrate .. //depot/projects/xen31/contrib/cvs/contrib/debug_check_log.sh#2 integrate .. //depot/projects/xen31/contrib/cvs/contrib/descend.sh#2 integrate .. //depot/projects/xen31/contrib/cvs/contrib/log.in#2 integrate .. //depot/projects/xen31/contrib/cvs/contrib/log_accum.in#2 integrate .. //depot/projects/xen31/contrib/cvs/contrib/mfpipe.in#2 integrate .. //depot/projects/xen31/contrib/cvs/contrib/pvcs2rcs.in#2 integrate .. //depot/projects/xen31/contrib/cvs/contrib/rcs-to-cvs.sh#2 integrate .. //depot/projects/xen31/contrib/cvs/contrib/rcs2log.sh#2 integrate .. //depot/projects/xen31/contrib/cvs/contrib/rcs2sccs.sh#2 integrate .. //depot/projects/xen31/contrib/cvs/contrib/rcslock.in#2 integrate .. //depot/projects/xen31/contrib/cvs/contrib/sccs2rcs.in#2 integrate .. //depot/projects/xen31/contrib/cvs/diff/ChangeLog#2 integrate .. //depot/projects/xen31/contrib/cvs/diff/Makefile.am#2 integrate .. //depot/projects/xen31/contrib/cvs/diff/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/cvs/doc/ChangeLog#2 integrate .. //depot/projects/xen31/contrib/cvs/doc/Makefile.am#2 integrate .. //depot/projects/xen31/contrib/cvs/doc/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/cvs/doc/cvs.1#2 integrate .. //depot/projects/xen31/contrib/cvs/doc/cvs.man.footer#2 integrate .. //depot/projects/xen31/contrib/cvs/doc/cvs.man.header#2 integrate .. //depot/projects/xen31/contrib/cvs/doc/cvs.texinfo#2 integrate .. //depot/projects/xen31/contrib/cvs/doc/cvsclient.texi#2 integrate .. //depot/projects/xen31/contrib/cvs/doc/mkman.in#2 delete .. //depot/projects/xen31/contrib/cvs/doc/mkman.pl#1 branch .. //depot/projects/xen31/contrib/cvs/doc/stamp-1#2 integrate .. //depot/projects/xen31/contrib/cvs/doc/stamp-vti#2 integrate .. //depot/projects/xen31/contrib/cvs/doc/version-client.texi#2 integrate .. //depot/projects/xen31/contrib/cvs/doc/version.texi#2 integrate .. //depot/projects/xen31/contrib/cvs/lib/ChangeLog#2 integrate .. //depot/projects/xen31/contrib/cvs/lib/Makefile.am#2 integrate .. //depot/projects/xen31/contrib/cvs/lib/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/cvs/lib/fncase.c#2 integrate .. //depot/projects/xen31/contrib/cvs/lib/getdate#1 branch .. //depot/projects/xen31/contrib/cvs/lib/getpass.c#2 integrate .. //depot/projects/xen31/contrib/cvs/lib/regex.c#2 integrate .. //depot/projects/xen31/contrib/cvs/lib/system.h#2 integrate .. //depot/projects/xen31/contrib/cvs/lib/test-getdate.sh#1 branch .. //depot/projects/xen31/contrib/cvs/lib/xtime.h#2 integrate .. //depot/projects/xen31/contrib/cvs/man/ChangeLog#2 integrate .. //depot/projects/xen31/contrib/cvs/man/Makefile.am#2 integrate .. //depot/projects/xen31/contrib/cvs/man/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/cvs/man/cvs.1#2 integrate .. //depot/projects/xen31/contrib/cvs/src/ChangeLog#2 integrate .. //depot/projects/xen31/contrib/cvs/src/Makefile.am#2 integrate .. //depot/projects/xen31/contrib/cvs/src/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/cvs/src/add.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/admin.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/annotate.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/buffer.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/buffer.h#2 integrate .. //depot/projects/xen31/contrib/cvs/src/checkin.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/checkout.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/classify.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/client.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/client.h#2 integrate .. //depot/projects/xen31/contrib/cvs/src/commit.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/create_adm.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/cvs.h#2 integrate .. //depot/projects/xen31/contrib/cvs/src/cvsrc.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/diff.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/edit.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/entries.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/expand_path.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/fileattr.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/filesubr.c#3 integrate .. //depot/projects/xen31/contrib/cvs/src/find_names.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/hardlink.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/hardlink.h#2 integrate .. //depot/projects/xen31/contrib/cvs/src/hash.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/hash.h#2 integrate .. //depot/projects/xen31/contrib/cvs/src/history.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/history.h#2 integrate .. //depot/projects/xen31/contrib/cvs/src/ignore.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/import.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/lock.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/log.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/login.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/logmsg.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/main.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/mkmodules.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/modules.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/myndbm.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/myndbm.h#2 integrate .. //depot/projects/xen31/contrib/cvs/src/no_diff.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/parseinfo.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/patch.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/rcs.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/rcs.h#2 integrate .. //depot/projects/xen31/contrib/cvs/src/rcscmds.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/recurse.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/release.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/remove.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/repos.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/root.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/root.h#2 integrate .. //depot/projects/xen31/contrib/cvs/src/run.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/sanity.sh#2 integrate .. //depot/projects/xen31/contrib/cvs/src/server.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/server.h#2 integrate .. //depot/projects/xen31/contrib/cvs/src/stack.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/stack.h#2 integrate .. //depot/projects/xen31/contrib/cvs/src/status.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/subr.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/tag.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/update.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/vers_ts.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/version.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/watch.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/wrapper.c#2 integrate .. //depot/projects/xen31/contrib/cvs/src/zlib.c#2 integrate .. //depot/projects/xen31/contrib/cvs/tools/ChangeLog#2 integrate .. //depot/projects/xen31/contrib/cvs/tools/Makefile.am#2 integrate .. //depot/projects/xen31/contrib/cvs/tools/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/cvs/tools/README#2 integrate .. //depot/projects/xen31/contrib/file/ChangeLog#2 integrate .. //depot/projects/xen31/contrib/file/Magdir/acorn#2 integrate .. //depot/projects/xen31/contrib/file/Magdir/animation#2 integrate .. //depot/projects/xen31/contrib/file/Magdir/apple#2 integrate .. //depot/projects/xen31/contrib/file/Magdir/archive#2 integrate .. //depot/projects/xen31/contrib/file/Magdir/audio#2 integrate .. //depot/projects/xen31/contrib/file/Magdir/blender#2 integrate .. //depot/projects/xen31/contrib/file/Magdir/commands#2 integrate .. //depot/projects/xen31/contrib/file/Magdir/console#2 integrate .. //depot/projects/xen31/contrib/file/Magdir/database#2 integrate .. //depot/projects/xen31/contrib/file/Magdir/efi#1 branch .. //depot/projects/xen31/contrib/file/Magdir/elf#2 integrate .. //depot/projects/xen31/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/xen31/contrib/file/Magdir/fortran#1 branch .. //depot/projects/xen31/contrib/file/Magdir/java#2 integrate .. //depot/projects/xen31/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/xen31/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/xen31/contrib/file/Magdir/pdf#2 integrate .. //depot/projects/xen31/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/xen31/contrib/file/Makefile.am#2 integrate .. //depot/projects/xen31/contrib/file/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/file/acinclude.m4#2 integrate .. //depot/projects/xen31/contrib/file/aclocal.m4#2 integrate .. //depot/projects/xen31/contrib/file/apprentice.c#2 integrate .. //depot/projects/xen31/contrib/file/ascmagic.c#2 integrate .. //depot/projects/xen31/contrib/file/compress.c#2 integrate .. //depot/projects/xen31/contrib/file/config.h.in#2 integrate .. //depot/projects/xen31/contrib/file/configure#2 integrate .. //depot/projects/xen31/contrib/file/configure.in#2 integrate .. //depot/projects/xen31/contrib/file/file.c#2 integrate .. //depot/projects/xen31/contrib/file/file.h#2 integrate .. //depot/projects/xen31/contrib/file/file.man#2 integrate .. //depot/projects/xen31/contrib/file/file_opts.h#1 branch .. //depot/projects/xen31/contrib/file/fsmagic.c#2 integrate .. //depot/projects/xen31/contrib/file/funcs.c#2 integrate .. //depot/projects/xen31/contrib/file/install-sh#2 integrate .. //depot/projects/xen31/contrib/file/is_tar.c#2 integrate .. //depot/projects/xen31/contrib/file/libmagic.man#2 integrate .. //depot/projects/xen31/contrib/file/magic.c#2 integrate .. //depot/projects/xen31/contrib/file/magic.h#2 integrate .. //depot/projects/xen31/contrib/file/magic.man#2 integrate .. //depot/projects/xen31/contrib/file/magic.mime#2 integrate .. //depot/projects/xen31/contrib/file/mkinstalldirs#2 integrate .. //depot/projects/xen31/contrib/file/names.h#2 integrate .. //depot/projects/xen31/contrib/file/patchlevel.h#2 integrate .. //depot/projects/xen31/contrib/file/print.c#2 integrate .. //depot/projects/xen31/contrib/file/readelf.c#2 integrate .. //depot/projects/xen31/contrib/file/readelf.h#2 integrate .. //depot/projects/xen31/contrib/file/softmagic.c#2 integrate .. //depot/projects/xen31/contrib/libiberty/cp-demangle.c#1 branch .. //depot/projects/xen31/contrib/top/top.c#2 integrate .. //depot/projects/xen31/crypto/openssl/crypto/engine/eng_cryptodev.c#2 integrate .. //depot/projects/xen31/etc/defaults/periodic.conf#4 integrate .. //depot/projects/xen31/etc/defaults/rc.conf#2 integrate .. //depot/projects/xen31/etc/namedb/named.conf#2 integrate .. //depot/projects/xen31/etc/periodic/daily/460.status-mail-rejects#2 integrate .. //depot/projects/xen31/etc/rc.d/jail#2 integrate .. //depot/projects/xen31/etc/rc.firewall#2 integrate .. //depot/projects/xen31/etc/rc.firewall6#2 integrate .. //depot/projects/xen31/games/fortune/datfiles/fortunes#7 integrate .. //depot/projects/xen31/games/fortune/datfiles/limerick#3 integrate .. //depot/projects/xen31/gnu/usr.bin/Makefile#2 integrate .. //depot/projects/xen31/gnu/usr.bin/cvs/Makefile#2 integrate .. //depot/projects/xen31/gnu/usr.bin/cvs/contrib/Makefile#2 integrate .. //depot/projects/xen31/include/unistd.h#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_support_format_cpio.c#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_support_format_tar.c#4 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_support_format_zip.c#4 integrate .. //depot/projects/xen31/lib/libarchive/test/test_read_format_tar.c#2 integrate .. //depot/projects/xen31/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/xen31/lib/libc/gen/feature_present.3#1 branch .. //depot/projects/xen31/lib/libc/gen/feature_present.c#1 branch .. //depot/projects/xen31/lib/libc/gen/getttyent.c#2 integrate .. //depot/projects/xen31/lib/libc/gen/posixshm.c#2 delete .. //depot/projects/xen31/lib/libc/gen/shm_open.3#2 delete .. //depot/projects/xen31/lib/libc/inet/inet_network.c#2 integrate .. //depot/projects/xen31/lib/libc/stdlib/grantpt.c#4 integrate .. //depot/projects/xen31/lib/libc/stdlib/heapsort.c#2 integrate .. //depot/projects/xen31/lib/libc/stdlib/qsort.c#2 integrate .. //depot/projects/xen31/lib/libc/sys/Makefile.inc#2 integrate .. //depot/projects/xen31/lib/libc/sys/shm_open.2#1 branch .. //depot/projects/xen31/lib/libkvm/kvm.c#2 integrate .. //depot/projects/xen31/lib/libmagic/config.h#2 integrate .. //depot/projects/xen31/lib/libthr/thread/thr_sem.c#3 integrate .. //depot/projects/xen31/lib/libutil/pty.3#2 integrate .. //depot/projects/xen31/lib/libutil/pty.c#4 integrate .. //depot/projects/xen31/lib/msun/Makefile#3 integrate .. //depot/projects/xen31/lib/msun/Symbol.map#4 integrate .. //depot/projects/xen31/lib/msun/amd64/Makefile.inc#3 integrate .. //depot/projects/xen31/lib/msun/amd64/s_llrintl.S#1 branch .. //depot/projects/xen31/lib/msun/amd64/s_lrintl.S#1 branch .. //depot/projects/xen31/lib/msun/amd64/s_rintl.S#1 branch .. //depot/projects/xen31/lib/msun/i387/Makefile.inc#3 integrate .. //depot/projects/xen31/lib/msun/i387/s_llrintl.S#1 branch .. //depot/projects/xen31/lib/msun/i387/s_lrintl.S#1 branch .. //depot/projects/xen31/lib/msun/i387/s_rintl.S#1 branch .. //depot/projects/xen31/lib/msun/man/lrint.3#2 integrate .. //depot/projects/xen31/lib/msun/man/rint.3#2 integrate .. //depot/projects/xen31/lib/msun/src/math.h#4 integrate .. //depot/projects/xen31/lib/msun/src/s_csqrt.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_csqrtf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_llrintl.c#1 branch .. //depot/projects/xen31/lib/msun/src/s_lrintl.c#1 branch .. //depot/projects/xen31/lib/msun/src/s_nearbyint.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_rint.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_rintl.c#1 branch .. //depot/projects/xen31/sbin/fsck_msdosfs/boot.c#2 integrate .. //depot/projects/xen31/sbin/quotacheck/quotacheck.c#2 integrate .. //depot/projects/xen31/sbin/setkey/parse.y#3 integrate .. //depot/projects/xen31/share/man/man4/ipmi.4#3 integrate .. //depot/projects/xen31/share/man/man4/lagg.4#2 integrate .. //depot/projects/xen31/share/man/man4/textdump.4#2 integrate .. //depot/projects/xen31/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/xen31/share/man/man5/src.conf.5#4 integrate .. //depot/projects/xen31/share/man/man7/bsd.snmpmod.mk.7#2 integrate .. //depot/projects/xen31/share/man/man9/VOP_LOCK.9#3 integrate .. //depot/projects/xen31/share/man/man9/lock.9#3 integrate .. //depot/projects/xen31/share/man/man9/mbuf_tags.9#2 integrate .. //depot/projects/xen31/share/misc/committers-ports.dot#3 integrate .. //depot/projects/xen31/share/misc/committers-src.dot#4 integrate .. //depot/projects/xen31/share/mk/bsd.snmpmod.mk#2 integrate .. //depot/projects/xen31/share/termcap/termcap.src#2 integrate .. //depot/projects/xen31/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/xen31/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/xen31/sys/amd64/include/ieeefp.h#2 integrate .. //depot/projects/xen31/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/xen31/sys/arm/arm/support.S#2 integrate .. //depot/projects/xen31/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/xen31/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/xen31/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/xen31/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/xen31/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/xen31/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/xen31/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/xen31/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/xen31/sys/compat/linux/linux_file.c#4 integrate .. //depot/projects/xen31/sys/compat/linux/linux_getcwd.c#3 integrate .. //depot/projects/xen31/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/xen31/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/xen31/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/xen31/sys/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/xen31/sys/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/xen31/sys/compat/pecoff/imgact_pecoff.c#3 integrate .. //depot/projects/xen31/sys/compat/svr4/imgact_svr4.c#3 integrate .. //depot/projects/xen31/sys/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/xen31/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/xen31/sys/conf/NOTES#9 integrate .. //depot/projects/xen31/sys/conf/files#15 integrate .. //depot/projects/xen31/sys/conf/options#7 integrate .. //depot/projects/xen31/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/xen31/sys/crypto/rijndael/rijndael-api.c#2 integrate .. //depot/projects/xen31/sys/crypto/rijndael/test00.c#2 integrate .. //depot/projects/xen31/sys/ddb/db_textdump.c#2 integrate .. //depot/projects/xen31/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/xen31/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/xen31/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_multiq.c#1 branch .. //depot/projects/xen31/sys/dev/cxgb/cxgb_osdep.h#5 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/xen31/sys/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/sys/mvec.h#3 integrate .. //depot/projects/xen31/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/xen31/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/xen31/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate .. //depot/projects/xen31/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/xen31/sys/dev/ichwd/ichwd.c#4 integrate .. //depot/projects/xen31/sys/dev/ichwd/ichwd.h#4 integrate .. //depot/projects/xen31/sys/dev/iir/iir.c#2 integrate .. //depot/projects/xen31/sys/dev/md/md.c#3 integrate .. //depot/projects/xen31/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/xen31/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/xen31/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/xen31/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/xen31/sys/dev/mxge/mxge_lro.c#2 integrate .. //depot/projects/xen31/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/xen31/sys/dev/mxge/mxge_rss_eth_z8e.c#1 branch .. //depot/projects/xen31/sys/dev/mxge/mxge_rss_ethp_z8e.c#1 branch .. //depot/projects/xen31/sys/dev/mxge/rss_eth_z8e.h#1 branch .. //depot/projects/xen31/sys/dev/mxge/rss_ethp_z8e.h#1 branch .. //depot/projects/xen31/sys/dev/pci/pci_user.c#5 integrate .. //depot/projects/xen31/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/xen31/sys/dev/ppbus/ppbconf.h#2 integrate .. //depot/projects/xen31/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/xen31/sys/dev/re/if_re.c#7 integrate .. //depot/projects/xen31/sys/dev/stge/if_stge.c#3 integrate .. //depot/projects/xen31/sys/dev/stge/if_stgereg.h#2 integrate .. //depot/projects/xen31/sys/dev/streams/streams.c#3 integrate .. //depot/projects/xen31/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/xen31/sys/dev/usb/if_rum.c#4 integrate .. //depot/projects/xen31/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/xen31/sys/dev/usb/if_zyd.c#5 integrate .. //depot/projects/xen31/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/xen31/sys/fs/cd9660/cd9660_lookup.c#2 integrate .. //depot/projects/xen31/sys/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/xen31/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/xen31/sys/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/xen31/sys/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/xen31/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/xen31/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/xen31/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/xen31/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/xen31/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/xen31/sys/fs/hpfs/hpfs_subr.h#2 integrate .. //depot/projects/xen31/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/xen31/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/xen31/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate .. //depot/projects/xen31/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/xen31/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/xen31/sys/fs/ntfs/ntfs_subr.c#2 integrate .. //depot/projects/xen31/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/xen31/sys/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/xen31/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/xen31/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/xen31/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/xen31/sys/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/xen31/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/xen31/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/xen31/sys/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/xen31/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/xen31/sys/fs/procfs/procfs.c#2 integrate .. //depot/projects/xen31/sys/fs/procfs/procfs_map.c#2 integrate .. //depot/projects/xen31/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate .. //depot/projects/xen31/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/xen31/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/xen31/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/xen31/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/xen31/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/xen31/sys/fs/tmpfs/tmpfs_subr.c#4 integrate .. //depot/projects/xen31/sys/fs/tmpfs/tmpfs_vfsops.c#5 integrate .. //depot/projects/xen31/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/xen31/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/xen31/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/xen31/sys/fs/unionfs/union_subr.c#4 integrate .. //depot/projects/xen31/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/xen31/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/xen31/sys/gnu/fs/ext2fs/ext2_lookup.c#2 integrate .. //depot/projects/xen31/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/xen31/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/xen31/sys/gnu/fs/ext2fs/fs.h#2 integrate .. //depot/projects/xen31/sys/gnu/fs/reiserfs/reiserfs_inode.c#2 integrate .. //depot/projects/xen31/sys/gnu/fs/reiserfs/reiserfs_namei.c#2 integrate .. //depot/projects/xen31/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/xen31/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#2 integrate .. //depot/projects/xen31/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/xen31/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/xen31/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate .. //depot/projects/xen31/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/xen31/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/xen31/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/xen31/sys/i386/ibcs2/ibcs2_misc.c#3 integrate .. //depot/projects/xen31/sys/i386/ibcs2/imgact_coff.c#3 integrate .. //depot/projects/xen31/sys/i386/include/ieeefp.h#2 integrate .. //depot/projects/xen31/sys/i386/include/pmap.h#9 integrate .. //depot/projects/xen31/sys/i386/linux/imgact_linux.c#3 integrate .. //depot/projects/xen31/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/xen31/sys/kern/imgact_aout.c#3 integrate .. //depot/projects/xen31/sys/kern/imgact_elf.c#6 integrate .. //depot/projects/xen31/sys/kern/imgact_gzip.c#3 integrate .. //depot/projects/xen31/sys/kern/init_main.c#8 integrate .. //depot/projects/xen31/sys/kern/init_sysent.c#2 integrate .. //depot/projects/xen31/sys/kern/kern_acct.c#3 integrate .. //depot/projects/xen31/sys/kern/kern_alq.c#3 integrate .. //depot/projects/xen31/sys/kern/kern_cpu.c#3 integrate .. //depot/projects/xen31/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/xen31/sys/kern/kern_event.c#4 integrate .. //depot/projects/xen31/sys/kern/kern_exec.c#7 integrate .. //depot/projects/xen31/sys/kern/kern_exit.c#4 integrate .. //depot/projects/xen31/sys/kern/kern_jail.c#3 integrate .. //depot/projects/xen31/sys/kern/kern_ktrace.c#4 integrate .. //depot/projects/xen31/sys/kern/kern_linker.c#5 integrate .. //depot/projects/xen31/sys/kern/kern_lock.c#5 integrate .. //depot/projects/xen31/sys/kern/kern_proc.c#7 integrate .. //depot/projects/xen31/sys/kern/kern_resource.c#3 integrate .. //depot/projects/xen31/sys/kern/kern_sig.c#6 integrate .. //depot/projects/xen31/sys/kern/kern_synch.c#3 integrate .. //depot/projects/xen31/sys/kern/link_elf.c#3 integrate .. //depot/projects/xen31/sys/kern/link_elf_obj.c#3 integrate .. //depot/projects/xen31/sys/kern/sched_ule.c#6 integrate .. //depot/projects/xen31/sys/kern/subr_lock.c#5 integrate .. //depot/projects/xen31/sys/kern/sys_generic.c#5 integrate .. //depot/projects/xen31/sys/kern/sys_pipe.c#6 integrate .. //depot/projects/xen31/sys/kern/sys_socket.c#3 integrate .. //depot/projects/xen31/sys/kern/syscalls.c#2 integrate .. //depot/projects/xen31/sys/kern/syscalls.master#2 integrate .. //depot/projects/xen31/sys/kern/systrace_args.c#2 integrate .. //depot/projects/xen31/sys/kern/tty.c#2 integrate .. //depot/projects/xen31/sys/kern/tty_cons.c#3 integrate .. //depot/projects/xen31/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/xen31/sys/kern/uipc_sem.c#3 integrate .. //depot/projects/xen31/sys/kern/uipc_shm.c#1 branch .. //depot/projects/xen31/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/xen31/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/xen31/sys/kern/vfs_acl.c#3 integrate .. //depot/projects/xen31/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/xen31/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/xen31/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/xen31/sys/kern/vfs_default.c#2 integrate .. //depot/projects/xen31/sys/kern/vfs_extattr.c#3 integrate .. //depot/projects/xen31/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/xen31/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/xen31/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/xen31/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/xen31/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/xen31/sys/kern/vnode_if.src#2 integrate .. //depot/projects/xen31/sys/modules/cxgb/cxgb/Makefile#2 integrate .. //depot/projects/xen31/sys/modules/mxge/Makefile#2 integrate .. //depot/projects/xen31/sys/modules/mxge/mxge_rss_eth_z8e/Makefile#1 branch .. //depot/projects/xen31/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile#1 branch .. //depot/projects/xen31/sys/netinet6/frag6.c#3 integrate .. //depot/projects/xen31/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/xen31/sys/netinet6/in6.c#4 integrate .. //depot/projects/xen31/sys/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/xen31/sys/netinet6/in6_pcb.c#4 integrate .. //depot/projects/xen31/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/xen31/sys/netinet6/in6_rmx.c#3 integrate .. //depot/projects/xen31/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/xen31/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/xen31/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/xen31/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/xen31/sys/netinet6/mld6.c#3 integrate .. //depot/projects/xen31/sys/netinet6/nd6.c#5 integrate .. //depot/projects/xen31/sys/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/xen31/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/xen31/sys/netinet6/raw_ip6.c#3 integrate .. //depot/projects/xen31/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/xen31/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/xen31/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/xen31/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/xen31/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/xen31/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/xen31/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/xen31/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/xen31/sys/nfsserver/nfs_srvsubs.c#3 integrate .. //depot/projects/xen31/sys/opencrypto/cryptodev.c#3 integrate .. //depot/projects/xen31/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/xen31/sys/pci/if_rlreg.h#4 integrate .. //depot/projects/xen31/sys/powerpc/conf/GENERIC#5 integrate .. //depot/projects/xen31/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/xen31/sys/security/audit/audit_bsm_klib.c#3 integrate .. //depot/projects/xen31/sys/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/xen31/sys/security/audit/audit_worker.c#2 integrate .. //depot/projects/xen31/sys/security/mac/mac_framework.h#4 integrate .. //depot/projects/xen31/sys/security/mac/mac_policy.h#4 integrate .. //depot/projects/xen31/sys/security/mac/mac_posix_shm.c#1 branch .. //depot/projects/xen31/sys/security/mac/mac_process.c#4 integrate .. //depot/projects/xen31/sys/security/mac/mac_syscalls.c#3 integrate .. //depot/projects/xen31/sys/security/mac_stub/mac_stub.c#5 integrate .. //depot/projects/xen31/sys/security/mac_test/mac_test.c#6 integrate .. //depot/projects/xen31/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/xen31/sys/sys/buf.h#2 integrate .. //depot/projects/xen31/sys/sys/fcntl.h#2 integrate .. //depot/projects/xen31/sys/sys/file.h#3 integrate .. //depot/projects/xen31/sys/sys/lockmgr.h#4 integrate .. //depot/projects/xen31/sys/sys/mbuf.h#3 integrate .. //depot/projects/xen31/sys/sys/mman.h#2 integrate .. //depot/projects/xen31/sys/sys/param.h#11 integrate .. //depot/projects/xen31/sys/sys/pmc.h#4 integrate .. //depot/projects/xen31/sys/sys/proc.h#7 integrate .. //depot/projects/xen31/sys/sys/syscall.h#2 integrate .. //depot/projects/xen31/sys/sys/syscall.mk#2 integrate .. //depot/projects/xen31/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/xen31/sys/sys/sysproto.h#2 integrate .. //depot/projects/xen31/sys/sys/vnode.h#2 integrate .. //depot/projects/xen31/sys/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/xen31/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/xen31/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/xen31/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/xen31/sys/ufs/ffs/ffs_vnops.c#4 integrate .. //depot/projects/xen31/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/xen31/sys/ufs/ufs/ufs_lookup.c#3 integrate .. //depot/projects/xen31/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/xen31/sys/ufs/ufs/ufs_vnops.c#4 integrate .. //depot/projects/xen31/sys/vm/swap_pager.c#4 integrate .. //depot/projects/xen31/sys/vm/vm_contig.c#3 integrate .. //depot/projects/xen31/sys/vm/vm_kern.c#4 integrate .. //depot/projects/xen31/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/xen31/sys/vm/vm_object.c#4 integrate .. //depot/projects/xen31/sys/vm/vnode_pager.c#4 integrate .. //depot/projects/xen31/tools/build/options/WITHOUT_FORTRAN#2 delete .. //depot/projects/xen31/tools/regression/lib/msun/test-lrint.c#2 integrate .. //depot/projects/xen31/tools/regression/usr.bin/Makefile#2 integrate .. //depot/projects/xen31/tools/regression/usr.bin/tr/Makefile#1 branch .. //depot/projects/xen31/tools/regression/usr.bin/tr/regress.00.out#1 branch .. //depot/projects/xen31/tools/regression/usr.bin/tr/regress.01.out#1 branch .. //depot/projects/xen31/tools/regression/usr.bin/tr/regress.02.out#1 branch .. //depot/projects/xen31/tools/regression/usr.bin/tr/regress.03.out#1 branch .. //depot/projects/xen31/tools/regression/usr.bin/tr/regress.04.out#1 branch .. //depot/projects/xen31/tools/regression/usr.bin/tr/regress.05.out#1 branch .. //depot/projects/xen31/tools/regression/usr.bin/tr/regress.06.out#1 branch .. //depot/projects/xen31/tools/regression/usr.bin/tr/regress.07.out#1 branch .. //depot/projects/xen31/tools/regression/usr.bin/tr/regress.08.out#1 branch .. //depot/projects/xen31/tools/regression/usr.bin/tr/regress.09.out#1 branch .. //depot/projects/xen31/tools/regression/usr.bin/tr/regress.0a.out#1 branch .. //depot/projects/xen31/tools/regression/usr.bin/tr/regress.0b.out#1 branch .. //depot/projects/xen31/tools/regression/usr.bin/tr/regress.in#1 branch .. //depot/projects/xen31/tools/regression/usr.bin/tr/regress.sh#1 branch .. //depot/projects/xen31/tools/regression/usr.bin/tr/regress.t#1 branch .. //depot/projects/xen31/tools/regression/usr.bin/tr/regress2.in#1 branch .. //depot/projects/xen31/tools/sched/schedgraph.py#4 integrate .. //depot/projects/xen31/tools/tools/nanobsd/nanobsd.sh#3 integrate .. //depot/projects/xen31/usr.bin/file/config.h#2 integrate .. //depot/projects/xen31/usr.bin/kdump/kdump.c#3 integrate .. //depot/projects/xen31/usr.bin/netstat/route.c#3 integrate .. //depot/projects/xen31/usr.bin/systat/ifstat.c#2 integrate .. //depot/projects/xen31/usr.bin/top/machine.c#3 integrate .. //depot/projects/xen31/usr.bin/unzip/Makefile#1 branch .. //depot/projects/xen31/usr.bin/unzip/unzip.1#1 branch .. //depot/projects/xen31/usr.bin/unzip/unzip.c#1 branch .. //depot/projects/xen31/usr.bin/wall/wall.c#2 integrate .. //depot/projects/xen31/usr.sbin/arp/arp.c#2 integrate .. //depot/projects/xen31/usr.sbin/config/main.c#2 integrate .. //depot/projects/xen31/usr.sbin/gstat/gstat.c#2 integrate .. //depot/projects/xen31/usr.sbin/inetd/inetd.8#2 integrate .. //depot/projects/xen31/usr.sbin/iostat/iostat.c#3 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/add/pkg_add.1#4 integrate .. //depot/projects/xen31/usr.sbin/pmcstat/pmcstat.c#3 integrate Differences ... ==== //depot/projects/xen31/ObsoleteFiles.inc#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.124 2007/12/07 22:56:10 dougb Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.125 2008/01/11 13:41:31 jhb Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080108: Moved to section 2 +OLD_FILES+=usr/share/man/man3/shm_open.3.gz +OLD_FILES+=usr/share/man/man3/shm_unlink.3.gz # 20071207: Merged with fortunes-o.real OLD_FILES+=usr/share/games/fortune/fortunes2-o OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat @@ -25,6 +28,8 @@ .endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h +# 20071125: Renamed to pmc_get_msr() +OLD_FILES+=usr/share/man/man3/pmc_x86_get_msr.3.gz # 20071108: Removed very crunch OLDCARD support file OLD_FILES+=etc/defaults/pccard.conf # 20071104: Removed bsdlabel, fdisk and gpt from rescue on ia64. @@ -33,6 +38,8 @@ OLD_FILES+=rescue/fdisk OLD_FILES+=rescue/gpt .endif +# 20071026: kthread(9)/kproc(9) API changes +OLD_FILES+=usr/share/man/man9/kthread_create.9.gz # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd ==== //depot/projects/xen31/contrib/cvs/AUTHORS#2 (text+ko) ==== @@ -49,9 +49,11 @@ remote repository access code. Larry Jones and Derek Price have been maintaining and -enhancing CVS for some years. Mark D. Baushke came on in +enhancing CVS for some years. Mark D. Baushke came on in 2003. +Conrad Pino began maintaining the Windows port in 2004. + There have been many, many contributions not listed here. Consult the individual ChangeLog files in each directory for a more complete idea. ==== //depot/projects/xen31/contrib/cvs/BUGS#2 (text+ko) ==== @@ -88,22 +88,6 @@ noticed under BSDI. -* Spaces in arguments to `cvs diff' are currently split on spaces and tabs -before being passed to diff. This can often cause diff to abort since it can -no longer interpret its options string and if it can, coincidentally, -interpret its option string, then the problem may be output in unexpected -formats. - - -* `release' of a project subdir does not remove the `subdir' entry from - `./CVS/Entries'. - - -* Most of the remote commands are encountering assertion failures when listing - the toplevel of the repository (e.g. `cvs rlog .'). This appears to be - related to the symlinked CVS root fix. - - * Status /*-------. ==== //depot/projects/xen31/contrib/cvs/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,281 @@ +2006-06-09 Derek Price + + * NEWS: Note client/server conflict fix. + +2006-05-25 Derek Price + + * configure.in: Accept --with-rsh argument to set RSH_DFLT in config.h. + Prefer `remsh' to `rsh' when autodetecting and comment rationale. + +2006-04-27 Derek Price + + * acinclude.m4 (ACX_WITH_GSSAPI): Detect libgss for HP-UX. + * NEWS: Note that GSSAPI builds under HP-UX. + (Report from Larry Jones .) + +2006-03-07 Derek Price + + * NEWS: Note rtag fixes. + +2006-02-26 Derek Price + + * NEWS: Note CVSADM fix as an efficiency improvement. + +2006-02-01 Derek Price + + * NEWS: Note unconditional val-tags lock removal. + + * NEWS: Note history buffer overflow fix. + +2006-01-30 Derek Price + + * NEWS: Note nonblocking flow control pipe fix. + +2005-12-09 Derek Price + + * NEWS: Note misc doc & bug fixes. + +2005-12-07 Derek Price + + * NEWS: Note recognition of :extssh:. + +2005-10-18 Derek Price + + * KEYS: New file, suggested by Antoine Lexy-Lambert . + * README: Mention KEYS file. + +2005-09-26 Derek Price + + [bug #14639] + * acinclude.m4: Find the crypto library on FreeBSD 5.x. + Patch from Serguei E. Leontiev . + + * NEWS: Note FreeBSD 5.x GSSAPI fix. + + * NEWS: Note fsync'd commits. + +2005-09-24 Derek Price + + * NEWS, HACKING: Standardize on Automake 1.9.6. + +2005-09-22 Derek Price + + * NEWS: Mention conflict fixes. + +2005-09-13 Derek Price + + * TESTS: Mention new $username8 & $anyusername variables. + +2005-09-04 Larry Jones + + * NEWS: s/bug-cvs@gnu.org/bug-cvs@nongnu.org/. + * configure.in: s/info-cvs@gnu.org/info-cvs@nongnu.org/. + * configure: Regenerated. + +2005-09-01 Derek Price + + * AUTHORS, DEVEL-CVS, HACKING, README: Update links, email addresses, + & mailing list descriptions. + +2005-09-01 Derek Price + + * FAQ: Update links. + +2005-09-01 Derek Price + + * HACKING, INSTALL, README, README.VMS, configure.in: Update links and + email addresses. + +2005-08-31 Derek Price + + * www/.htaccess: Remove this file. + +2005-08-31 Derek Price + + * cvs.spec.in: Note last spec file change in internal ChangeLog. + +2005-08-31 Derek Price + + * NEWS: Note spec file repair. + +2005-08-31 Derek Price + + * cvs.spec.in: Update links to point to Savannah. s/Copyright/License/ + for RPM 4.mumble. + +2005-08-30 Larry Jones + + * NEWS: Note import locking fix. + +2005-07-12 Derek Price + + * FAQ, HACKING, INSTALL: Add copyright notices. + +2005-07-11 Derek Price + + * FAQ, HACKING, INSTALL: Update license notices. + +2005-06-02 Derek Price + + * NEWS: Note server compression hang fix. + +2005-06-01 Conrad T. Pino + + * makewin32.cmd: Add Windows NT command file to build CVS Project. + Imported from revision 1.2 on feature branch. + +2005-05-27 Derek Price + + * NEWS: Note diff space split fix. + * BUGS: Remove diff space split note. + +2005-05-03 Derek Price + + * INSTALL: Add footnote about compiling a CVS checkout of CVS on a + case-insensitive UNIX file system like Mac OS X. + +2005-05-02 Derek Price + + * TODO (231): Renumber as... + (234): ...this to match numbering on 1.12.x. + +2005-05-02 Derek Price + + * TODO (231): New item. + (22, 30, 31): Remove completed items. + +2005-05-02 Derek Price + + * NEWS: Note new val-tags locks. + +2005-04-30 Derek Price + + * NEWS: Note new history locks. + +2005-04-20 Derek Price + + * NEWS: Note log overflow fix. + +2005-04-15 Derek Price + + * NEWS: Note Klocwork fixes. + +2005-04-14 Derek Price + + * NEWS: Note contrib Perl taint vulnerability fix. + +2005-03-23 Derek Price + + * ylwrap: New file. + +2005-03-15 Derek Price + + * HACKING, NEWS: Note new Automake version. + +2005-03-04 Jim Hyslop + + * NEWS: Note fix for compile errors on IRIX 5.3. + +2005-02-22 Derek Price + + * NEWS: Note recent watch on/off fileattr fix. + +2005-01-31 Derek Price + + * AUTHORS: Add Conrad Pino. + * README: Update copyright notice. + +2005-01-29 Derek Price + + * NEWS: Note some recent changes. + +2004-11-17 Derek Price + + * NEWS: Note "red file" fix source inclusion. + +2004-11-05 Conrad T. Pino + + * cvsnt.dep: Regenerated after complete rebuild. + * cvsnt.mak: Regenerated after complete rebuild. + +2004-11-03 Derek Price + + * HACKING, NEWS: Note new Autoconf & Automake versions. + +2004-10-29 Derek Price + + * NEWS: Note xreadlink fix. + +2004-10-26 Derek Price + + * NEWS: Note GSSAPI error message fix. + +2004-10-19 Derek Price + + * NEWS: Note resurrection fix. + +2004-10-14 Derek Price + + * NEWS: Note new import branch verification. + +2004-09-25 Derek Price + + * configure.in: Use doc/mkman.pl as source for doc/mkman. + +2004-09-08 Conrad T. Pino + + * cvsnt.dsp: Add "windows-NT/JmgStat.c" to project. Add + "windows-NT/JmgStat.h" to project. Add "lib/xsize.h" to project. + * cvsnt.dep: Regenerated for "cvsnt.dsp" change. + * cvsnt.mak: Regenerated for "cvsnt.dsp" change. + +2004-09-07 Derek Price + + * NEWS: Note Windows DST fix. + +2004-09-03 Derek Price + + * HACKING: Codify backwards compatibility conventions. Remove outdated + reference to very old MSVC++ releases. + +2004-08-30 Derek Price + + * NEWS: Note compliance of log_accum.pl with Perl 5.8.5. + +2004-08-24 Derek Price + + * TODO (24, 49, 92, 113): Remove completed/obsolescent items. + +2004-08-24 Derek Price + + * BUGS: Remove release subdir note. This was fixed with the commit on + 2004-02-25, based on Matthew Ogilvie's patch. + +2004-08-24 Derek Price + + * NEWS: Note r* . fix. + * BUGS: Remove r* . note. + +2004-08-24 Derek Price + + * NEWS: Note invalid tag fix. + +2004-08-24 Mark D. Baushke + + * NEWS: Note that modules -a bugfix has a change in behavior. + +2004-06-22 Derek Price + + * NEWS: Note Conrad's Windows fix. + +2004-06-21 Derek Price + + * .cvsignore: Ignore GPG signature files for distributions. + +2004-06-10 Derek Price + + * NEWS: Note manual update. + 2004-06-09 Derek Price * NEWS: Note Stefan & Sebastian's security fixes. ==== //depot/projects/xen31/contrib/cvs/FAQ#2 (text+ko) ==== @@ -1,3 +1,24 @@ +------------------------------------------------------------------------------- + + CVS is Copyright (C) 1989-2005 The Free Software Foundation, Inc. + + CVS is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 1, or (at your option) + any later version. + + More details are available in the COPYING file but, in simplified + terms, this means that any distributed modifications you make to + this software must also be released under the GNU General Public + License. + + CVS is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +------------------------------------------------------------------------------- + This file contains a CVS FAQ. Until 1995 it was maintained by David Grubbs. It was out of date and not being maintained, but it had a certain following and in 1997 Pascal Molli decided to start @@ -13,13 +34,14 @@ and insert things like tables of contents). The answers which are dated "6/13/1997" below are really from the 1995 -FAQ, for the most part. Many of them are out of date. If you have -some time, you are encouraged to double-check them against other -sources like the Cederqvist manual and update the FAQ. If you don't -have such time, take them with a grain of salt or a few. +FAQ, for the most part. Many of them are out of date. The current FAQ may +be found at . If you have +some time, you are encouraged to export that FAQ as text and import it here. +If you don't have such time, take the answers in this file with at least a few +grains of salt. -Since Feb. 2000 CVS is being maintained by OpenAvenue, Inc. and many of -the existing resources have been centeralized on http://www.cvshome.org. +Since August, 2005, many of the existing CVS resources have been centralized on + & . Category: /, all questions @@ -1899,7 +1921,8 @@ GIC is no longer being maintained and tkCVS is recommended instead. - For more on tkCVS, see http://www.cvshome.org/dev/addontkcvs.html. + For more on tkCVS, see + . kingdon@cyclic.com >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 16 17:00:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F31E316A41B; Wed, 16 Jan 2008 17:00:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B764416A419 for ; Wed, 16 Jan 2008 17:00:37 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A395513C459 for ; Wed, 16 Jan 2008 17:00:37 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0GH0b7p079370 for ; Wed, 16 Jan 2008 17:00:37 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0GH0bx4079367 for perforce@freebsd.org; Wed, 16 Jan 2008 17:00:37 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 16 Jan 2008 17:00:37 GMT Message-Id: <200801161700.m0GH0bx4079367@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 133419 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 17:00:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=133419 Change 133419 by hselasky@hselasky_laptop001 on 2008/01/16 17:00:25 Compile fix for FreeBSD 6.x. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_port.h#25 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_port.h#25 (text+ko) ==== @@ -202,6 +202,9 @@ #define usb_thread_create(f, s, p, ...) \ kthread_create((f), (s), (p), RFHIGHPID, 0, __VA_ARGS__) #define usb_thread_exit(err) kthread_exit(err) +#endif + +#if (__FreeBSD_version < 700000) #define thread_lock(td) mtx_lock_spin(&sched_lock) #define thread_unlock(td) mtx_unlock_spin(&sched_lock) #endif From owner-p4-projects@FreeBSD.ORG Wed Jan 16 19:50:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6468916A420; Wed, 16 Jan 2008 19:50:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2976E16A417 for ; Wed, 16 Jan 2008 19:50:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0030F13C442 for ; Wed, 16 Jan 2008 19:50:39 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0GJodZ5008549 for ; Wed, 16 Jan 2008 19:50:39 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0GJodSv008546 for perforce@freebsd.org; Wed, 16 Jan 2008 19:50:39 GMT (envelope-from sam@freebsd.org) Date: Wed, 16 Jan 2008 19:50:39 GMT Message-Id: <200801161950.m0GJodSv008546@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133428 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 19:50:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=133428 Change 133428 by sam@sam_ebb on 2008/01/16 19:49:45 force initial ic_opmode to STA so media setup works; may want to handle this in net80211 Affected files ... .. //depot/projects/vap/sys/dev/usb/if_zyd.c#6 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_zyd.c#6 (text+ko) ==== @@ -386,6 +386,7 @@ ic->ic_ifp = ifp; ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ + ic->ic_opmode = IEEE80211_M_STA; /* set device capabilities */ ic->ic_caps = From owner-p4-projects@FreeBSD.ORG Wed Jan 16 19:51:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B76F16A420; Wed, 16 Jan 2008 19:51:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 40E9316A418 for ; Wed, 16 Jan 2008 19:51:41 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3010E13C455 for ; Wed, 16 Jan 2008 19:51:41 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0GJpf3I008868 for ; Wed, 16 Jan 2008 19:51:41 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0GJpfQN008865 for perforce@freebsd.org; Wed, 16 Jan 2008 19:51:41 GMT (envelope-from sam@freebsd.org) Date: Wed, 16 Jan 2008 19:51:41 GMT Message-Id: <200801161951.m0GJpfQN008865@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133429 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 19:51:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=133429 Change 133429 by sam@sam_ebb on 2008/01/16 19:51:10 bandaid locking so scanning completes; this is a total hack in lieu of overhauling the net80211 state machine to deal with drivers that operate asynchronously Affected files ... .. //depot/projects/vap/sys/dev/usb/if_ural.c#7 edit .. //depot/projects/vap/sys/dev/usb/if_zyd.c#7 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_ural.c#7 (text+ko) ==== @@ -805,7 +805,9 @@ RAL_UNLOCK(sc); + IEEE80211_LOCK(ic); /*XXX*/ uvp->newstate(vap, sc->sc_state, sc->sc_arg); + IEEE80211_UNLOCK(ic); } static void ==== //depot/projects/vap/sys/dev/usb/if_zyd.c#7 (text+ko) ==== @@ -750,7 +750,9 @@ break; } + IEEE80211_LOCK(ic); /*XXX*/ zvp->newstate(vap, sc->sc_state, sc->sc_arg); + IEEE80211_UNLOCK(ic); } static int From owner-p4-projects@FreeBSD.ORG Wed Jan 16 21:45:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 68CFF16A420; Wed, 16 Jan 2008 21:45:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 14D9C16A419 for ; Wed, 16 Jan 2008 21:45:39 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 03DF313C4F6 for ; Wed, 16 Jan 2008 21:45:39 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0GLjcV8036758 for ; Wed, 16 Jan 2008 21:45:38 GMT (envelope-from andre@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0GLjctZ036755 for perforce@freebsd.org; Wed, 16 Jan 2008 21:45:38 GMT (envelope-from andre@freebsd.org) Date: Wed, 16 Jan 2008 21:45:38 GMT Message-Id: <200801162145.m0GLjctZ036755@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andre@freebsd.org using -f From: Andre Oppermann To: Perforce Change Reviews Cc: Subject: PERFORCE change 133432 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 21:45:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=133432 Change 133432 by andre@andre_flirtbox on 2008/01/16 21:45:36 Handle all edge cases. Add SEQ_DELTA() function to ease segment trimming. Affected files ... .. //depot/projects/tcp_reass/netinet/tcp_reass.c#7 edit .. //depot/projects/tcp_reass/netinet/tcp_seq.h#2 edit Differences ... ==== //depot/projects/tcp_reass/netinet/tcp_reass.c#7 (text+ko) ==== @@ -100,23 +100,25 @@ SYSCTL_NODE(_net_inet_tcp, OID_AUTO, reass, CTLFLAG_RW, 0, "TCP Segment Reassembly Queue"); -static int tcp_reass_maxseg = 0; -SYSCTL_INT(_net_inet_tcp_reass, OID_AUTO, maxsegments, CTLFLAG_RDTUN, - &tcp_reass_maxseg, 0, +static int tcp_reass_maxblocks = 0; +SYSCTL_INT(_net_inet_tcp_reass, OID_AUTO, maxblocks, CTLFLAG_RDTUN, + &tcp_reass_maxblocks, 0, "Global maximum number of TCP Segment Blocks in Reassembly Queue"); int tcp_reass_qsize = 0; -SYSCTL_INT(_net_inet_tcp_reass, OID_AUTO, cursegments, CTLFLAG_RD, +SYSCTL_INT(_net_inet_tcp_reass, OID_AUTO, curblocks, CTLFLAG_RD, &tcp_reass_qsize, 0, "Global number of TCP Segment Blocks currently in Reassembly Queue"); +static void tcp_reass_merge(struct tcpcb *, int *, struct trq *, struct trq *); + /* Initialize TCP reassembly queue */ static void tcp_reass_zone_change(void *tag) { - tcp_reass_maxseg = nmbclusters / 16; - uma_zone_set_max(tcp_reass_zone, tcp_reass_maxseg); + tcp_reass_maxblocks = nmbclusters / 16; + uma_zone_set_max(tcp_reass_zone, tcp_reass_maxblocks); } uma_zone_t tcp_reass_zone; @@ -126,12 +128,12 @@ { /* XXX: nmbclusters may be zero. */ - tcp_reass_maxseg = nmbclusters / 16; - TUNABLE_INT_FETCH("net.inet.tcp.reass.maxsegments", - &tcp_reass_maxseg); + tcp_reass_maxblocks = nmbclusters / 16; + TUNABLE_INT_FETCH("net.inet.tcp.reass.maxblocks", + &tcp_reass_maxblocks); tcp_reass_zone = uma_zcreate("tcpreass", sizeof (struct trq), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); - uma_zone_set_max(tcp_reass_zone, tcp_reass_maxseg); + uma_zone_set_max(tcp_reass_zone, tcp_reass_maxblocks); EVENTHANDLER_REGISTER(nmbclusters_change, tcp_reass_zone_change, NULL, EVENTHANDLER_PRI_ANY); } @@ -150,11 +152,21 @@ * Call with th==NULL after becoming established to * force pre-ESTABLISHED data up to user socket. */ - if (th == NULL) + if (th == NULL) { + if (!TCPS_HAVEESTABLISHED(tp->t_state) || + TAILQ_EMPTY(&tp->t_trq) || + ((tqe = TAILQ_FIRST(&tp->t_trq)) && + tqe->trq_seq != tp->rcv_nxt)) + return (0); goto present; + } - KASSERT(SEQ_LEQ(tp->rcv_nxt, th->th_seq), + KASSERT(*tlenp > 0, + ("%s: segment doesn't contain any data", __func__)); + KASSERT(SEQ_GT(tp->rcv_nxt, th->th_seq), ("%s: sequence number below rcv_nxt", __func__)); + KASSERT(!(tp->rcv_nxt == th->th_seq) || !(TAILQ_EMPTY(&tp->t_trq)), + ("%s: got missing segment but queue is empty", __func__)); /* * Limit the number of segments in the reassembly queue to prevent @@ -183,13 +195,22 @@ return (0); } + /* Get rid of packet header and mtags. */ + m_demote(m, 1); + +#if 0 + /* Trim empty mbufs from head of chain. */ + while (m->m_len == 0) { + n = m; + m = m->m_next; + m_free(n); + } +#endif + /* NB: m_adj(m, -i) may free mbufs at the tail of a chain. */ for (mcnt = 0, n = m; n; n = n->m_next) mcnt += (n->m_flags & M_EXT) ? n->m_ext.ext_size : MSIZE; - /* Get rid of packet header and mtags. */ - m_demote(m, 1); - /* Check if this segment attaches to the end. */ tqe = TAILQ_LAST(&tp->t_trq, trq_head); if (tqe && tqe->trq_seq + tqe->trq_len == th->th_seq) { @@ -204,27 +225,33 @@ return (0); } + /* Check if beyond last block. */ + if (tqe && SEQ_LT(tqe->trq_seq + tqe->trq_len, th->th_seq)) + goto insert; + + /* Check if this is the first segment. */ + if (TAILQ_EMPTY(&tp->t_trq)) + goto insert; + /* Check if this is the missing segment. */ if (tp->rcv_nxt == th->th_seq) { tqe = TAILQ_FIRST(&tp->t_trq); - KASSERT(tqe != NULL, - ("%s: missing segment but nothing in queue", __func__)); - KASSERT(SEQ_GT(tqe->trq_seq, th->th_seq), + KASSERT(SEQ_LEQ(tqe->trq_seq, th->th_seq), ("%s: first block starts below missing segment", __func__)); - if (SEQ_LT(tqe->trq_seq, th->th_seq + *tlenp)) { + /* Check if segment prepends first block. */ + if (SEQ_LEQ(tqe->trq_seq, th->th_seq + *tlenp)) { /* Trim tail of segment. */ - if ((i = tqe->trq_seq - (th->th_seq + *tlenp))) { - m_adj(m, i); - *tlenp += i; /* NB: i is negative */ + if ((i = SEQ_DELTA(tqe->trq_seq, th->th_seq + *tlenp))) { + m_adj(m, -i); + *tlenp -= i; /* TCP statistics. */ tcpstat.tcps_rcvpartduppack++; - tcpstat.tcps_rcvpartdupbyte -= i; + tcpstat.tcps_rcvpartdupbyte += i; /* Update accounting. */ for (mcnt = 0, n = m; n; n = n->m_next) mcnt += (n->m_flags & M_EXT) ? n->m_ext.ext_size : MSIZE; } - /* Segment prepends first block. */ tqe->trq_len += *tlenp; tqe->trq_mcnt += mcnt; tp->t_trqmcnt += mcnt; @@ -234,7 +261,7 @@ tqe->trq_m = m; goto present; } - goto insert; + goto insert; /* No statistics, this segment is in line. */ } /* TCP statistics. */ @@ -242,13 +269,19 @@ tcpstat.tcps_rcvoobyte += *tlenp; /* See where it fits. */ - TAILQ_FOREACH(tqe, &tp->t_trq, trq_q) { + TAILQ_FOREACH_SAFE(tqe, &tp->t_trq, trq_q, tqen) { +#if 1 /* Segment is after this blocks coverage. */ if (SEQ_LT(tqe->trq_seq + tqe->trq_len, th->th_seq)) continue; +#endif /* Segment is after the previous one but before this one. */ if (SEQ_GT(tqe->trq_seq, th->th_seq + *tlenp)) break; /* Insert as new block. */ + + KASSERT(SEQ_GT(tqe->trq_seq, th->th_seq + *tlenp), + ("%s: iterated past insert point", __func__)); + /* Segment is already fully covered. */ if (SEQ_LEQ(tqe->trq_seq, th->th_seq) && SEQ_GEQ(tqe->trq_seq + tqe->trq_len, th->th_seq + *tlenp)) { @@ -258,54 +291,36 @@ *tlenp = 0; return (0); } - /* Segment appends to this block. */ - if (SEQ_LEQ(tqe->trq_seq + tqe->trq_len, th->th_seq)) { - /* Trim head of segment. */ - if ((i = tqe->trq_seq + tqe->trq_len - th->th_seq)) { - m_adj(m, i); - *tlenp -= i; - /* TCP Statistics. */ - tcpstat.tcps_rcvpartduppack++; - tcpstat.tcps_rcvpartdupbyte += i; - /* XXX dupes */ - } - tqe->trq_len += *tlenp; - tqe->trq_mcnt += mcnt; + + /* Segment covers and extends on both ends. */ + if (SEQ_GEQ(tqe->trq_seq, th->th_seq) && + SEQ_LT(tqe->trq_seq + tqe->trq_len, th->th_seq + *tlenp)) { + /* Replace block content. */ + tp->t_trqmcnt -= tqe->trq_mcnt; + m_freem(tqe->trq_m); + tqe->trq_len = *tlenp; + tqe->trq_mcnt = mcnt; tp->t_trqmcnt += mcnt; - tqe->trq_ml->m_next = m; + tqe->trq_seq = th->th_seq; + tqe->trq_m = m; tqe->trq_ml = m_last(m); - /* Check if segment bridges two blocks to merge. */ - if ((tqen = TAILQ_NEXT(tqe, trq_q)) && - SEQ_GEQ(tqe->trq_seq + tqe->trq_len, tqen->trq_seq)) { - /* Trim head of next block. */ - /* XXXAO: Should trim tail of segment instead. */ - if ((i = tqe->trq_seq + tqe->trq_len - - tqen->trq_seq)) { - m_adj(tqen->trq_m, i); - tqen->trq_len -= i; - /* TCP statistics. */ - tcpstat.tcps_rcvpartduppack++; - tcpstat.tcps_rcvpartdupbyte += i; - } - tqe->trq_len += tqen->trq_len; - tqe->trq_mcnt += tqen->trq_mcnt; - tqe->trq_ml->m_next = tqen->trq_m; - tqe->trq_ml = tqen->trq_ml; - TAILQ_REMOVE(&tp->t_trq, tqen, trq_q); - uma_zfree(tcp_reass_zone, tqen); - tcp_reass_qsize--; - } + /* Check if segment bridges next block to merge. */ + if (tqen != NULL && + SEQ_GEQ(tqe->trq_seq + tqe->trq_len, tqen->trq_seq)) + tcp_reass_merge(tp, tlenp, tqe, tqen); return (0); } - /* Segment prepends. */ - if (SEQ_GT(tqe->trq_seq, th->th_seq)) { + + /* Segment prepends to this block. */ + if (SEQ_GT(tqe->trq_seq, th->th_seq) && + SEQ_GEQ(tqe->trq_seq + tqe->trq_len, th->th_seq + *tlenp)) { /* Trim tail of segment. */ - if ((i = tqe->trq_seq - (th->th_seq + *tlenp))) { - m_adj(m, i); - *tlenp += i; /* NB: i is negative */ + if ((i = SEQ_DELTA(tqe->trq_seq, th->th_seq + *tlenp))) { + m_adj(m, -i); + *tlenp -= i; /* TCP statistics. */ tcpstat.tcps_rcvpartduppack++; - tcpstat.tcps_rcvpartdupbyte -= i; + tcpstat.tcps_rcvpartdupbyte += i; /* Update accounting. */ for (mcnt = 0, n = m; n; n = n->m_next) mcnt += (n->m_flags & M_EXT) ? @@ -320,6 +335,29 @@ tqe->trq_m = m; return (0); } + + /* Segment appends to this block. */ + if (SEQ_LEQ(tqe->trq_seq + tqe->trq_len, th->th_seq) && + SEQ_LT(tqe->trq_seq + tqe->trq_len, th->th_seq + *tlenp)) { + /* Trim head of segment. */ + if ((i = SEQ_DELTA(tqe->trq_seq + tqe->trq_len, th->th_seq))) { + m_adj(m, i); + *tlenp -= i; + /* TCP Statistics. */ + tcpstat.tcps_rcvpartduppack++; + tcpstat.tcps_rcvpartdupbyte += i; + } + tqe->trq_len += *tlenp; + tqe->trq_mcnt += mcnt; + tp->t_trqmcnt += mcnt; + tqe->trq_ml->m_next = m; + tqe->trq_ml = m_last(m); + /* Check if segment bridges two blocks to merge. */ + if (tqen != NULL && + SEQ_GEQ(tqe->trq_seq + tqe->trq_len, tqen->trq_seq)) + tcp_reass_merge(tp, tlenp, tqe, tqen); + return (0); + } } insert: @@ -340,10 +378,15 @@ tqen->trq_ml = m_last(m); /* Where to insert. */ - if (tqe) + if (tqe != NULL && SEQ_LT(tqe->trq_seq + tqe->trq_len, th->th_seq)) + TAILQ_INSERT_TAIL(&tp->t_trq, tqen, trq_q); + else if (tqe != NULL) TAILQ_INSERT_BEFORE(tqe, tqen, trq_q); - else + else { + KASSERT(TAILQ_EMPTY(&tp->t_trq), + ("%s: queue not empty", __func__)); TAILQ_INSERT_HEAD(&tp->t_trq, tqen, trq_q); + } /* Missing segment? */ if (tp->rcv_nxt != th->th_seq) @@ -353,25 +396,21 @@ * Present data to user, advancing rcv_nxt through * completed sequence space. */ - if (!TCPS_HAVEESTABLISHED(tp->t_state)) - return (0); - tqe = TAILQ_FIRST(&tp->t_trq); - if (tqe == NULL || tqe->trq_seq != tp->rcv_nxt) - return (0); SOCKBUF_LOCK(&so->so_rcv); TAILQ_FOREACH_SAFE(tqe, &tp->t_trq, trq_q, tqen) { - /* We can never go more than one round. */ + KASSERT(SEQ_GEQ(tqe->trq_seq, tp->rcv_nxt), + ("%s: trq_seq < rcv_nxt", __func__)); if (tqe->trq_seq != tp->rcv_nxt) break; #if 1 /* XXX: This is bogus if we had a FIN. */ - flags = tqe->trq_flags & TH_FIN; + flags = tqe->trq_flags; #endif - tp->rcv_nxt += tqe->trq_len; if (so->so_rcv.sb_state & SBS_CANTRCVMORE) m_freem(tqe->trq_m); else sbappendstream_locked(&so->so_rcv, tqe->trq_m); + tp->rcv_nxt += tqe->trq_len; tp->t_trqmcnt -= tqe->trq_mcnt; TAILQ_REMOVE(&tp->t_trq, tqe, trq_q); uma_zfree(tcp_reass_zone, tqe); @@ -387,11 +426,64 @@ #endif } +static void +tcp_reass_merge(struct tcpcb *tp, int *tlenp, struct trq *tqe, struct trq *tqen) +{ +#if 0 + struct mbuf *m; +#endif + int i; + + KASSERT(SEQ_GEQ(tqe->trq_seq + tqe->trq_len, tqen->trq_seq), + ("%s: blocks do not overlap, nothing to merge", __func__)); + + /* Appended block may reach beyond next block. */ + while (SEQ_GEQ(tqe->trq_seq + tqe->trq_len, tqen->trq_seq + tqen->trq_len)) { + tcpstat.tcps_rcvpartdupbyte += tqen->trq_len; /* Statistics */ + tp->t_trqmcnt -= tqe->trq_mcnt; + m_freem(tqen->trq_m); + TAILQ_REMOVE(&tp->t_trq, tqen, trq_q); + uma_zfree(tcp_reass_zone, tqen); + tcp_reass_qsize--; + /* And the one after that. */ + if ((tqen = TAILQ_NEXT(tqe, trq_q)) == NULL) + return; + } + + /* Trim head of next block. */ + if ((i = SEQ_DELTA(tqe->trq_seq + tqe->trq_len, tqen->trq_seq))) { + m_adj(tqen->trq_m, i); + tqen->trq_len -= i; + tcpstat.tcps_rcvpartdupbyte += i; /* Statistics */ +#if 0 + /* Trim ... */ + while (tqen->trq_m->m_len == 0) { + m = tqen->trq_m; + tqen->trq_m = tqen->trq_m->m_next; + /* mcnt */ + m_free(m); + } +#endif + KASSERT(tqen->trq_m != NULL, + ("%s: no remaining mbufs in block", __func__)); + } + + /* Merge blocks together. */ + tqe->trq_len += tqen->trq_len; + tqe->trq_mcnt += tqen->trq_mcnt; + tqe->trq_ml->m_next = tqen->trq_m; + tqe->trq_ml = tqen->trq_ml; + TAILQ_REMOVE(&tp->t_trq, tqen, trq_q); + uma_zfree(tcp_reass_zone, tqen); + tcp_reass_qsize--; +} + /* * Free the reassembly queue on tcpcb free and on general memory shortage. */ void -tcp_reass_qfree(struct tcpcb *tp) { +tcp_reass_qfree(struct tcpcb *tp) +{ struct trq *tqe, *tqen; INP_LOCK_ASSERT(tp->t_inpcb); ==== //depot/projects/tcp_reass/netinet/tcp_seq.h#2 (text+ko) ==== @@ -44,6 +44,7 @@ #define SEQ_MIN(a, b) ((SEQ_LT(a, b)) ? (a) : (b)) #define SEQ_MAX(a, b) ((SEQ_GT(a, b)) ? (a) : (b)) +#define SEQ_DELTA(a,b) ((int)SEQ_MAX(a, b) - SEQ_MIN(a, b)) /* for modulo comparisons of timestamps */ #define TSTMP_LT(a,b) ((int)((a)-(b)) < 0) From owner-p4-projects@FreeBSD.ORG Wed Jan 16 22:32:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D1FE16A421; Wed, 16 Jan 2008 22:32:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C5DCA16A418 for ; Wed, 16 Jan 2008 22:32:29 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AA86913C474 for ; Wed, 16 Jan 2008 22:32:29 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0GMWTBM045051 for ; Wed, 16 Jan 2008 22:32:29 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0GMWTub045048 for perforce@freebsd.org; Wed, 16 Jan 2008 22:32:29 GMT (envelope-from imp@freebsd.org) Date: Wed, 16 Jan 2008 22:32:29 GMT Message-Id: <200801162232.m0GMWTub045048@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133434 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 22:32:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=133434 Change 133434 by imp@imp_lighthouse on 2008/01/16 22:31:49 Pull in some more PRIDs from NetBSD. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/locore.h#2 edit .. //depot/projects/mips2/src/sys/mips/mips/cpu.c#21 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/locore.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: locore.h,v 1.62 2002/06/01 13:45:45 simonb Exp $ */ +/* $NetBSD: locore.h,v 1.78 2007/10/17 19:55:36 garbled Exp $ */ /* * Copyright 1996 The Board of Trustees of The Leland Stanford @@ -34,24 +34,31 @@ /* * CPU identification, from PRID register. */ +typedef int mips_prid_t; -#define MIPS_PRID_REV(x) (((x) >> 0) & 0x00ff) -#define MIPS_PRID_IMPL(x) (((x) >> 8) & 0x00ff) +#define MIPS_PRID_REV(x) (((x) >> 0) & 0x00ff) +#define MIPS_PRID_IMPL(x) (((x) >> 8) & 0x00ff) /* pre-MIPS32/64 */ -#define MIPS_PRID_RSVD(x) (((x) >> 16) & 0xffff) -#define MIPS_PRID_REV_MIN(x) ((MIPS_PRID_REV(x) >> 0) & 0x0f) -#define MIPS_PRID_REV_MAJ(x) ((MIPS_PRID_REV(x) >> 4) & 0x0f) +#define MIPS_PRID_RSVD(x) (((x) >> 16) & 0xffff) +#define MIPS_PRID_REV_MIN(x) ((MIPS_PRID_REV(x) >> 0) & 0x0f) +#define MIPS_PRID_REV_MAJ(x) ((MIPS_PRID_REV(x) >> 4) & 0x0f) /* MIPS32/64 */ -#define MIPS_PRID_CID(x) (((x) >> 16) & 0x00ff) /* Company ID */ -#define MIPS_PRID_CID_PREHISTORIC 0x00 /* Not MIPS32/64 */ -#define MIPS_PRID_CID_MTI 0x01 /* MIPS Technologies, Inc. */ -#define MIPS_PRID_CID_BROADCOM 0x02 /* Broadcom */ -#define MIPS_PRID_CID_ALCHEMY 0x03 /* Alchemy Semiconductor */ -#define MIPS_PRID_CID_SIBYTE 0x04 /* SiByte */ -#define MIPS_PRID_CID_SANDCRAFT 0x05 /* SandCraft */ -#define MIPS_PRID_COPTS(x) (((x) >> 24) & 0x00ff) /* Company Options */ +#define MIPS_PRID_CID(x) (((x) >> 16) & 0x00ff) /* Company ID */ +#define MIPS_PRID_CID_PREHISTORIC 0x00 /* Not MIPS32/64 */ +#define MIPS_PRID_CID_MTI 0x01 /* MIPS Technologies, Inc. */ +#define MIPS_PRID_CID_BROADCOM 0x02 /* Broadcom */ +#define MIPS_PRID_CID_ALCHEMY 0x03 /* Alchemy Semiconductor */ +#define MIPS_PRID_CID_SIBYTE 0x04 /* SiByte */ +#define MIPS_PRID_CID_SANDCRAFT 0x05 /* SandCraft */ +#define MIPS_PRID_CID_PHILIPS 0x06 /* Philips */ +#define MIPS_PRID_CID_TOSHIBA 0x07 /* Toshiba */ +#define MIPS_PRID_CID_LSI 0x08 /* LSI */ + /* 0x09 unannounced */ + /* 0x0a unannounced */ +#define MIPS_PRID_CID_LEXRA 0x0b /* Lexra */ +#define MIPS_PRID_COPTS(x) (((x) >> 24) & 0x00ff) /* Company Options */ #ifdef _KERNEL #ifdef __HAVE_MIPS_MACHDEP_CACHE_CONFIG ==== //depot/projects/mips2/src/sys/mips/mips/cpu.c#21 (text+ko) ==== @@ -209,6 +209,18 @@ case MIPS_PRID_CID_SANDCRAFT: printf("Sandcraft"); break; + case MIPS_PRID_CID_PHILIPS: + printf("Philips"); + break; + case MIPS_PRID_CID_TOSHIBA: + printf("Toshiba"); + break; + case MIPS_PRID_CID_LSI: + printf("LSI"); + break; + case MIPS_PRID_CID_LEXRA: + printf("Lexra"); + break; case MIPS_PRID_CID_PREHISTORIC: default: printf("Unknown"); From owner-p4-projects@FreeBSD.ORG Wed Jan 16 22:32:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7137816A50B; Wed, 16 Jan 2008 22:32:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DDBC916A41B for ; Wed, 16 Jan 2008 22:32:29 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CE91613C478 for ; Wed, 16 Jan 2008 22:32:29 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0GMWTgx045057 for ; Wed, 16 Jan 2008 22:32:29 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0GMWTiN045054 for perforce@freebsd.org; Wed, 16 Jan 2008 22:32:29 GMT (envelope-from imp@freebsd.org) Date: Wed, 16 Jan 2008 22:32:29 GMT Message-Id: <200801162232.m0GMWTiN045054@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133435 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 22:32:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=133435 Change 133435 by imp@imp_lighthouse on 2008/01/16 22:32:06 More todo Affected files ... .. //depot/projects/mips2-jnpr/src/sys/TODO#5 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/TODO#5 (text+ko) ==== @@ -1,5 +1,6 @@ o Sort out MIPS_COP_0_STATUS (defined as _(12)) vs COP_0_STATUS_REG (defined as $12) This is cpu.h vs cpureg.h or a 'netbsd' vs 'openbsd' argument. + See Mips Run uses the latter. o Can we remove PDP_ENDIAN? o Can we remove a.out junk o Can we remove pre-ansi stuff @@ -21,3 +22,10 @@ here XXX o What's defined in assym.s and param.h varies somewhat between the two code strains. Figure out why and how to resolve. +o machdep getmemsize() really is OBE. Except for the mips_wired_tlb + variable setting, which is related to something that was omitted from + the juniper-mips dump. +o cpu init +o I moved where we initialize the msgbuf. We need to make sure that no + printfs happen. This is where the mips2 initializes things, but I've + not audited things to make sure that's really sane. From owner-p4-projects@FreeBSD.ORG Wed Jan 16 23:22:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A71F116A469; Wed, 16 Jan 2008 23:22:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6CBDD16A421 for ; Wed, 16 Jan 2008 23:22:24 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5DCCB13C45A for ; Wed, 16 Jan 2008 23:22:24 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0GNMOYJ053318 for ; Wed, 16 Jan 2008 23:22:24 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0GNMOYN053315 for perforce@freebsd.org; Wed, 16 Jan 2008 23:22:24 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 16 Jan 2008 23:22:24 GMT Message-Id: <200801162322.m0GNMOYN053315@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133439 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 23:22:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=133439 Change 133439 by kmacy@pandemonium:kmacy:xen31 on 2008/01/16 23:21:32 remove unused pv_list_count Affected files ... .. //depot/projects/xen31/sys/i386/xen/pmap.c#14 edit Differences ... ==== //depot/projects/xen31/sys/i386/xen/pmap.c#14 (text+ko) ==== @@ -562,7 +562,6 @@ { TAILQ_INIT(&m->md.pv_list); - m->md.pv_list_count = 0; } #ifdef PAE @@ -1934,7 +1933,6 @@ TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); - m->md.pv_list_count--; free_pv_entry(pmap, pv); if (pmap != locked_pmap) PMAP_UNLOCK(pmap); @@ -2091,7 +2089,6 @@ } KASSERT(pv != NULL, ("pmap_remove_entry: pv not found")); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count--; if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); free_pv_entry(pmap, pv); @@ -2111,7 +2108,6 @@ pv = get_pv_entry(pmap, FALSE); pv->pv_va = va; TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count++; } /* @@ -2128,7 +2124,6 @@ (pv = get_pv_entry(pmap, TRUE)) != NULL) { pv->pv_va = va; TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count++; return (TRUE); } else return (FALSE); @@ -2352,7 +2347,6 @@ pmap_invalidate_page(pmap, pv->pv_va); pmap_free_zero_pages(free); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count--; free_pv_entry(pmap, pv); PMAP_UNLOCK(pmap); } @@ -3359,7 +3353,6 @@ PV_STAT(pv_entry_spare++); pv_entry_count--; pc->pc_map[field] |= bitmask; - m->md.pv_list_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); From owner-p4-projects@FreeBSD.ORG Wed Jan 16 23:23:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D409A16A41B; Wed, 16 Jan 2008 23:23:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 99B2116A417 for ; Wed, 16 Jan 2008 23:23:25 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8B05313C461 for ; Wed, 16 Jan 2008 23:23:25 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0GNNPVC053707 for ; Wed, 16 Jan 2008 23:23:25 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0GNNPaV053704 for perforce@freebsd.org; Wed, 16 Jan 2008 23:23:25 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 16 Jan 2008 23:23:25 GMT Message-Id: <200801162323.m0GNNPaV053704@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133440 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 23:23:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=133440 Change 133440 by kmacy@pandemonium:kmacy:xen31 on 2008/01/16 23:22:25 increase the segment sizes so that we'll be able to access the machine to physical table on machines with up to 16GB of RAM Affected files ... .. //depot/projects/xen31/sys/i386/i386/machdep.c#12 edit Differences ... ==== //depot/projects/xen31/sys/i386/i386/machdep.c#12 (text+ko) ==== @@ -2159,6 +2159,10 @@ #ifdef XEN extern vm_paddr_t *pdir_shadow; + +#define MTOPSIZE (1<<(12 + PAGE_SHIFT)) + + void init386(int first) { @@ -2200,14 +2204,14 @@ * to physical page frames - hence we need to be able to * access 4GB - (64MB - 4MB + 64k) */ - gdt_segs[GPRIV_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + 256*PAGE_SIZE); - gdt_segs[GUFS_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + 256*PAGE_SIZE); - gdt_segs[GUGS_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + 256*PAGE_SIZE); - gdt_segs[GCODE_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + 256*PAGE_SIZE); - gdt_segs[GDATA_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + 256*PAGE_SIZE); - gdt_segs[GUCODE_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + 256*PAGE_SIZE); - gdt_segs[GUDATA_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + 256*PAGE_SIZE); - gdt_segs[GBIOSLOWMEM_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + 256*PAGE_SIZE); + gdt_segs[GPRIV_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GUFS_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GUGS_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GCODE_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GDATA_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GUCODE_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GUDATA_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GBIOSLOWMEM_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); pc = &__pcpu[0]; gdt_segs[GPRIV_SEL].ssd_base = (int) pc; From owner-p4-projects@FreeBSD.ORG Thu Jan 17 00:28:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C98B416A41A; Thu, 17 Jan 2008 00:28:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7336116A418 for ; Thu, 17 Jan 2008 00:28:58 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 624D113C45B for ; Thu, 17 Jan 2008 00:28:58 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0H0Sww6064196 for ; Thu, 17 Jan 2008 00:28:58 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0H0SXYp064192 for perforce@freebsd.org; Thu, 17 Jan 2008 00:28:33 GMT (envelope-from imp@freebsd.org) Date: Thu, 17 Jan 2008 00:28:33 GMT Message-Id: <200801170028.m0H0SXYp064192@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133442 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 00:28:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=133442 Change 133442 by imp@imp_mbp on 2008/01/17 00:27:42 IF mips2 @133441 Affected files ... .. //depot/projects/arm/src/Makefile#15 edit .. //depot/projects/arm/src/Makefile.inc1#32 edit .. //depot/projects/arm/src/games/fortune/strfile/strfile.c#2 edit .. //depot/projects/arm/src/lib/libmagic/Makefile#3 edit .. //depot/projects/arm/src/share/mk/bsd.prog.mk#5 edit .. //depot/projects/arm/src/tools/build/Makefile#2 edit .. //depot/projects/arm/src/tools/build/mk/Makefile.boot#2 edit .. //depot/projects/arm/src/tools/build/mk/bsd.prog.mk#2 edit .. //depot/projects/arm/src/usr.bin/mklocale/ldef.h#2 edit .. //depot/user/imp/mips2-start/EMULATION#2 integrate .. //depot/user/imp/mips2-start/Makefile#4 integrate .. //depot/user/imp/mips2-start/ObsoleteFiles.inc#7 integrate .. //depot/user/imp/mips2-start/bin/cp/cp.c#2 integrate .. //depot/user/imp/mips2-start/bin/ed/Makefile#3 integrate .. //depot/user/imp/mips2-start/bin/mv/mv.c#2 integrate .. //depot/user/imp/mips2-start/bin/sh/sh.1#3 integrate .. //depot/user/imp/mips2-start/contrib/amd/AUTHORS#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/BUGS#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/COPYING#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/ChangeLog#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/FAQ#1 branch .. //depot/user/imp/mips2-start/contrib/amd/FREEBSD-Xlist#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/FREEBSD-upgrade#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/INSTALL#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/NEWS#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/README.attrcache#1 branch .. //depot/user/imp/mips2-start/contrib/amd/README.ldap#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/am_ops.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/amd.8#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/amd.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/amd.h#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/amfs_auto.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/amfs_direct.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/amfs_error.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/amfs_generic.c#1 branch .. //depot/user/imp/mips2-start/contrib/amd/amd/amfs_host.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/amfs_inherit.c#2 delete .. //depot/user/imp/mips2-start/contrib/amd/amd/amfs_link.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/amfs_linkx.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/amfs_nfsl.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/amfs_nfsx.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/amfs_program.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/amfs_root.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/amfs_toplvl.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/amfs_union.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/amq_subr.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/amq_svc.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/autil.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/clock.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/conf.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/conf_parse.y#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/conf_tok.l#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/get_args.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/info_exec.c#1 branch .. //depot/user/imp/mips2-start/contrib/amd/amd/info_file.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/info_hesiod.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/info_ldap.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/info_ndbm.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/info_nis.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/info_nisplus.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/info_passwd.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/info_union.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/map.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/mapc.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/mntfs.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/nfs_prot_svc.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/nfs_start.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/nfs_subr.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/ops_TEMPLATE.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/ops_cachefs.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/ops_cdfs.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/ops_efs.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/ops_lofs.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/ops_mfs.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/ops_nfs.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/ops_nfs3.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/ops_nullfs.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/ops_pcfs.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/ops_tfs.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/ops_tmpfs.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/ops_ufs.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/ops_umapfs.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/ops_unionfs.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/ops_xfs.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/opts.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/readdir.c#1 branch .. //depot/user/imp/mips2-start/contrib/amd/amd/restart.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/rpc_fwd.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/sched.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/srvr_amfs_auto.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amd/srvr_nfs.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amq/amq.8#3 integrate .. //depot/user/imp/mips2-start/contrib/amd/amq/amq.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amq/amq.h#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amq/amq_clnt.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amq/amq_xdr.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amq/pawd.1#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/amq/pawd.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/aux_conf.h.in#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/bootstrap#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/conf/checkmount/checkmount_bsd44.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/conf/mtab/mtab_bsd.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/conf/transp/transp_sockets.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/conf/trap/trap_default.h#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/conf/umount/umount_bsd44.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/doc/am-utils.texi#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/doc/stamp-vti#1 branch .. //depot/user/imp/mips2-start/contrib/amd/doc/texinfo.tex#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/doc/version.texi#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/fixmount/fixmount.8#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/fixmount/fixmount.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/fsinfo/fsi_analyze.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/fsinfo/fsi_data.h#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/fsinfo/fsi_dict.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/fsinfo/fsi_gram.y#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/fsinfo/fsi_lex.l#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/fsinfo/fsi_util.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/fsinfo/fsinfo.8#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/fsinfo/fsinfo.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/fsinfo/fsinfo.h#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/fsinfo/wr_atab.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/fsinfo/wr_bparam.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/fsinfo/wr_dumpset.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/fsinfo/wr_exportfs.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/fsinfo/wr_fstab.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/hlfsd/hlfsd.8#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/hlfsd/hlfsd.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/hlfsd/hlfsd.h#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/hlfsd/homedir.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/hlfsd/nfs_prot_svc.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/hlfsd/stubs.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/include/am_compat.h#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/include/am_defs.h#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/include/am_utils.h#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/include/am_xdr_func.h#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/include/amq_defs.h#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/include/mount_headers1.h#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/include/mount_headers2.h#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/ldap-id.ms#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/ldap.schema#1 branch .. //depot/user/imp/mips2-start/contrib/amd/libamu/alloca.c#2 delete .. //depot/user/imp/mips2-start/contrib/amd/libamu/amu.h#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/libamu/hasmntopt.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/libamu/misc_rpc.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/libamu/mount_fs.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/libamu/mtab.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/libamu/nfs_prot_xdr.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/libamu/strerror.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/libamu/strutil.c#1 branch .. //depot/user/imp/mips2-start/contrib/amd/libamu/util.c#2 delete .. //depot/user/imp/mips2-start/contrib/amd/libamu/wire.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/libamu/xdr_func.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/libamu/xutil.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/m4/GNUmakefile#2 delete .. //depot/user/imp/mips2-start/contrib/amd/m4/amdgrep#2 delete .. //depot/user/imp/mips2-start/contrib/amd/m4/amindent#2 delete .. //depot/user/imp/mips2-start/contrib/amd/m4/autopat#2 delete .. //depot/user/imp/mips2-start/contrib/amd/m4/chop-aclocal.pl#2 delete .. //depot/user/imp/mips2-start/contrib/amd/m4/copy-if-newbig#2 delete .. //depot/user/imp/mips2-start/contrib/amd/m4/macros/HEADER#2 delete .. //depot/user/imp/mips2-start/contrib/amd/m4/macros/TRAILER#2 delete .. //depot/user/imp/mips2-start/contrib/amd/m4/mk-aclocal#2 delete .. //depot/user/imp/mips2-start/contrib/amd/m4/mkconf#2 delete .. //depot/user/imp/mips2-start/contrib/amd/m4/rmtspc#2 delete .. //depot/user/imp/mips2-start/contrib/amd/m4/update_build_version#2 delete .. //depot/user/imp/mips2-start/contrib/amd/mk-amd-map/mk-amd-map.8#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/mk-amd-map/mk-amd-map.c#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/scripts/am-eject.in#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/scripts/amd.conf-sample#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/scripts/amd.conf.5#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/scripts/amd2ldif.in#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/scripts/amd2sun.in#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/scripts/automount2amd.8#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/scripts/automount2amd.in#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/scripts/ctl-amd.in#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/scripts/ctl-hlfsd.in#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/scripts/expn.1#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/scripts/expn.in#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/scripts/fix-amd-map.in#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/scripts/fixrmtab.in#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/scripts/redhat-ctl-amd.in#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/scripts/test-attrcache.in#1 branch .. //depot/user/imp/mips2-start/contrib/amd/scripts/wait4amd.in#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/scripts/wait4amd2die.in#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/tasks#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/vers.m4#1 branch .. //depot/user/imp/mips2-start/contrib/amd/wire-test/wire-test.8#2 integrate .. //depot/user/imp/mips2-start/contrib/amd/wire-test/wire-test.c#2 integrate .. //depot/user/imp/mips2-start/contrib/gcc/config/sparc/freebsd.h#3 integrate .. //depot/user/imp/mips2-start/contrib/gcc/fold-const.c#4 integrate .. //depot/user/imp/mips2-start/contrib/gdtoa/gdtoaimp.h#2 integrate .. //depot/user/imp/mips2-start/contrib/gdtoa/hexnan.c#2 integrate .. //depot/user/imp/mips2-start/contrib/gdtoa/strtod.c#2 integrate .. //depot/user/imp/mips2-start/contrib/gdtoa/strtof.c#2 integrate .. //depot/user/imp/mips2-start/contrib/gdtoa/strtorQ.c#2 integrate .. //depot/user/imp/mips2-start/contrib/gdtoa/strtorx.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/CREDITS#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/HISTORY#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/INSTALL#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/LICENSE#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/MANIFEST#2 delete .. //depot/user/imp/mips2-start/contrib/openpam/Makefile.am#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/Makefile.in#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/README#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/RELNOTES#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/aclocal.m4#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/autogen.sh#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/bin/Makefile.am#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/bin/Makefile.in#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/bin/su/Makefile.am#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/bin/su/Makefile.in#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/bin/su/su.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/compile#1 branch .. //depot/user/imp/mips2-start/contrib/openpam/config.h.in#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/configure#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/configure.ac#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/configure.in#2 delete .. //depot/user/imp/mips2-start/contrib/openpam/depcomp#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/Makefile.am#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/Makefile.in#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/Makefile.am#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/Makefile.in#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/openpam.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/openpam.man#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/openpam_borrow_cred.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/openpam_free_data.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/openpam_free_envlist.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/openpam_get_option.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/openpam_log.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/openpam_nullconv.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/openpam_readline.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/openpam_restore_cred.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/openpam_set_option.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/openpam_ttyconv.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam.conf.5#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam.man#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_acct_mgmt.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_authenticate.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_chauthtok.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_close_session.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_conv.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_end.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_error.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_get_authtok.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_get_data.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_get_item.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_get_user.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_getenv.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_getenvlist.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_info.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_open_session.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_prompt.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_putenv.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_set_data.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_set_item.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_setcred.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_setenv.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_sm_authenticate.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_sm_chauthtok.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_sm_close_session.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_sm_open_session.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_sm_setcred.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_start.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_strerror.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_verror.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_vinfo.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/doc/man/pam_vprompt.3#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/include/Makefile.am#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/include/Makefile.in#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/include/security/Makefile.am#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/include/security/Makefile.in#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/include/security/openpam.h#3 integrate .. //depot/user/imp/mips2-start/contrib/openpam/include/security/openpam_attr.h#1 branch .. //depot/user/imp/mips2-start/contrib/openpam/include/security/openpam_version.h#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/include/security/pam_appl.h#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/include/security/pam_constants.h#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/include/security/pam_modules.h#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/include/security/pam_types.h#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/install-sh#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/Makefile.am#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/Makefile.in#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/openpam_borrow_cred.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/openpam_configure.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/openpam_dispatch.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/openpam_dynamic.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/openpam_findenv.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/openpam_free_data.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/openpam_free_envlist.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/openpam_get_option.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/openpam_impl.h#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/openpam_load.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/openpam_log.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/openpam_nullconv.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/openpam_readline.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/openpam_restore_cred.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/openpam_set_option.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/openpam_static.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/openpam_ttyconv.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_acct_mgmt.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_authenticate.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_authenticate_secondary.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_chauthtok.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_close_session.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_end.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_error.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_get_authtok.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_get_data.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_get_item.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_get_mapped_authtok.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_get_mapped_username.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_get_user.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_getenv.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_getenvlist.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_info.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_open_session.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_prompt.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_putenv.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_set_data.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_set_item.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_set_mapped_authtok.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_set_mapped_username.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_setcred.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_setenv.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_sm_acct_mgmt.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_sm_authenticate.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_sm_authenticate_secondary.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_sm_chauthtok.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_sm_close_session.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_sm_get_mapped_username.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_sm_open_session.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_sm_set_mapped_username.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_sm_setcred.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_start.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_strerror.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_verror.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_vinfo.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/lib/pam_vprompt.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/ltconfig#2 delete .. //depot/user/imp/mips2-start/contrib/openpam/ltmain.sh#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/misc/gendoc.pl#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/missing#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/mkinstalldirs#2 delete .. //depot/user/imp/mips2-start/contrib/openpam/modules/Makefile.am#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/modules/Makefile.in#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/modules/pam_deny/Makefile.am#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/modules/pam_deny/Makefile.in#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/modules/pam_deny/pam_deny.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/modules/pam_permit/Makefile.am#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/modules/pam_permit/Makefile.in#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/modules/pam_permit/pam_permit.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/modules/pam_unix/Makefile.am#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/modules/pam_unix/Makefile.in#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/user/imp/mips2-start/contrib/openpam/stamp-h.in#2 delete .. //depot/user/imp/mips2-start/etc/defaults/periodic.conf#4 integrate .. //depot/user/imp/mips2-start/etc/rc.d/DAEMON#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/LOGIN#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/Makefile#4 integrate .. //depot/user/imp/mips2-start/etc/rc.d/NETWORKING#3 integrate .. //depot/user/imp/mips2-start/etc/rc.d/SERVERS#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/accounting#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/amd#3 integrate .. //depot/user/imp/mips2-start/etc/rc.d/apmd#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/bootconf.sh#2 delete .. //depot/user/imp/mips2-start/etc/rc.d/bootparams#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/ccd#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/cron#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/dhclient#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/dmesg#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/fsck#3 integrate .. //depot/user/imp/mips2-start/etc/rc.d/ftp-proxy#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/inetd#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/ipfilter#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/ipfs#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/ipmon#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/ipnat#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/ipsec#3 integrate .. //depot/user/imp/mips2-start/etc/rc.d/isdnd#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/keyserv#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/ldconfig#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/local#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/lockd#4 integrate .. //depot/user/imp/mips2-start/etc/rc.d/lpd#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/motd#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/mountcritlocal#3 integrate .. //depot/user/imp/mips2-start/etc/rc.d/mountcritremote#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/mountd#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/moused#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/mrouted#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/newsyslog#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/nfsd#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/power_profile#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/pwcheck#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/quota#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/rarpd#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/resolv#3 integrate .. //depot/user/imp/mips2-start/etc/rc.d/root#3 integrate .. //depot/user/imp/mips2-start/etc/rc.d/route6d#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/routed#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/rpcbind#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/rtadvd#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/rwho#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/savecore#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/securelevel#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/sendmail#3 integrate .. //depot/user/imp/mips2-start/etc/rc.d/sshd#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/statd#3 integrate .. //depot/user/imp/mips2-start/etc/rc.d/swap1#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/sysctl#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/syslogd#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/timed#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/tmp#3 integrate .. //depot/user/imp/mips2-start/etc/rc.d/ugidfw#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/var#3 integrate .. //depot/user/imp/mips2-start/etc/rc.d/virecover#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/ypbind#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/yppasswdd#2 integrate .. //depot/user/imp/mips2-start/etc/rc.d/ypserv#2 integrate .. //depot/user/imp/mips2-start/games/fortune/datfiles/Makefile#2 integrate .. //depot/user/imp/mips2-start/games/fortune/datfiles/fortunes#4 integrate .. //depot/user/imp/mips2-start/games/fortune/datfiles/fortunes-o.real#3 integrate .. //depot/user/imp/mips2-start/games/fortune/datfiles/fortunes-o.sp.ok#2 integrate .. //depot/user/imp/mips2-start/games/fortune/datfiles/fortunes.sp.ok#2 integrate .. //depot/user/imp/mips2-start/games/fortune/datfiles/fortunes2-o#2 delete .. //depot/user/imp/mips2-start/games/fortune/datfiles/freebsd-tips#2 integrate .. //depot/user/imp/mips2-start/games/fortune/datfiles/freebsd-tips.sp.ok#1 branch .. //depot/user/imp/mips2-start/games/fortune/datfiles/limerick#3 integrate .. //depot/user/imp/mips2-start/games/fortune/datfiles/limerick.sp.ok#1 branch .. //depot/user/imp/mips2-start/games/fortune/datfiles/murphy#2 integrate .. //depot/user/imp/mips2-start/games/fortune/datfiles/murphy-o#2 integrate .. //depot/user/imp/mips2-start/games/fortune/datfiles/murphy.sp.ok#1 branch .. //depot/user/imp/mips2-start/games/fortune/datfiles/startrek#2 integrate .. //depot/user/imp/mips2-start/games/fortune/datfiles/zippy#2 integrate .. //depot/user/imp/mips2-start/games/fortune/datfiles/zippy.sp.ok#2 integrate .. //depot/user/imp/mips2-start/include/complex.h#2 integrate .. //depot/user/imp/mips2-start/include/nsswitch.h#2 integrate .. //depot/user/imp/mips2-start/include/pthread_np.h#3 integrate .. //depot/user/imp/mips2-start/lib/Makefile#7 integrate .. //depot/user/imp/mips2-start/lib/libc/Versions.def#3 integrate .. //depot/user/imp/mips2-start/lib/libc/amd64/Symbol.map#3 integrate .. //depot/user/imp/mips2-start/lib/libc/amd64/gd_qnan.h#2 integrate .. //depot/user/imp/mips2-start/lib/libc/arm/gd_qnan.h#2 integrate .. //depot/user/imp/mips2-start/lib/libc/gdtoa/Symbol.map#4 integrate .. //depot/user/imp/mips2-start/lib/libc/gdtoa/_ldtoa.c#4 integrate .. //depot/user/imp/mips2-start/lib/libc/gen/getgrent.c#2 integrate .. //depot/user/imp/mips2-start/lib/libc/gen/getgrouplist.c#2 integrate .. //depot/user/imp/mips2-start/lib/libc/gen/sem_open.3#2 integrate .. //depot/user/imp/mips2-start/lib/libc/i386/Symbol.map#3 integrate .. //depot/user/imp/mips2-start/lib/libc/i386/gd_qnan.h#2 integrate .. //depot/user/imp/mips2-start/lib/libc/ia64/Symbol.map#4 integrate .. //depot/user/imp/mips2-start/lib/libc/ia64/gd_qnan.h#2 integrate .. //depot/user/imp/mips2-start/lib/libc/locale/localeconv.c#2 integrate .. //depot/user/imp/mips2-start/lib/libc/net/nsdispatch.c#3 integrate .. //depot/user/imp/mips2-start/lib/libc/sparc64/Symbol.map#3 integrate .. //depot/user/imp/mips2-start/lib/libc/sparc64/gd_qnan.h#2 integrate .. //depot/user/imp/mips2-start/lib/libc/stdio/Symbol.map#3 integrate .. //depot/user/imp/mips2-start/lib/libc/stdio/vfscanf.c#2 integrate .. //depot/user/imp/mips2-start/lib/libc/stdio/vfwprintf.c#2 integrate .. //depot/user/imp/mips2-start/lib/libc/stdio/vfwscanf.c#2 integrate .. //depot/user/imp/mips2-start/lib/libc/stdlib/grantpt.c#2 integrate .. //depot/user/imp/mips2-start/lib/libc/stdlib/malloc.3#4 integrate .. //depot/user/imp/mips2-start/lib/libc/stdlib/malloc.c#4 integrate .. //depot/user/imp/mips2-start/lib/libc/stdlib/rand.c#2 integrate .. //depot/user/imp/mips2-start/lib/libc/stdlib/strtod.3#2 integrate .. //depot/user/imp/mips2-start/lib/libc/stdtime/localtime.c#2 integrate .. //depot/user/imp/mips2-start/lib/libc/string/strtok.3#2 integrate .. //depot/user/imp/mips2-start/lib/libc/string/strtok.c#2 integrate .. //depot/user/imp/mips2-start/lib/libc/string/wcstok.c#2 integrate .. //depot/user/imp/mips2-start/lib/libc/sys/access.2#2 integrate .. //depot/user/imp/mips2-start/lib/libc/sys/select.2#2 integrate .. //depot/user/imp/mips2-start/lib/libfetch/Makefile#3 integrate .. //depot/user/imp/mips2-start/lib/libfetch/common.c#2 integrate .. //depot/user/imp/mips2-start/lib/libfetch/common.h#2 integrate .. //depot/user/imp/mips2-start/lib/libfetch/fetch.3#3 integrate .. //depot/user/imp/mips2-start/lib/libfetch/fetch.c#2 integrate .. //depot/user/imp/mips2-start/lib/libfetch/file.c#2 integrate .. //depot/user/imp/mips2-start/lib/libfetch/ftp.c#3 integrate .. //depot/user/imp/mips2-start/lib/libfetch/http.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/sys/thr_error.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_accept.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_aio_suspend.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_atfork.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_attr_destroy.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_attr_get_np.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_attr_getdetachstate.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_attr_getguardsize.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_attr_getinheritsched.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_attr_getschedparam.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_attr_getschedpolicy.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_attr_getscope.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_attr_getstack.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_attr_getstackaddr.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_attr_getstacksize.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_attr_init.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_attr_setdetachstate.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_attr_setguardsize.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_attr_setinheritsched.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_attr_setschedparam.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_attr_setschedpolicy.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_attr_setscope.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_attr_setstack.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_attr_setstackaddr.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_attr_setstacksize.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_barrier.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_barrierattr.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_cancel.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_clean.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_close.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_concurrency.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_cond.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_condattr_destroy.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_condattr_init.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_connect.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_creat.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_create.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_detach.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_equal.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_execve.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_exit.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_fcntl.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_fork.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_fsync.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_getprio.c#2 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_getschedparam.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_info.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_init.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_join.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_kern.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_kill.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_main_np.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_mattr_init.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_mattr_kind_np.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_msync.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_multi_np.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_mutex.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_mutex_prioceiling.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_mutex_protocol.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_mutexattr_destroy.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_nanosleep.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_once.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_open.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_pause.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_poll.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_private.h#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_pselect.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_pspinlock.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_raise.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_read.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_readv.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_resume_np.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_rwlock.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_rwlockattr.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_select.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_self.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_sem.c#2 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_setprio.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_setschedparam.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_sigaction.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_sigaltstack.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_sigmask.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_sigpending.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_sigprocmask.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_sigsuspend.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_sigwait.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_single_np.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_sleep.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_spec.c#4 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_spinlock.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_suspend_np.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_switch_np.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_symbols.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_system.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_tcdrain.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_vfork.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_wait.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_wait4.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_waitpid.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_write.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_writev.c#3 integrate .. //depot/user/imp/mips2-start/lib/libkse/thread/thr_yield.c#3 integrate .. //depot/user/imp/mips2-start/lib/libpam/libpam/Makefile#2 integrate .. //depot/user/imp/mips2-start/lib/libpam/modules/pam_krb5/pam_krb5.c#2 integrate .. //depot/user/imp/mips2-start/lib/libpam/modules/pam_ssh/pam_ssh.c#2 integrate .. //depot/user/imp/mips2-start/lib/libpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/user/imp/mips2-start/lib/libpmc/libpmc.c#2 integrate .. //depot/user/imp/mips2-start/lib/libstand/bzipfs.c#2 integrate .. //depot/user/imp/mips2-start/lib/libstand/gzipfs.c#2 integrate .. //depot/user/imp/mips2-start/lib/libthr/pthread.map#4 integrate .. //depot/user/imp/mips2-start/lib/libthr/thread/thr_exit.c#2 integrate .. //depot/user/imp/mips2-start/lib/libthr/thread/thr_mutex.c#6 integrate .. //depot/user/imp/mips2-start/lib/libthr/thread/thr_private.h#5 integrate .. //depot/user/imp/mips2-start/lib/libthr/thread/thr_syscalls.c#2 integrate .. //depot/user/imp/mips2-start/lib/libufs/Makefile#2 integrate .. //depot/user/imp/mips2-start/lib/libufs/block.c#2 integrate .. //depot/user/imp/mips2-start/lib/libufs/bread.3#2 integrate .. //depot/user/imp/mips2-start/lib/libufs/libufs.h#2 integrate .. //depot/user/imp/mips2-start/lib/libutil/pty.c#3 integrate .. //depot/user/imp/mips2-start/lib/msun/Makefile#3 integrate .. //depot/user/imp/mips2-start/lib/msun/Symbol.map#3 integrate .. //depot/user/imp/mips2-start/lib/msun/amd64/Makefile.inc#2 integrate .. //depot/user/imp/mips2-start/lib/msun/amd64/s_logbl.S#1 branch .. //depot/user/imp/mips2-start/lib/msun/i387/Makefile.inc#2 integrate .. //depot/user/imp/mips2-start/lib/msun/i387/s_logbl.S#1 branch .. //depot/user/imp/mips2-start/lib/msun/ld128/s_nanl.c#1 branch .. //depot/user/imp/mips2-start/lib/msun/ld80/s_nanl.c#1 branch .. //depot/user/imp/mips2-start/lib/msun/man/atan2.3#2 integrate .. //depot/user/imp/mips2-start/lib/msun/man/csqrt.3#1 branch .. //depot/user/imp/mips2-start/lib/msun/man/hypot.3#2 integrate .. //depot/user/imp/mips2-start/lib/msun/man/ilogb.3#2 integrate .. //depot/user/imp/mips2-start/lib/msun/man/math.3#2 integrate .. //depot/user/imp/mips2-start/lib/msun/man/nan.3#1 branch .. //depot/user/imp/mips2-start/lib/msun/man/sqrt.3#2 integrate .. //depot/user/imp/mips2-start/lib/msun/src/math.h#2 integrate .. //depot/user/imp/mips2-start/lib/msun/src/math_private.h#2 integrate .. //depot/user/imp/mips2-start/lib/msun/src/s_carg.c#1 branch .. //depot/user/imp/mips2-start/lib/msun/src/s_cargf.c#1 branch .. //depot/user/imp/mips2-start/lib/msun/src/s_csqrt.c#1 branch .. //depot/user/imp/mips2-start/lib/msun/src/s_csqrtf.c#1 branch .. //depot/user/imp/mips2-start/lib/msun/src/s_logb.c#2 integrate .. //depot/user/imp/mips2-start/lib/msun/src/s_logbl.c#1 branch .. //depot/user/imp/mips2-start/lib/msun/src/s_nan.c#1 branch .. //depot/user/imp/mips2-start/lib/msun/src/w_cabs.c#2 integrate .. //depot/user/imp/mips2-start/release/Makefile#7 integrate .. //depot/user/imp/mips2-start/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 integrate .. //depot/user/imp/mips2-start/release/doc/share/misc/dev.archlist.txt#5 integrate .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/Makefile#2 integrate .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/errata/Makefile#2 integrate .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/hardware/Makefile#2 integrate .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/hardware/Makefile.inc#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/hardware/amd64/Makefile#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/hardware/amd64/article.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/hardware/article.sgml#1 branch .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/hardware/common/hw.ent#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/hardware/common/intro.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/hardware/i386/Makefile#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/hardware/i386/article.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/installation/Makefile#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/installation/Makefile.inc#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/installation/amd64/Makefile#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/installation/amd64/article.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/installation/common/abstract.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/installation/common/install.ent#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/installation/common/install.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/installation/common/layout.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/installation/i386/Makefile#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/installation/i386/article.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/installation/ia64/Makefile#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/installation/ia64/article.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/installation/pc98/Makefile#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/installation/pc98/article.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/installation/sparc64/Makefile#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/installation/sparc64/article.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/readme/article.sgml#2 integrate .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/relnotes/Makefile#2 integrate .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/relnotes/Makefile.inc#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/relnotes/amd64/Makefile#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/relnotes/article.sgml#1 branch .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/relnotes/common/relnotes.ent#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/relnotes/i386/Makefile#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/relnotes/i386/article.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/relnotes/ia64/Makefile#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/relnotes/ia64/article.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/relnotes/pc98/Makefile#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/relnotes/pc98/article.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#2 delete .. //depot/user/imp/mips2-start/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#2 delete .. //depot/user/imp/mips2-start/release/fixit.profile#2 integrate .. //depot/user/imp/mips2-start/sbin/Makefile#4 integrate .. //depot/user/imp/mips2-start/sbin/atacontrol/atacontrol.c#3 integrate .. //depot/user/imp/mips2-start/sbin/bsdlabel/bsdlabel.8#2 integrate .. //depot/user/imp/mips2-start/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/user/imp/mips2-start/sbin/ddb/Makefile#1 branch .. //depot/user/imp/mips2-start/sbin/ddb/ddb.8#1 branch .. //depot/user/imp/mips2-start/sbin/ddb/ddb.c#1 branch .. //depot/user/imp/mips2-start/sbin/ddb/ddb.h#1 branch .. //depot/user/imp/mips2-start/sbin/ddb/ddb_script.c#1 branch .. //depot/user/imp/mips2-start/sbin/devd/devd.hh#2 integrate .. //depot/user/imp/mips2-start/sbin/dhclient/dispatch.c#2 integrate .. //depot/user/imp/mips2-start/sbin/growfs/growfs.c#2 integrate .. //depot/user/imp/mips2-start/sbin/ifconfig/ifconfig.8#5 integrate .. //depot/user/imp/mips2-start/sbin/ifconfig/ifconfig.c#4 integrate .. //depot/user/imp/mips2-start/sbin/ipfw/ipfw2.c#4 integrate .. //depot/user/imp/mips2-start/sbin/natd/natd.8#2 integrate .. //depot/user/imp/mips2-start/sbin/newfs/mkfs.c#2 integrate .. //depot/user/imp/mips2-start/sbin/newfs/newfs.8#3 integrate .. //depot/user/imp/mips2-start/sbin/newfs/newfs.c#3 integrate .. //depot/user/imp/mips2-start/sbin/newfs/newfs.h#3 integrate .. //depot/user/imp/mips2-start/sbin/newfs_msdos/newfs_msdos.8#2 integrate .. //depot/user/imp/mips2-start/sbin/savecore/savecore.8#2 integrate .. //depot/user/imp/mips2-start/sbin/savecore/savecore.c#3 integrate .. //depot/user/imp/mips2-start/share/colldef/Makefile#2 integrate .. //depot/user/imp/mips2-start/share/colldef/README#2 integrate .. //depot/user/imp/mips2-start/share/colldef/map.ISO8859-9#1 branch .. //depot/user/imp/mips2-start/share/colldef/tr_TR.ISO8859-9.src#1 branch .. //depot/user/imp/mips2-start/share/examples/cvsup/refuse#2 integrate .. //depot/user/imp/mips2-start/share/examples/cvsup/refuse.README#2 integrate .. //depot/user/imp/mips2-start/share/man/man3/tgmath.3#2 integrate .. //depot/user/imp/mips2-start/share/man/man4/Makefile#8 integrate .. //depot/user/imp/mips2-start/share/man/man4/aac.4#4 integrate .. //depot/user/imp/mips2-start/share/man/man4/bge.4#3 integrate .. //depot/user/imp/mips2-start/share/man/man4/ddb.4#3 integrate .. //depot/user/imp/mips2-start/share/man/man4/hptrr.4#1 branch .. //depot/user/imp/mips2-start/share/man/man4/hwpmc.4#4 integrate .. //depot/user/imp/mips2-start/share/man/man4/ng_car.4#3 integrate .. //depot/user/imp/mips2-start/share/man/man4/nve.4#2 integrate .. //depot/user/imp/mips2-start/share/man/man4/syncache.4#2 integrate .. //depot/user/imp/mips2-start/share/man/man4/textdump.4#1 branch .. //depot/user/imp/mips2-start/share/man/man5/hosts.equiv.5#2 integrate .. //depot/user/imp/mips2-start/share/man/man5/src.conf.5#4 integrate .. //depot/user/imp/mips2-start/share/man/man7/build.7#2 integrate .. //depot/user/imp/mips2-start/share/man/man7/ports.7#5 integrate .. //depot/user/imp/mips2-start/share/man/man9/BUS_SETUP_INTR.9#2 integrate .. //depot/user/imp/mips2-start/share/man/man9/VOP_LOCK.9#2 integrate .. //depot/user/imp/mips2-start/share/man/man9/lock.9#3 integrate .. //depot/user/imp/mips2-start/share/man/man9/sf_buf.9#2 integrate .. //depot/user/imp/mips2-start/share/misc/Makefile#2 integrate .. //depot/user/imp/mips2-start/share/misc/bsd-family-tree#5 integrate .. //depot/user/imp/mips2-start/share/mk/bsd.own.mk#4 integrate .. //depot/user/imp/mips2-start/share/mk/bsd.subdir.mk#2 integrate .. //depot/user/imp/mips2-start/share/mklocale/Makefile#2 integrate .. //depot/user/imp/mips2-start/share/mklocale/tr_TR.ISO8859-9.src#1 branch .. //depot/user/imp/mips2-start/share/timedef/tr_TR.ISO8859-9.src#2 integrate .. //depot/user/imp/mips2-start/share/timedef/tr_TR.UTF-8.src#2 integrate .. //depot/user/imp/mips2-start/sys/amd64/amd64/exception.S#3 integrate .. //depot/user/imp/mips2-start/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/user/imp/mips2-start/sys/amd64/amd64/machdep.c#5 integrate .. //depot/user/imp/mips2-start/sys/amd64/amd64/mp_watchdog.c#3 integrate .. //depot/user/imp/mips2-start/sys/amd64/amd64/pmap.c#7 integrate .. //depot/user/imp/mips2-start/sys/amd64/amd64/trap.c#6 integrate .. //depot/user/imp/mips2-start/sys/amd64/conf/GENERIC#5 integrate .. //depot/user/imp/mips2-start/sys/amd64/conf/NOTES#6 integrate .. //depot/user/imp/mips2-start/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/user/imp/mips2-start/sys/amd64/include/specialreg.h#4 integrate .. //depot/user/imp/mips2-start/sys/amd64/include/vmparam.h#4 integrate .. //depot/user/imp/mips2-start/sys/arm/arm/pmap.c#7 integrate .. //depot/user/imp/mips2-start/sys/arm/at91/at91.c#2 integrate .. //depot/user/imp/mips2-start/sys/arm/at91/if_ate.c#4 integrate .. //depot/user/imp/mips2-start/sys/arm/at91/kb920x_machdep.c#5 integrate .. //depot/user/imp/mips2-start/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/user/imp/mips2-start/sys/arm/include/pmc_mdep.h#2 integrate .. //depot/user/imp/mips2-start/sys/arm/include/vmparam.h#4 integrate .. //depot/user/imp/mips2-start/sys/boot/arm/at91/boot2/bwct_board.c#2 integrate .. //depot/user/imp/mips2-start/sys/boot/arm/at91/libat91/spi_flash.c#2 integrate .. //depot/user/imp/mips2-start/sys/boot/forth/support.4th#2 integrate .. //depot/user/imp/mips2-start/sys/boot/powerpc/Makefile#2 integrate .. //depot/user/imp/mips2-start/sys/boot/powerpc/loader/Makefile#2 delete .. //depot/user/imp/mips2-start/sys/boot/powerpc/loader/conf.c#2 delete .. //depot/user/imp/mips2-start/sys/boot/powerpc/loader/help.ofw#2 delete .. //depot/user/imp/mips2-start/sys/boot/powerpc/loader/ldscript.powerpc#2 delete .. //depot/user/imp/mips2-start/sys/boot/powerpc/loader/metadata.c#2 delete .. //depot/user/imp/mips2-start/sys/boot/powerpc/loader/start.c#2 delete .. //depot/user/imp/mips2-start/sys/boot/powerpc/loader/version#2 delete .. //depot/user/imp/mips2-start/sys/boot/powerpc/ofw/Makefile#1 branch .. //depot/user/imp/mips2-start/sys/boot/powerpc/ofw/conf.c#1 branch .. //depot/user/imp/mips2-start/sys/boot/powerpc/ofw/help.ofw#1 branch .. //depot/user/imp/mips2-start/sys/boot/powerpc/ofw/ldscript.powerpc#1 branch .. //depot/user/imp/mips2-start/sys/boot/powerpc/ofw/metadata.c#1 branch .. //depot/user/imp/mips2-start/sys/boot/powerpc/ofw/start.c#1 branch .. //depot/user/imp/mips2-start/sys/boot/powerpc/ofw/version#1 branch .. //depot/user/imp/mips2-start/sys/cam/cam_xpt.c#4 integrate .. //depot/user/imp/mips2-start/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/user/imp/mips2-start/sys/cam/scsi/scsi_low.h#2 integrate .. //depot/user/imp/mips2-start/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/user/imp/mips2-start/sys/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/user/imp/mips2-start/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/user/imp/mips2-start/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/user/imp/mips2-start/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/user/imp/mips2-start/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/user/imp/mips2-start/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/user/imp/mips2-start/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/user/imp/mips2-start/sys/compat/ndis/subr_ntoskrnl.c#6 integrate .. //depot/user/imp/mips2-start/sys/conf/Makefile.amd64#3 integrate .. //depot/user/imp/mips2-start/sys/conf/NOTES#8 integrate .. //depot/user/imp/mips2-start/sys/conf/files#9 integrate .. //depot/user/imp/mips2-start/sys/conf/files.amd64#7 integrate .. //depot/user/imp/mips2-start/sys/conf/files.i386#7 integrate .. //depot/user/imp/mips2-start/sys/conf/files.powerpc#5 integrate .. //depot/user/imp/mips2-start/sys/conf/options#7 integrate .. //depot/user/imp/mips2-start/sys/conf/options.powerpc#2 integrate .. //depot/user/imp/mips2-start/sys/ddb/db_capture.c#1 branch .. //depot/user/imp/mips2-start/sys/ddb/db_command.c#2 integrate .. //depot/user/imp/mips2-start/sys/ddb/db_command.h#2 integrate .. //depot/user/imp/mips2-start/sys/ddb/db_input.c#2 integrate .. //depot/user/imp/mips2-start/sys/ddb/db_lex.c#2 integrate .. //depot/user/imp/mips2-start/sys/ddb/db_lex.h#2 integrate .. //depot/user/imp/mips2-start/sys/ddb/db_main.c#2 integrate .. //depot/user/imp/mips2-start/sys/ddb/db_output.c#2 integrate .. //depot/user/imp/mips2-start/sys/ddb/db_script.c#1 branch .. //depot/user/imp/mips2-start/sys/ddb/db_textdump.c#1 branch .. //depot/user/imp/mips2-start/sys/ddb/ddb.h#2 integrate .. //depot/user/imp/mips2-start/sys/dev/aac/aac.c#3 integrate .. //depot/user/imp/mips2-start/sys/dev/aac/aac_cam.c#4 integrate .. //depot/user/imp/mips2-start/sys/dev/aac/aac_pci.c#4 integrate .. //depot/user/imp/mips2-start/sys/dev/aac/aacreg.h#2 integrate .. //depot/user/imp/mips2-start/sys/dev/aac/aacvar.h#2 integrate .. //depot/user/imp/mips2-start/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/user/imp/mips2-start/sys/dev/acpica/acpi_thermal.c#3 integrate .. //depot/user/imp/mips2-start/sys/dev/amr/amr.c#3 integrate .. //depot/user/imp/mips2-start/sys/dev/amr/amr_cam.c#4 integrate .. //depot/user/imp/mips2-start/sys/dev/amr/amr_pci.c#3 integrate .. //depot/user/imp/mips2-start/sys/dev/amr/amrvar.h#2 integrate .. //depot/user/imp/mips2-start/sys/dev/arcmsr/arcmsr.c#4 integrate .. //depot/user/imp/mips2-start/sys/dev/arcmsr/arcmsr.h#2 integrate .. //depot/user/imp/mips2-start/sys/dev/ata/ata-all.h#4 integrate .. //depot/user/imp/mips2-start/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/user/imp/mips2-start/sys/dev/ata/ata-dma.c#3 integrate .. //depot/user/imp/mips2-start/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/user/imp/mips2-start/sys/dev/bge/if_bge.c#5 integrate .. //depot/user/imp/mips2-start/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/user/imp/mips2-start/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/user/imp/mips2-start/sys/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/user/imp/mips2-start/sys/dev/cxgb/cxgb_config.h#3 integrate .. //depot/user/imp/mips2-start/sys/dev/cxgb/cxgb_include.h#3 integrate .. //depot/user/imp/mips2-start/sys/dev/cxgb/cxgb_l2t.c#3 integrate .. //depot/user/imp/mips2-start/sys/dev/cxgb/cxgb_l2t.h#3 integrate .. //depot/user/imp/mips2-start/sys/dev/cxgb/cxgb_main.c#5 integrate .. //depot/user/imp/mips2-start/sys/dev/cxgb/cxgb_offload.c#3 integrate .. //depot/user/imp/mips2-start/sys/dev/cxgb/cxgb_offload.h#4 integrate .. //depot/user/imp/mips2-start/sys/dev/cxgb/cxgb_osdep.h#4 integrate .. //depot/user/imp/mips2-start/sys/dev/cxgb/cxgb_sge.c#5 integrate .. //depot/user/imp/mips2-start/sys/dev/cxgb/sys/cxgb_support.c#1 branch .. //depot/user/imp/mips2-start/sys/dev/cxgb/sys/mbufq.h#2 integrate .. //depot/user/imp/mips2-start/sys/dev/cxgb/sys/mvec.h#3 integrate .. //depot/user/imp/mips2-start/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/user/imp/mips2-start/sys/dev/cxgb/t3cdev.h#1 branch .. //depot/user/imp/mips2-start/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#1 branch .. //depot/user/imp/mips2-start/sys/dev/cxgb/ulp/toecore/toedev.c#1 branch .. //depot/user/imp/mips2-start/sys/dev/cxgb/ulp/toecore/toedev.h#2 delete .. //depot/user/imp/mips2-start/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#1 branch .. //depot/user/imp/mips2-start/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#1 branch .. //depot/user/imp/mips2-start/sys/dev/cxgb/ulp/tom/cxgb_defs.h#1 branch .. //depot/user/imp/mips2-start/sys/dev/cxgb/ulp/tom/cxgb_listen.c#1 branch .. //depot/user/imp/mips2-start/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#1 branch .. //depot/user/imp/mips2-start/sys/dev/cxgb/ulp/tom/cxgb_tcp.h#1 branch .. //depot/user/imp/mips2-start/sys/dev/cxgb/ulp/tom/cxgb_tcp_subr.c#1 branch .. //depot/user/imp/mips2-start/sys/dev/cxgb/ulp/tom/cxgb_tcp_usrreq.c#1 branch .. //depot/user/imp/mips2-start/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#1 branch .. //depot/user/imp/mips2-start/sys/dev/cxgb/ulp/tom/cxgb_tom.c#1 branch .. //depot/user/imp/mips2-start/sys/dev/cxgb/ulp/tom/cxgb_tom.h#1 branch .. //depot/user/imp/mips2-start/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#1 branch .. //depot/user/imp/mips2-start/sys/dev/dcons/dcons_os.c#4 integrate .. //depot/user/imp/mips2-start/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#1 branch .. //depot/user/imp/mips2-start/sys/dev/hptrr/array.h#1 branch .. //depot/user/imp/mips2-start/sys/dev/hptrr/him.h#1 branch .. //depot/user/imp/mips2-start/sys/dev/hptrr/himfuncs.h#1 branch .. //depot/user/imp/mips2-start/sys/dev/hptrr/hptintf.h#1 branch .. //depot/user/imp/mips2-start/sys/dev/hptrr/hptrr_config.c#1 branch .. //depot/user/imp/mips2-start/sys/dev/hptrr/hptrr_config.h#1 branch .. //depot/user/imp/mips2-start/sys/dev/hptrr/hptrr_os_bsd.c#1 branch .. //depot/user/imp/mips2-start/sys/dev/hptrr/hptrr_osm_bsd.c#1 branch .. //depot/user/imp/mips2-start/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#1 branch .. //depot/user/imp/mips2-start/sys/dev/hptrr/ldm.h#1 branch .. //depot/user/imp/mips2-start/sys/dev/hptrr/list.h#1 branch .. //depot/user/imp/mips2-start/sys/dev/hptrr/os_bsd.h#1 branch .. //depot/user/imp/mips2-start/sys/dev/hptrr/osm.h#1 branch .. //depot/user/imp/mips2-start/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/user/imp/mips2-start/sys/dev/hwpmc/hwpmc_arm.c#2 integrate .. //depot/user/imp/mips2-start/sys/dev/hwpmc/hwpmc_ia64.c#2 integrate .. //depot/user/imp/mips2-start/sys/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/user/imp/mips2-start/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/user/imp/mips2-start/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/user/imp/mips2-start/sys/dev/hwpmc/hwpmc_powerpc.c#2 integrate .. //depot/user/imp/mips2-start/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/user/imp/mips2-start/sys/dev/hwpmc/hwpmc_sparc64.c#2 integrate .. //depot/user/imp/mips2-start/sys/dev/hwpmc/hwpmc_x86.c#3 integrate .. //depot/user/imp/mips2-start/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/user/imp/mips2-start/sys/dev/ipw/if_ipw.c#5 integrate .. //depot/user/imp/mips2-start/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/user/imp/mips2-start/sys/dev/mfi/mfi.c#4 integrate .. //depot/user/imp/mips2-start/sys/dev/mfi/mfi_pci.c#4 integrate .. //depot/user/imp/mips2-start/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/user/imp/mips2-start/sys/dev/ofw/openpromio.c#2 integrate .. //depot/user/imp/mips2-start/sys/dev/pci/pci_user.c#3 integrate .. //depot/user/imp/mips2-start/sys/dev/powermac_nvram/powermac_nvram.c#2 integrate .. //depot/user/imp/mips2-start/sys/dev/re/if_re.c#8 integrate .. //depot/user/imp/mips2-start/sys/dev/sio/sio.c#4 integrate .. //depot/user/imp/mips2-start/sys/dev/snp/snp.c#4 integrate .. //depot/user/imp/mips2-start/sys/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/user/imp/mips2-start/sys/dev/sound/pci/ich.c#3 integrate .. //depot/user/imp/mips2-start/sys/dev/sound/pci/maestro.c#3 integrate .. //depot/user/imp/mips2-start/sys/dev/syscons/syscons.c#4 integrate .. //depot/user/imp/mips2-start/sys/dev/uart/uart_core.c#4 integrate .. //depot/user/imp/mips2-start/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/user/imp/mips2-start/sys/dev/usb/umass.c#3 integrate .. //depot/user/imp/mips2-start/sys/dev/usb/ums.c#4 integrate .. //depot/user/imp/mips2-start/sys/dev/usb/uplcom.c#3 integrate .. //depot/user/imp/mips2-start/sys/dev/usb/usbdevs#7 integrate .. //depot/user/imp/mips2-start/sys/dev/utopia/utopia.c#3 integrate .. //depot/user/imp/mips2-start/sys/fs/tmpfs/tmpfs_subr.c#5 integrate .. //depot/user/imp/mips2-start/sys/fs/tmpfs/tmpfs_vfsops.c#6 integrate .. //depot/user/imp/mips2-start/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/user/imp/mips2-start/sys/fs/unionfs/union_subr.c#4 integrate .. //depot/user/imp/mips2-start/sys/fs/unionfs/union_vnops.c#4 integrate .. //depot/user/imp/mips2-start/sys/geom/geom_bsd.c#2 integrate .. //depot/user/imp/mips2-start/sys/geom/geom_bsd_enc.c#2 integrate .. //depot/user/imp/mips2-start/sys/geom/geom_dev.c#3 integrate .. //depot/user/imp/mips2-start/sys/geom/geom_io.c#4 integrate .. //depot/user/imp/mips2-start/sys/geom/part/g_part.c#4 integrate .. //depot/user/imp/mips2-start/sys/geom/part/g_part.h#4 integrate .. //depot/user/imp/mips2-start/sys/geom/part/g_part_bsd.c#1 branch .. //depot/user/imp/mips2-start/sys/i386/bios/apm.c#4 integrate .. //depot/user/imp/mips2-start/sys/i386/conf/GENERIC#5 integrate .. //depot/user/imp/mips2-start/sys/i386/conf/GENERIC.hints#3 integrate .. //depot/user/imp/mips2-start/sys/i386/conf/NOTES#6 integrate .. //depot/user/imp/mips2-start/sys/i386/conf/PAE#4 integrate .. //depot/user/imp/mips2-start/sys/i386/i386/exception.s#2 integrate .. //depot/user/imp/mips2-start/sys/i386/i386/machdep.c#6 integrate .. //depot/user/imp/mips2-start/sys/i386/i386/mp_watchdog.c#3 integrate .. //depot/user/imp/mips2-start/sys/i386/i386/pmap.c#7 integrate .. //depot/user/imp/mips2-start/sys/i386/i386/trap.c#6 integrate .. //depot/user/imp/mips2-start/sys/i386/include/pmc_mdep.h#2 integrate .. //depot/user/imp/mips2-start/sys/i386/include/vmparam.h#4 integrate .. //depot/user/imp/mips2-start/sys/i386/pci/pci_pir.c#2 integrate .. //depot/user/imp/mips2-start/sys/ia64/conf/DEFAULTS#3 integrate .. //depot/user/imp/mips2-start/sys/ia64/ia64/machdep.c#6 integrate .. //depot/user/imp/mips2-start/sys/ia64/include/pmc_mdep.h#2 integrate .. //depot/user/imp/mips2-start/sys/ia64/include/vmparam.h#4 integrate .. //depot/user/imp/mips2-start/sys/kern/Makefile#3 integrate .. //depot/user/imp/mips2-start/sys/kern/init_main.c#7 integrate .. //depot/user/imp/mips2-start/sys/kern/kern_clock.c#6 integrate .. //depot/user/imp/mips2-start/sys/kern/kern_event.c#3 integrate .. //depot/user/imp/mips2-start/sys/kern/kern_lock.c#5 integrate .. //depot/user/imp/mips2-start/sys/kern/kern_mbuf.c#5 integrate .. //depot/user/imp/mips2-start/sys/kern/kern_module.c#2 integrate .. //depot/user/imp/mips2-start/sys/kern/kern_mutex.c#6 integrate .. //depot/user/imp/mips2-start/sys/kern/kern_pmc.c#2 integrate .. //depot/user/imp/mips2-start/sys/kern/kern_proc.c#6 integrate .. //depot/user/imp/mips2-start/sys/kern/kern_resource.c#3 integrate .. //depot/user/imp/mips2-start/sys/kern/kern_rwlock.c#5 integrate .. //depot/user/imp/mips2-start/sys/kern/kern_shutdown.c#5 integrate .. //depot/user/imp/mips2-start/sys/kern/kern_sig.c#5 integrate .. //depot/user/imp/mips2-start/sys/kern/kern_sx.c#5 integrate .. //depot/user/imp/mips2-start/sys/kern/kern_thread.c#7 integrate .. //depot/user/imp/mips2-start/sys/kern/kern_umtx.c#4 integrate .. //depot/user/imp/mips2-start/sys/kern/sched_4bsd.c#5 integrate .. //depot/user/imp/mips2-start/sys/kern/sched_ule.c#7 integrate .. //depot/user/imp/mips2-start/sys/kern/subr_bus.c#5 integrate .. //depot/user/imp/mips2-start/sys/kern/subr_kdb.c#3 integrate .. //depot/user/imp/mips2-start/sys/kern/subr_lock.c#4 integrate .. //depot/user/imp/mips2-start/sys/kern/subr_obio.c#1 branch .. //depot/user/imp/mips2-start/sys/kern/subr_trap.c#5 integrate .. //depot/user/imp/mips2-start/sys/kern/subr_witness.c#6 integrate .. //depot/user/imp/mips2-start/sys/kern/sys_generic.c#5 integrate .. //depot/user/imp/mips2-start/sys/kern/sys_pipe.c#5 integrate .. //depot/user/imp/mips2-start/sys/kern/tty_cons.c#3 integrate .. //depot/user/imp/mips2-start/sys/kern/uipc_sockbuf.c#4 integrate .. //depot/user/imp/mips2-start/sys/kern/vfs_bio.c#5 integrate .. //depot/user/imp/mips2-start/sys/kern/vfs_mount.c#7 integrate .. //depot/user/imp/mips2-start/sys/kern/vfs_subr.c#6 integrate .. //depot/user/imp/mips2-start/sys/mips/include/locore.h#3 integrate .. //depot/user/imp/mips2-start/sys/mips/include/md_var.h#3 integrate .. //depot/user/imp/mips2-start/sys/mips/mips/busdma_machdep.c#6 integrate .. //depot/user/imp/mips2-start/sys/mips/mips/cpu.c#4 integrate .. //depot/user/imp/mips2-start/sys/mips/mips/db_trace.c#3 integrate .. //depot/user/imp/mips2-start/sys/mips/mips/locore.S#4 integrate .. //depot/user/imp/mips2-start/sys/mips/mips/machdep.c#5 integrate .. //depot/user/imp/mips2-start/sys/mips/mips/trap.c#5 integrate .. //depot/user/imp/mips2-start/sys/mips/mips32/adm5120/adm5120_machdep.c#4 integrate .. //depot/user/imp/mips2-start/sys/mips/mips32/idt/idt_machdep.c#4 integrate .. //depot/user/imp/mips2-start/sys/mips/mips32/idt/if_kr.c#2 integrate .. //depot/user/imp/mips2-start/sys/mips/mips32/idt/if_krreg.h#2 integrate .. //depot/user/imp/mips2-start/sys/mips/mips32/idt/uart_bus_rc32434.c#1 branch .. //depot/user/imp/mips2-start/sys/mips/mips32/malta/malta_machdep.c#4 integrate .. //depot/user/imp/mips2-start/sys/mips/mips32/sentry5/s5_machdep.c#5 integrate .. //depot/user/imp/mips2-start/sys/modules/Makefile#6 integrate .. //depot/user/imp/mips2-start/sys/modules/cxgb/Makefile#4 integrate .. //depot/user/imp/mips2-start/sys/modules/cxgb/cxgb/Makefile#1 branch .. //depot/user/imp/mips2-start/sys/modules/cxgb/toecore/Makefile#1 branch .. //depot/user/imp/mips2-start/sys/modules/cxgb/tom/Makefile#1 branch .. //depot/user/imp/mips2-start/sys/modules/hptrr/Makefile#1 branch .. //depot/user/imp/mips2-start/sys/net/bpf.c#5 integrate .. //depot/user/imp/mips2-start/sys/net/bpf.h#3 integrate .. //depot/user/imp/mips2-start/sys/net/bpf_filter.c#3 integrate .. //depot/user/imp/mips2-start/sys/net/bridgestp.c#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 17 00:33:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29ECC16A41A; Thu, 17 Jan 2008 00:33:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E174916A4D4 for ; Thu, 17 Jan 2008 00:33:02 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B9D8D13C45A for ; Thu, 17 Jan 2008 00:33:02 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0H0X2jE065478 for ; Thu, 17 Jan 2008 00:33:02 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0H0X2PT065475 for perforce@freebsd.org; Thu, 17 Jan 2008 00:33:02 GMT (envelope-from imp@freebsd.org) Date: Thu, 17 Jan 2008 00:33:02 GMT Message-Id: <200801170033.m0H0X2PT065475@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133443 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 00:33:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=133443 Change 133443 by imp@imp_mbp on 2008/01/17 00:32:15 Note to double check machdep.c Affected files ... .. //depot/projects/mips2-jnpr/src/sys/TODO#6 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/TODO#6 (text+ko) ==== @@ -29,3 +29,5 @@ o I moved where we initialize the msgbuf. We need to make sure that no printfs happen. This is where the mips2 initializes things, but I've not audited things to make sure that's really sane. +o Double check last merge from mips2 -> cavium code. Something seems wrong + in one of the edits. From owner-p4-projects@FreeBSD.ORG Thu Jan 17 00:57:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49C8116A46B; Thu, 17 Jan 2008 00:57:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F7F916A418 for ; Thu, 17 Jan 2008 00:57:30 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 004D613C474 for ; Thu, 17 Jan 2008 00:57:29 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0H0vTsr077319 for ; Thu, 17 Jan 2008 00:57:29 GMT (envelope-from andre@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0H0vTJx077316 for perforce@freebsd.org; Thu, 17 Jan 2008 00:57:29 GMT (envelope-from andre@freebsd.org) Date: Thu, 17 Jan 2008 00:57:29 GMT Message-Id: <200801170057.m0H0vTJx077316@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andre@freebsd.org using -f From: Andre Oppermann To: Perforce Change Reviews Cc: Subject: PERFORCE change 133444 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 00:57:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=133444 Change 133444 by andre@andre_flirtbox on 2008/01/17 00:56:27 Fix KASSERTs to match inverse test logic. Remove bogus KASSERT. TAILQ_FOREACH_SAFE doesn't initialize the temp variable on the first loop, do it manually. The code depends on it being tracked correctly. Maybe this should be fixed in the macro itself. Tighten segment to block match tests. Affected files ... .. //depot/projects/tcp_reass/netinet/tcp_reass.c#8 edit Differences ... ==== //depot/projects/tcp_reass/netinet/tcp_reass.c#8 (text+ko) ==== @@ -163,11 +163,22 @@ KASSERT(*tlenp > 0, ("%s: segment doesn't contain any data", __func__)); - KASSERT(SEQ_GT(tp->rcv_nxt, th->th_seq), + KASSERT(SEQ_LEQ(tp->rcv_nxt, th->th_seq), ("%s: sequence number below rcv_nxt", __func__)); KASSERT(!(tp->rcv_nxt == th->th_seq) || !(TAILQ_EMPTY(&tp->t_trq)), ("%s: got missing segment but queue is empty", __func__)); +#ifdef INVARIANTS + TAILQ_FOREACH(tqe, &tp->t_trq, trq_q) { + tqen = TAILQ_NEXT(tqe, trq_q); + KASSERT(SEQ_GEQ(tqe->trq_seq, tp->rcv_nxt), + ("%s: trq_seq < rcv_nxt", __func__)); + KASSERT(tqen == NULL || + SEQ_LT(tqe->trq_seq + tqe->trq_len, tqen->trq_seq), + ("%s: overlapping blocks", __func__)); + } +#endif + /* * Limit the number of segments in the reassembly queue to prevent * holding on to too many segments (and thus running out of mbufs). @@ -236,7 +247,7 @@ /* Check if this is the missing segment. */ if (tp->rcv_nxt == th->th_seq) { tqe = TAILQ_FIRST(&tp->t_trq); - KASSERT(SEQ_LEQ(tqe->trq_seq, th->th_seq), + KASSERT(SEQ_GT(tqe->trq_seq, th->th_seq), ("%s: first block starts below missing segment", __func__)); /* Check if segment prepends first block. */ if (SEQ_LEQ(tqe->trq_seq, th->th_seq + *tlenp)) { @@ -269,19 +280,15 @@ tcpstat.tcps_rcvoobyte += *tlenp; /* See where it fits. */ - TAILQ_FOREACH_SAFE(tqe, &tp->t_trq, trq_q, tqen) { -#if 1 + TAILQ_FOREACH(tqe, &tp->t_trq, trq_q) { + tqen = TAILQ_NEXT(tqe, trq_q); /* Segment is after this blocks coverage. */ if (SEQ_LT(tqe->trq_seq + tqe->trq_len, th->th_seq)) continue; -#endif /* Segment is after the previous one but before this one. */ if (SEQ_GT(tqe->trq_seq, th->th_seq + *tlenp)) break; /* Insert as new block. */ - KASSERT(SEQ_GT(tqe->trq_seq, th->th_seq + *tlenp), - ("%s: iterated past insert point", __func__)); - /* Segment is already fully covered. */ if (SEQ_LEQ(tqe->trq_seq, th->th_seq) && SEQ_GEQ(tqe->trq_seq + tqe->trq_len, th->th_seq + *tlenp)) { @@ -293,7 +300,7 @@ } /* Segment covers and extends on both ends. */ - if (SEQ_GEQ(tqe->trq_seq, th->th_seq) && + if (SEQ_GT(tqe->trq_seq, th->th_seq) && SEQ_LT(tqe->trq_seq + tqe->trq_len, th->th_seq + *tlenp)) { /* Replace block content. */ tp->t_trqmcnt -= tqe->trq_mcnt; @@ -313,6 +320,7 @@ /* Segment prepends to this block. */ if (SEQ_GT(tqe->trq_seq, th->th_seq) && + SEQ_LEQ(tqe->trq_seq, th->th_seq + *tlenp) && SEQ_GEQ(tqe->trq_seq + tqe->trq_len, th->th_seq + *tlenp)) { /* Trim tail of segment. */ if ((i = SEQ_DELTA(tqe->trq_seq, th->th_seq + *tlenp))) { @@ -337,8 +345,9 @@ } /* Segment appends to this block. */ - if (SEQ_LEQ(tqe->trq_seq + tqe->trq_len, th->th_seq) && - SEQ_LT(tqe->trq_seq + tqe->trq_len, th->th_seq + *tlenp)) { + if (SEQ_LT(tqe->trq_seq + tqe->trq_len, th->th_seq + *tlenp) && + SEQ_LEQ(tqe->trq_seq, th->th_seq) && + SEQ_GEQ(tqe->trq_seq + tqe->trq_len, th->th_seq)) { /* Trim head of segment. */ if ((i = SEQ_DELTA(tqe->trq_seq + tqe->trq_len, th->th_seq))) { m_adj(m, i); @@ -379,7 +388,7 @@ /* Where to insert. */ if (tqe != NULL && SEQ_LT(tqe->trq_seq + tqe->trq_len, th->th_seq)) - TAILQ_INSERT_TAIL(&tp->t_trq, tqen, trq_q); + TAILQ_INSERT_AFTER(&tp->t_trq, tqe, tqen, trq_q); else if (tqe != NULL) TAILQ_INSERT_BEFORE(tqe, tqen, trq_q); else { @@ -396,10 +405,16 @@ * Present data to user, advancing rcv_nxt through * completed sequence space. */ + KASSERT(!TAILQ_EMPTY(&tp->t_trq), + ("%s: queue empty at present", __func__)); SOCKBUF_LOCK(&so->so_rcv); + tqen = TAILQ_NEXT(TAILQ_FIRST(&tp->t_trq), trq_q); TAILQ_FOREACH_SAFE(tqe, &tp->t_trq, trq_q, tqen) { KASSERT(SEQ_GEQ(tqe->trq_seq, tp->rcv_nxt), ("%s: trq_seq < rcv_nxt", __func__)); + KASSERT(tqen == NULL || + SEQ_LEQ(tqe->trq_seq + tqe->trq_len, tqen->trq_seq), + ("%s: block overlaps into next one", __func__)); if (tqe->trq_seq != tp->rcv_nxt) break; #if 1 From owner-p4-projects@FreeBSD.ORG Thu Jan 17 01:02:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B27B616A469; Thu, 17 Jan 2008 01:02:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 77A7216A419 for ; Thu, 17 Jan 2008 01:02:35 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 69A6C13C45A for ; Thu, 17 Jan 2008 01:02:35 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0H12ZFT078400 for ; Thu, 17 Jan 2008 01:02:35 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0H12ZQm078395 for perforce@freebsd.org; Thu, 17 Jan 2008 01:02:35 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 17 Jan 2008 01:02:35 GMT Message-Id: <200801170102.m0H12ZQm078395@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133445 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 01:02:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=133445 Change 133445 by kmacy@pandemonium:kmacy:xen31 on 2008/01/17 01:01:56 don't mark interrupt handler as mpsafe until blkfront is properly locked Affected files ... .. //depot/projects/xen31/sys/dev/xen/blkfront/blkfront.c#10 edit Differences ... ==== //depot/projects/xen31/sys/dev/xen/blkfront/blkfront.c#10 (text+ko) ==== @@ -379,7 +379,7 @@ err = bind_listening_port_to_irqhandler(dev->otherend_id, "xbd", (driver_intr_t *)blkif_int, - info, INTR_TYPE_BIO | INTR_MPSAFE, NULL); + info, INTR_TYPE_BIO, NULL); if (err <= 0) { xenbus_dev_fatal(dev, err, "bind_evtchn_to_irqhandler failed"); From owner-p4-projects@FreeBSD.ORG Thu Jan 17 01:17:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C203F16A420; Thu, 17 Jan 2008 01:17:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 87CA116A417 for ; Thu, 17 Jan 2008 01:17:51 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6223613C447 for ; Thu, 17 Jan 2008 01:17:51 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0H1HpKJ081497 for ; Thu, 17 Jan 2008 01:17:51 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0H1HpwH081494 for perforce@freebsd.org; Thu, 17 Jan 2008 01:17:51 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 17 Jan 2008 01:17:51 GMT Message-Id: <200801170117.m0H1HpwH081494@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133446 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 01:17:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=133446 Change 133446 by kmacy@pandemonium:kmacy:xen31 on 2008/01/17 01:17:37 increase number of yields to workaround periodic timeouts Affected files ... .. //depot/projects/xen31/sys/xen/xenbus/xenbus_xs.c#10 edit Differences ... ==== //depot/projects/xen31/sys/xen/xenbus/xenbus_xs.c#10 (text+ko) ==== @@ -150,7 +150,7 @@ /* * Give other domain time to run :-/ */ - for (i = 0; i < 5000; i++) + for (i = 0; i < 10000; i++) HYPERVISOR_yield(); xs_process_msg(); } From owner-p4-projects@FreeBSD.ORG Thu Jan 17 01:18:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5003D16A41B; Thu, 17 Jan 2008 01:18:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E35B016A41A for ; Thu, 17 Jan 2008 01:18:52 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D5A8313C45B for ; Thu, 17 Jan 2008 01:18:52 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0H1IqwB081526 for ; Thu, 17 Jan 2008 01:18:52 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0H1IqM8081523 for perforce@freebsd.org; Thu, 17 Jan 2008 01:18:52 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 17 Jan 2008 01:18:52 GMT Message-Id: <200801170118.m0H1IqM8081523@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133447 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 01:18:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=133447 Change 133447 by kmacy@pandemonium:kmacy:xen31 on 2008/01/17 01:18:47 change valid check, we appear to frequently have legitimate entries without the valid bit set Affected files ... .. //depot/projects/xen31/sys/i386/include/xen/xenpmap.h#7 edit Differences ... ==== //depot/projects/xen31/sys/i386/include/xen/xenpmap.h#7 (text+ko) ==== @@ -75,7 +75,7 @@ #define INVALID_P2M_ENTRY (~0UL) -#define pmap_valid_entry(E) ((E) & PG_V) /* is PDE or PTE valid? */ +#define pmap_valid_entry(E) ((E) > PAGE_SIZE) /* is PDE or PTE valid? */ #define SH_PD_SET_VA 1 #define SH_PD_SET_VA_MA 2 From owner-p4-projects@FreeBSD.ORG Thu Jan 17 01:19:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FE9C16A468; Thu, 17 Jan 2008 01:19:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 65A3116A417 for ; Thu, 17 Jan 2008 01:19:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 57CD613C45A for ; Thu, 17 Jan 2008 01:19:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0H1Jr7u081592 for ; Thu, 17 Jan 2008 01:19:53 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0H1Jrpt081589 for perforce@freebsd.org; Thu, 17 Jan 2008 01:19:53 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 17 Jan 2008 01:19:53 GMT Message-Id: <200801170119.m0H1Jrpt081589@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133448 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 01:19:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=133448 Change 133448 by kmacy@pandemonium:kmacy:xen31 on 2008/01/17 01:19:23 add copious asserts to check for invariants in pmap utility functions Affected files ... .. //depot/projects/xen31/sys/i386/xen/pmap.c#15 edit Differences ... ==== //depot/projects/xen31/sys/i386/xen/pmap.c#15 (text+ko) ==== @@ -2805,7 +2805,7 @@ * But that isn't as quick as vtopte. */ pte = vtopte(va); - if (*pte) { + if (*pte & PG_V) { if (mpte != NULL) { mpte->wire_count--; mpte = NULL; @@ -3123,6 +3123,9 @@ #else *sysmaps->CMAP2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M; #endif + KASSERT(*sysmaps->CMAP2 == (PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(m)) | PG_A | PG_M), + ("CMAP2 did not get set is %llx", *sysmaps->CMAP2)); + invlcaddr(sysmaps->CADDR2); pagezero(sysmaps->CADDR2); PT_CLEAR_VA(sysmaps->CMAP2, TRUE); @@ -3193,17 +3196,25 @@ sysmaps = &sysmaps_pcpu[PCPU_GET(cpuid)]; mtx_lock(&sysmaps->lock); if (*sysmaps->CMAP1) - panic("pmap_copy_page: CMAP1 busy"); + panic("pmap_copy_page: CMAP1 busy, CMAP1=%llx", *sysmaps->CMAP1); if (*sysmaps->CMAP2) panic("pmap_copy_page: CMAP2 busy"); sched_pin(); invlpg((u_int)sysmaps->CADDR1); invlpg((u_int)sysmaps->CADDR2); - PT_SET_VA(sysmaps->CMAP1, PG_V | VM_PAGE_TO_PHYS(src) | PG_A, FALSE); + PT_SET_VA(sysmaps->CMAP1, PG_V | VM_PAGE_TO_PHYS(src) | PG_A, TRUE); PT_SET_VA(sysmaps->CMAP2, PG_V | PG_RW | VM_PAGE_TO_PHYS(dst) | PG_A | PG_M, TRUE); + KASSERT(*sysmaps->CMAP1 == (PG_V | xpmap_ptom(VM_PAGE_TO_PHYS(src)) | PG_A ), + ("CMAP1 did not get set is %llx", *sysmaps->CMAP1)); + KASSERT(*sysmaps->CMAP2 == (PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(dst)) | PG_A | PG_M), + ("CMAP2 did not get set is %llx", *sysmaps->CMAP2)); bcopy(sysmaps->CADDR1, sysmaps->CADDR2, PAGE_SIZE); PT_CLEAR_VA(sysmaps->CMAP1, FALSE); PT_CLEAR_VA(sysmaps->CMAP2, TRUE); + if (*sysmaps->CMAP1) + panic("pmap_copy_page: CMAP1 busy, CMAP1=%llx", *sysmaps->CMAP1); + if (*sysmaps->CMAP2) + panic("pmap_copy_page: CMAP2 busy"); sched_unpin(); mtx_unlock(&sysmaps->lock); } @@ -3317,9 +3328,8 @@ printf( "TPTE at %p IS ZERO @ VA %08x\n", pte, pv->pv_va); - panic("bad pte"); + panic("bad pte tpte"); } - /* * We cannot remove wired pages from a process' mapping at this time */ From owner-p4-projects@FreeBSD.ORG Thu Jan 17 01:45:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D0D116A419; Thu, 17 Jan 2008 01:45:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 12D7716A417 for ; Thu, 17 Jan 2008 01:45:23 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0548F13C447 for ; Thu, 17 Jan 2008 01:45:23 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0H1jM59085745 for ; Thu, 17 Jan 2008 01:45:22 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0H1jM3w085742 for perforce@freebsd.org; Thu, 17 Jan 2008 01:45:22 GMT (envelope-from scottl@freebsd.org) Date: Thu, 17 Jan 2008 01:45:22 GMT Message-Id: <200801170145.m0H1jM3w085742@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 133449 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 01:45:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=133449 Change 133449 by scottl@scottl-ix on 2008/01/17 01:44:35 Fix locking in the blkfront driver. There's still probably a locking hole in the resume code, but that'll be looked at later. Also to be looked at later is the single global lock. Affected files ... .. //depot/projects/xen31/sys/dev/xen/blkfront/blkfront.c#11 edit Differences ... ==== //depot/projects/xen31/sys/dev/xen/blkfront/blkfront.c#11 (text+ko) ==== @@ -170,7 +170,7 @@ xb_diskinfo[sc->xb_unit].device, sc->xb_unit, sc->xb_disk->d_mediasize); #endif - sc->xb_disk->d_flags = DISKFLAG_NEEDSGIANT; + sc->xb_disk->d_flags = 0; disk_create(sc->xb_disk, DISK_VERSION_00); bioq_init(&sc->xb_bioq); @@ -195,7 +195,6 @@ xb_strategy(struct bio *bp) { struct xb_softc *sc = (struct xb_softc *)bp->bio_disk->d_drv1; - int flags; /* bogus disk? */ if (sc == NULL) { @@ -206,14 +205,14 @@ DPRINTK(""); - flags = splbio(); /* * Place it in the queue of disk activities for this disk */ + mtx_lock(&blkif_io_lock); bioq_disksort(&sc->xb_bioq, bp); - splx(flags); xb_startio(sc); + mtx_unlock(&blkif_io_lock); return; bad: @@ -378,8 +377,8 @@ info->ring_ref = err; err = bind_listening_port_to_irqhandler(dev->otherend_id, - "xbd", (driver_intr_t *)blkif_int, - info, INTR_TYPE_BIO, NULL); + "xbd", (driver_intr_t *)blkif_int, info, + INTR_TYPE_BIO | INTR_MPSAFE, NULL); if (err <= 0) { xenbus_dev_fatal(dev, err, "bind_evtchn_to_irqhandler failed"); @@ -767,24 +766,20 @@ xb_startio(struct xb_softc *sc) { struct bio *bp; - int flags, queued = 0; + int queued = 0; struct blkfront_info *info = sc->xb_info; DPRINTK(""); - flags = splbio(); + mtx_assert(&blkif_io_lock, MA_OWNED); while ((bp = bioq_takefirst(&sc->xb_bioq)) != NULL) { if (RING_FULL(&info->ring)) goto wait; - splx(flags); - if (blkif_queue_request(bp)) { - flags = splbio(); wait: bioq_insert_head(&sc->xb_bioq, bp); - splx(flags); break; } queued++; @@ -968,10 +963,10 @@ mtx_unlock(&blkif_io_lock); /* Send off requeued requests */ + mtx_lock(&blkif_io_lock); flush_requests(info); /* Kick any other new requests queued since we resumed */ - mtx_lock(&blkif_io_lock); kick_pending_request_queues(info); mtx_unlock(&blkif_io_lock); } From owner-p4-projects@FreeBSD.ORG Thu Jan 17 04:15:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A71716A469; Thu, 17 Jan 2008 04:15:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4362816A418 for ; Thu, 17 Jan 2008 04:15:10 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 365D113C442 for ; Thu, 17 Jan 2008 04:15:10 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0H4FA2S010899 for ; Thu, 17 Jan 2008 04:15:10 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0H4FAKk010896 for perforce@freebsd.org; Thu, 17 Jan 2008 04:15:10 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 17 Jan 2008 04:15:10 GMT Message-Id: <200801170415.m0H4FAKk010896@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133450 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 04:15:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=133450 Change 133450 by kmacy@pandemonium:kmacy:xen31 on 2008/01/17 04:14:24 This change works around an apparent flakiness in page table updating hypercalls by switching to "writable" page tables. This appears to introduce a new bug (albeit a much more deterministic one) in which the wire count on a page table isn't appropriately set. This causes the page table to be prematurely freed losing any information about the pages still being mapped leaving the pv list on the md page corrupt. Affected files ... .. //depot/projects/xen31/sys/i386/i386/vm_machdep.c#6 edit .. //depot/projects/xen31/sys/i386/include/pmap.h#10 edit .. //depot/projects/xen31/sys/i386/xen/pmap.c#16 edit .. //depot/projects/xen31/sys/i386/xen/xen_machdep.c#15 edit Differences ... ==== //depot/projects/xen31/sys/i386/i386/vm_machdep.c#6 (text+ko) ==== @@ -779,7 +779,7 @@ ptep = vtopte(sf->kva); opte = *ptep; #ifdef XEN - PT_SET_MA(sf->kva, xpmap_ptom(VM_PAGE_TO_PHYS(m)) | pgeflag | PG_RW | PG_V); + *ptep = xpmap_ptom(VM_PAGE_TO_PHYS(m)) | pgeflag | PG_RW | PG_V; #else *ptep = VM_PAGE_TO_PHYS(m) | pgeflag | PG_RW | PG_V; #endif ==== //depot/projects/xen31/sys/i386/include/pmap.h#10 (text+ko) ==== @@ -232,32 +232,58 @@ void pmap_map_readonly(struct pmap *pmap, vm_offset_t va, int len); void pmap_map_readwrite(struct pmap *pmap, vm_offset_t va, int len); + +static __inline pt_entry_t +pte_load_store(pt_entry_t *ptep, pt_entry_t v) +{ + pt_entry_t r; + + v = xpmap_ptom(v); + r = *ptep; + __asm __volatile( + "1:\n" + "\tlock; cmpxchg8b %1\n" + "\tjnz 1b" + : "+A" (r) + : "m" (*ptep), "b" ((uint32_t)v), "c" ((uint32_t)(v >> 32))); + return (r); +} + static __inline pt_entry_t -pte_load_clear(pt_entry_t *ptep) +pte_load_store_ma(pt_entry_t *ptep, pt_entry_t v) { pt_entry_t r; - r = PT_GET(ptep); - PT_CLEAR_VA(ptep, TRUE); + r = *ptep; + __asm __volatile( + "1:\n" + "\tlock; cmpxchg8b %1\n" + "\tjnz 1b" + : "+A" (r) + : "m" (*ptep), "b" ((uint32_t)v), "c" ((uint32_t)(v >> 32))); return (r); } + + +#else + + static __inline pt_entry_t pte_load_store(pt_entry_t *ptep, pt_entry_t v) { pt_entry_t r; - r = PT_GET(ptep); - PT_SET_VA(ptep, v, TRUE); + + r = *ptep; + __asm __volatile( + "1:\n" + "\tlock; cmpxchg8b %1\n" + "\tjnz 1b" + : "+A" (r) + : "m" (*ptep), "b" ((uint32_t)v), "c" ((uint32_t)(v >> 32))); return (r); } -#define pte_store(ptep, pte) pte_load_store((ptep), (pt_entry_t)pte) -#define pte_clear(ptep) pte_load_store((ptep), (pt_entry_t)0ULL) - -#ifdef PAE -extern pt_entry_t pg_nx; -#endif -#else /* * Routine: pmap_kextract * Function: @@ -278,6 +304,8 @@ return pa; } +#endif + #ifdef PAE static __inline pt_entry_t @@ -292,21 +320,6 @@ return (r); } -static __inline pt_entry_t -pte_load_store(pt_entry_t *ptep, pt_entry_t v) -{ - pt_entry_t r; - - r = *ptep; - __asm __volatile( - "1:\n" - "\tlock; cmpxchg8b %1\n" - "\tjnz 1b" - : "+A" (r) - : "m" (*ptep), "b" ((uint32_t)v), "c" ((uint32_t)(v >> 32))); - return (r); -} - /* XXXRU move to atomic.h? */ static __inline int atomic_cmpset_64(volatile uint64_t *dst, uint64_t exp, uint64_t src) @@ -332,6 +345,8 @@ #define pte_store(ptep, pte) pte_load_store((ptep), (pt_entry_t)pte) +#define pte_store_ma(ptep, pte) pte_load_store_ma((ptep), (pt_entry_t)pte) + extern pt_entry_t pg_nx; #else /* PAE */ @@ -373,8 +388,6 @@ #define pte_clear(ptep) pte_store((ptep), (pt_entry_t)0ULL) #define pde_store(pdep, pde) pte_store((pdep), (pde)) -#endif /* !XEN */ - #endif /* _KERNEL */ /* ==== //depot/projects/xen31/sys/i386/xen/pmap.c#16 (text+ko) ==== @@ -193,12 +193,8 @@ #define pmap_pte_u(pte) ((*(int *)pte & PG_A) != 0) #define pmap_pte_v(pte) ((*(int *)pte & PG_V) != 0) -#define pmap_pte_set_w(pte, v) { \ - if (v) \ - PT_SET_VA_MA(pte, *pte | PG_W, TRUE); \ - else \ - PT_SET_VA_MA(pte, *pte & ~PG_W, TRUE); \ -} +#define pmap_pte_set_w(pte, v) ((v) ? atomic_set_int((u_int *)(pte), PG_W) : \ + atomic_clear_int((u_int *)(pte), PG_W)) #define pmap_pte_set_prot(pte, v) ((*(int *)pte &= ~PG_PROT), (*(int *)pte |= (v))) struct pmap kernel_pmap_store; @@ -257,7 +253,6 @@ #endif static pt_entry_t *PMAP1 = 0, *PMAP2; static pt_entry_t *PADDR1 = 0, *PADDR2; -static int PMAP1_inuse = 0, PMAP2_inuse = 0; #ifdef SMP static int PMAP1cpu; static int PMAP1changedcpu; @@ -419,8 +414,9 @@ } SYSMAP(caddr_t, CMAP1, CADDR1, 1) SYSMAP(caddr_t, CMAP3, CADDR3, 1) - PT_CLEAR_VA(CMAP3, TRUE); - + *CMAP3 = 0; + + /* * Crashdump maps. */ @@ -445,7 +441,7 @@ mtx_init(&PMAP2mutex, "PMAP2", NULL, MTX_DEF); virtual_avail = va; - PT_CLEAR_VA(CMAP1, TRUE); + *CMAP1 = 0; /* * Leave in place an identity mapping (virt == phys) for the low 1 MB @@ -938,7 +934,7 @@ mtx_lock(&PMAP2mutex); newpf = *pde & PG_FRAME; if ((*PMAP2 & PG_FRAME) != newpf) { - PT_SET_VA_MA(PMAP2, newpf | PG_V | PG_A | PG_M, TRUE); + *PMAP2 = newpf | PG_V | PG_A | PG_M; pmap_invalidate_page(kernel_pmap, (vm_offset_t)PADDR2); } return (PADDR2 + (i386_btop(va) & (NPTEPG - 1))); @@ -992,8 +988,8 @@ mtx_assert(&vm_page_queue_mtx, MA_OWNED); KASSERT(curthread->td_pinned > 0, ("curthread not pinned")); newpf = *pde & PG_FRAME; - if ((PT_GET(PMAP1) & PG_FRAME) != newpf) { - PT_SET_VA_MA(PMAP1, newpf | PG_V | PG_A, TRUE); + if ((*PMAP1 & PG_FRAME) != newpf) { + *PMAP1 = newpf | PG_V | PG_A; #ifdef SMP PMAP1cpu = PCPU_GET(cpuid); #endif @@ -1038,10 +1034,9 @@ pte = pmap_pte(pmap, va); rtval = (PT_GET(pte) & PG_FRAME) | (va & PAGE_MASK); pmap_pte_release(pte); - if (PMAP2_inuse) { - PT_CLEAR_VA(PMAP2, TRUE); - PMAP2_inuse = 0; - } + + if (*PMAP2) + *PMAP2 = 0; } PMAP_UNLOCK(pmap); return (rtval); @@ -1072,10 +1067,8 @@ rtval = (*pte & PG_FRAME) | (va & PAGE_MASK); pmap_pte_release(pte); #ifdef XEN - if (PMAP2_inuse) { - PT_CLEAR_VA(PMAP2, TRUE); - PMAP2_inuse = 0; - } + if (*PMAP2) + *PMAP2 = 0; #endif } PMAP_UNLOCK(pmap); @@ -1110,10 +1103,8 @@ } else { sched_pin(); pte = PT_GET(pmap_pte_quick(pmap, va)); - if (PMAP1_inuse) { - PT_CLEAR_VA(PMAP1, TRUE); - PMAP1_inuse = 0; - } + if (*PMAP1) + *PMAP1 = 0; if (pte != 0 && ((pte & PG_RW) || (prot & VM_PROT_WRITE) == 0)) { m = PHYS_TO_VM_PAGE(pte & PG_FRAME); @@ -1150,7 +1141,7 @@ pt_entry_t *pte; pte = vtopte(va); - PT_SET_VA_MA(pte, ma | PG_RW | PG_V | pgeflag, TRUE); + pte_store_ma(pte, ma | PG_RW | PG_V | pgeflag); } @@ -1459,7 +1450,7 @@ for (i = KPTDI; i < KPTDI + nkpt; i++) pmap->pm_pdir_shadow[i] = PTD[i] & ~(PG_RW|PG_M|PG_A); for (i = 0; i < NPGPTD; i++) { - vm_paddr_t *pd; + pt_entry_t *pd; pd = pmap->pm_pdir + (i * NPDEPG); PT_SET_MA(pd, *vtopte((vm_offset_t)pd) & ~(PG_M|PG_A|PG_U|PG_RW)); @@ -2102,11 +2093,12 @@ pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m) { pv_entry_t pv; - PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); + pv = get_pv_entry(pmap, FALSE); pv->pv_va = va; + TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); } @@ -2151,7 +2143,7 @@ pmap_invalidate_page(kernel_pmap, va); pmap->pm_stats.resident_count -= 1; if (oldpte & PG_MANAGED) { - m = PHYS_TO_VM_PAGE(oldpte & PG_FRAME); + m = PHYS_TO_VM_PAGE(xpmap_mtop(oldpte) & PG_FRAME); if (oldpte & PG_M) { KASSERT((oldpte & PG_RW), ("pmap_remove_pte: modified page not writable: va: %#x, pte: %#jx", @@ -2180,10 +2172,9 @@ return; pmap_remove_pte(pmap, pte, va, free); pmap_invalidate_page(pmap, va); - if (PMAP1_inuse) { - PT_CLEAR_VA(PMAP1, TRUE); - PMAP1_inuse = 0; - } + if (*PMAP1) + *PMAP1 = 0; + } /* @@ -2277,10 +2268,8 @@ break; } } - if (PMAP1_inuse) { - PT_CLEAR_VA(PMAP1, TRUE); - PMAP1_inuse = 0; - } + if (*PMAP1) + *PMAP1 = 0; out: sched_unpin(); if (anyvalid) @@ -2351,10 +2340,8 @@ PMAP_UNLOCK(pmap); } vm_page_flag_clear(m, PG_WRITEABLE); - if (PMAP1_inuse) { - PT_CLEAR_VA(PMAP1, TRUE); - PMAP1_inuse = 0; - } + if (*PMAP1) + *PMAP1 = 0; sched_unpin(); } @@ -2426,27 +2413,25 @@ sva += PAGE_SIZE) { vm_page_t m; -#ifndef XEN retry: -#endif /* * Regardless of whether a pte is 32 or 64 bits in * size, PG_RW, PG_A, and PG_M are among the least * significant 32 bits. */ - obits = pbits = PT_GET(pte); + obits = pbits = *pte; if ((pbits & PG_V) == 0) continue; if (pbits & PG_MANAGED) { m = NULL; if (pbits & PG_A) { - m = PHYS_TO_VM_PAGE(pbits & PG_FRAME); + m = PHYS_TO_VM_PAGE(xpmap_mtop(pbits) & PG_FRAME); vm_page_flag_set(m, PG_REFERENCED); pbits &= ~PG_A; } if ((pbits & PG_M) != 0) { if (m == NULL) - m = PHYS_TO_VM_PAGE(pbits & PG_FRAME); + m = PHYS_TO_VM_PAGE(xpmap_mtop(pbits) & PG_FRAME); vm_page_dirty(m); } } @@ -2459,7 +2444,6 @@ #endif if (pbits != obits) { -#ifndef XEN #ifdef PAE if (!atomic_cmpset_64(pte, obits, pbits)) goto retry; @@ -2468,9 +2452,6 @@ pbits)) goto retry; #endif -#else - PT_SET_VA(pte, pbits, FALSE); -#endif if (obits & PG_G) pmap_invalidate_page(pmap, sva); else @@ -2478,10 +2459,8 @@ } } } - if (PMAP1_inuse) { - PT_CLEAR_VA(PMAP1, TRUE); - PMAP1_inuse = 0; - } + if (*PMAP1) + *PMAP1 = 0; sched_unpin(); if (anychanged) pmap_invalidate_all(pmap); @@ -2685,10 +2664,8 @@ } else pte_store(pte, newpte | PG_A); } - if (PMAP1_inuse) { - PT_CLEAR_VA(PMAP1, TRUE); - PMAP1_inuse = 0; - } + if (*PMAP1) + *PMAP1 = 0; sched_unpin(); vm_page_unlock_queues(); PMAP_UNLOCK(pmap); @@ -2964,10 +2941,8 @@ */ pmap_pte_set_w(pte, wired); pmap_pte_release(pte); - if (PMAP2_inuse) { - PT_CLEAR_VA(PMAP2, TRUE); - PMAP2_inuse = 0; - } + if (*PMAP2) + *PMAP2 = 0; PMAP_UNLOCK(pmap); } @@ -3040,7 +3015,7 @@ src_pte = vtopte(addr); while (addr < pdnxt) { pt_entry_t ptetemp; - ptetemp = PT_GET(src_pte); + ptetemp = *src_pte; /* * we only virtual copy managed pages */ @@ -3052,13 +3027,13 @@ dst_pte = pmap_pte_quick(dst_pmap, addr); if (*dst_pte == 0 && pmap_try_insert_pv_entry(dst_pmap, addr, - PHYS_TO_VM_PAGE(ptetemp & PG_FRAME))) { + PHYS_TO_VM_PAGE(xpmap_mtop(ptetemp) & PG_FRAME))) { /* * Clear the wired, modified, and * accessed (referenced) bits * during the copy. */ - PT_SET_VA(dst_pte, ptetemp & ~(PG_W | PG_M | PG_A), FALSE); + *dst_pte = ptetemp & ~(PG_W | PG_M | PG_A); dst_pmap->pm_stats.resident_count++; } else { @@ -3077,10 +3052,8 @@ src_pte++; } } - if (PMAP1_inuse) { - PT_CLEAR_VA(PMAP1, FALSE); - PMAP1_inuse = 0; - } + if (*PMAP1) + *PMAP1 = 0; sched_unpin(); vm_page_unlock_queues(); PT_UPDATES_FLUSH(); @@ -3118,17 +3091,13 @@ if (*sysmaps->CMAP2) panic("pmap_zero_page: CMAP2 busy"); sched_pin(); -#ifdef XEN - PT_SET_VA(sysmaps->CMAP2, PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M, TRUE); -#else - *sysmaps->CMAP2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M; -#endif + *sysmaps->CMAP2 = PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(m)) | PG_A | PG_M; KASSERT(*sysmaps->CMAP2 == (PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(m)) | PG_A | PG_M), ("CMAP2 did not get set is %llx", *sysmaps->CMAP2)); invlcaddr(sysmaps->CADDR2); pagezero(sysmaps->CADDR2); - PT_CLEAR_VA(sysmaps->CMAP2, TRUE); + *sysmaps->CMAP2 = 0; sched_unpin(); mtx_unlock(&sysmaps->lock); } @@ -3149,7 +3118,7 @@ if (*sysmaps->CMAP2) panic("pmap_zero_page: CMAP2 busy"); sched_pin(); - PT_SET_VA(sysmaps->CMAP2, PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M, TRUE); + *sysmaps->CMAP2 = PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(m)) | PG_A | PG_M; invlcaddr(sysmaps->CADDR2); if (off == 0 && size == PAGE_SIZE) @@ -3157,7 +3126,7 @@ else bzero((char *)sysmaps->CADDR2 + off, size); - PT_CLEAR_VA(sysmaps->CMAP2, TRUE); + *sysmaps->CMAP2 = 0; sched_unpin(); mtx_unlock(&sysmaps->lock); } @@ -3175,10 +3144,9 @@ if (*CMAP3) panic("pmap_zero_page: CMAP3 busy"); sched_pin(); - PT_SET_VA(CMAP3, PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M, TRUE); + *CMAP3 = PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(m)) | PG_A | PG_M; invlcaddr(CADDR3); pagezero(CADDR3); - PT_CLEAR_VA(CMAP3, TRUE); sched_unpin(); } @@ -3202,15 +3170,16 @@ sched_pin(); invlpg((u_int)sysmaps->CADDR1); invlpg((u_int)sysmaps->CADDR2); - PT_SET_VA(sysmaps->CMAP1, PG_V | VM_PAGE_TO_PHYS(src) | PG_A, TRUE); - PT_SET_VA(sysmaps->CMAP2, PG_V | PG_RW | VM_PAGE_TO_PHYS(dst) | PG_A | PG_M, TRUE); + *sysmaps->CMAP1 = PG_V | xpmap_ptom(VM_PAGE_TO_PHYS(src)) | PG_A; + *sysmaps->CMAP2 = PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(dst)) | PG_A | PG_M; + KASSERT(*sysmaps->CMAP1 == (PG_V | xpmap_ptom(VM_PAGE_TO_PHYS(src)) | PG_A ), ("CMAP1 did not get set is %llx", *sysmaps->CMAP1)); KASSERT(*sysmaps->CMAP2 == (PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(dst)) | PG_A | PG_M), ("CMAP2 did not get set is %llx", *sysmaps->CMAP2)); bcopy(sysmaps->CADDR1, sysmaps->CADDR2, PAGE_SIZE); - PT_CLEAR_VA(sysmaps->CMAP1, FALSE); - PT_CLEAR_VA(sysmaps->CMAP2, TRUE); + *sysmaps->CMAP1 = 0; + *sysmaps->CMAP2 = 0; if (*sysmaps->CMAP1) panic("pmap_copy_page: CMAP1 busy, CMAP1=%llx", *sysmaps->CMAP1); if (*sysmaps->CMAP2) @@ -3318,7 +3287,12 @@ if (pmap->pm_pdir_shadow[pv->pv_va >> PDRSHIFT] == 0) { printf("PDIR IS ZERO @ VA %08x\n", pv->pv_va); - panic("bad pte"); + /* workaround insufficient wired count + * on page directory - this only buys + * us a little bit of time as the list + * on one of the pages is now corrupt + */ + goto skip; } pte = vtopte(pv->pv_va); @@ -3348,7 +3322,6 @@ ("pmap_remove_pages: bad tpte %#jx", (uintmax_t)tpte)); - pmap->pm_stats.resident_count--; pte_clear(pte); @@ -3358,16 +3331,19 @@ if (tpte & PG_M) vm_page_dirty(m); + TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); + if (TAILQ_EMPTY(&m->md.pv_list)) + vm_page_flag_clear(m, PG_WRITEABLE); + + pmap_unuse_pt(pmap, pv->pv_va, &free); + skip: + /* Mark free */ PV_STAT(pv_entry_frees++); PV_STAT(pv_entry_spare++); pv_entry_count--; pc->pc_map[field] |= bitmask; - TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - if (TAILQ_EMPTY(&m->md.pv_list)) - vm_page_flag_clear(m, PG_WRITEABLE); - - pmap_unuse_pt(pmap, pv->pv_va, &free); + pmap->pm_stats.resident_count--; } } if (allfree) { @@ -3382,10 +3358,8 @@ pmap_ptelist_free(&pv_vafree, (vm_offset_t)pc); } } - if (PMAP1_inuse) { - PT_CLEAR_VA(PMAP1, TRUE); - PMAP1_inuse = 0; - } + if (*PMAP1) + *PMAP1 = 0; sched_unpin(); pmap_invalidate_all(pmap); vm_page_unlock_queues(); @@ -3422,10 +3396,8 @@ if (rv) break; } - if (PMAP1_inuse) { - PT_CLEAR_VA(PMAP1, TRUE); - PMAP1_inuse = 0; - } + if (*PMAP1) + *PMAP1 = 0; sched_unpin(); return (rv); } @@ -3472,10 +3444,8 @@ pmap_pte_release(pte); } PT_UPDATES_FLUSH(); - if (PMAP2_inuse) { - PT_CLEAR_VA(PMAP2, TRUE); - PMAP2_inuse = 0; - } + if (*PMAP2) + *PMAP2 = 0; } void @@ -3490,10 +3460,8 @@ pmap_pte_release(pte); } PT_UPDATES_FLUSH(); - if (PMAP2_inuse) { - PT_CLEAR_VA(PMAP2, TRUE); - PMAP2_inuse = 0; - } + if (*PMAP2) + *PMAP2 = 0; } /* @@ -3515,23 +3483,17 @@ pmap = PV_PMAP(pv); PMAP_LOCK(pmap); pte = pmap_pte_quick(pmap, pv->pv_va); -#ifndef XEN retry: -#endif - oldpte = PT_GET(pte); + oldpte = *pte; if ((oldpte & PG_RW) != 0) { /* * Regardless of whether a pte is 32 or 64 bits * in size, PG_RW and PG_M are among the least * significant 32 bits. */ -#ifndef XEN if (!atomic_cmpset_int((u_int *)pte, oldpte, oldpte & ~(PG_RW | PG_M))) goto retry; -#else - PT_SET_VA(pte, oldpte & ~(PG_RW|PG_M), TRUE); -#endif if ((oldpte & PG_M) != 0) vm_page_dirty(m); pmap_invalidate_page(pmap, pv->pv_va); @@ -3539,10 +3501,8 @@ PMAP_UNLOCK(pmap); } vm_page_flag_clear(m, PG_WRITEABLE); - if (PMAP1_inuse) { - PT_CLEAR_VA(PMAP1, TRUE); - PMAP1_inuse = 0; - } + if (*PMAP1) + *PMAP1 = 0; sched_unpin(); } @@ -3581,13 +3541,8 @@ pmap = PV_PMAP(pv); PMAP_LOCK(pmap); pte = pmap_pte_quick(pmap, pv->pv_va); - if (pte && ((v = PT_GET(pte)) & PG_A) != 0) { -#ifndef XEN + if (pte && ((v = *pte) & PG_A) != 0) { atomic_clear_int((u_int *)pte, PG_A); -#else - PT_SET_VA(pte, v & ~PG_A, TRUE); -#endif - pmap_invalidate_page(pmap, pv->pv_va); rtval++; if (rtval > 4) @@ -3596,10 +3551,8 @@ PMAP_UNLOCK(pmap); } while ((pv = pvn) != NULL && pv != pvf); } - if (PMAP1_inuse) { - PT_CLEAR_VA(PMAP1, TRUE); - PMAP1_inuse = 0; - } + if (*PMAP1) + *PMAP1 = 0; sched_unpin(); return (rtval); } @@ -3631,11 +3584,7 @@ * in size, PG_M is among the least significant * 32 bits. */ -#ifndef XEN atomic_clear_int((u_int *)pte, PG_M); -#else - PT_SET_MA(pv->pv_va, val & ~PG_M); -#endif pmap_invalidate_page(pmap, pv->pv_va); } PMAP_UNLOCK(pmap); @@ -3671,11 +3620,7 @@ * in size, PG_A is among the least significant * 32 bits. */ -#ifndef XEN atomic_clear_int((u_int *)pte, PG_A); -#else - PT_SET_MA(pv->pv_va, val & ~PG_A); -#endif pmap_invalidate_page(pmap, pv->pv_va); } PMAP_UNLOCK(pmap); @@ -3797,19 +3742,12 @@ * The cache mode bits are all in the low 32-bits of the * PTE, so we can just spin on updating the low 32-bits. */ -#ifndef XEN do { opte = *(u_int *)pte; npte = opte & ~(PG_PTE_PAT | PG_NC_PCD | PG_NC_PWT); npte |= pmap_cache_bits(mode, 0); } while (npte != opte && !atomic_cmpset_int((u_int *)pte, opte, npte)); -#else - opte = *pte; - npte = opte & ~(PG_PTE_PAT | PG_NC_PCD | PG_NC_PWT); - npte |= pmap_cache_bits(mode, 0); - PT_SET_MA(tmpva, npte); -#endif tmpva += PAGE_SIZE; size -= PAGE_SIZE; } @@ -3841,10 +3779,8 @@ pte = (ptep != NULL) ? PT_GET(ptep) : 0; pmap_pte_release(ptep); PMAP_UNLOCK(pmap); - if (PMAP2_inuse) { - PT_CLEAR_VA(PMAP2, TRUE); - PMAP2_inuse = 0; - } + if (*PMAP2) + *PMAP2 = 0; if (pte != 0) { vm_paddr_t pa; ==== //depot/projects/xen31/sys/i386/xen/xen_machdep.c#15 (text+ko) ==== @@ -259,7 +259,7 @@ xen_invlpg(vm_offset_t va) { struct mmuext_op op; - op.cmd = MMUEXT_INVLPG_LOCAL; + op.cmd = MMUEXT_INVLPG_ALL; op.arg1.linear_addr = va & ~PAGE_MASK; xen_flush_queue(); PANIC_IF(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0); @@ -708,10 +708,9 @@ #endif unsigned long i; -#ifdef WRITABLE_PAGETABLES - printk("using writable pagetables\n"); + HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_writable_pagetables); -#endif + xen_start_info = startinfo; xen_phys_machine = (xen_pfn_t *)startinfo->mfn_list; From owner-p4-projects@FreeBSD.ORG Thu Jan 17 04:24:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFE6C16A468; Thu, 17 Jan 2008 04:24:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 940A016A420 for ; Thu, 17 Jan 2008 04:24:20 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8807C13C447 for ; Thu, 17 Jan 2008 04:24:20 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0H4OKDp012452 for ; Thu, 17 Jan 2008 04:24:20 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0H4OKhb012449 for perforce@freebsd.org; Thu, 17 Jan 2008 04:24:20 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 17 Jan 2008 04:24:20 GMT Message-Id: <200801170424.m0H4OKhb012449@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133451 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 04:24:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=133451 Change 133451 by kmacy@pandemonium:kmacy:xen31 on 2008/01/17 04:23:48 clear PMAP2 while holding the PMAP2mutex Affected files ... .. //depot/projects/xen31/sys/i386/xen/pmap.c#17 edit Differences ... ==== //depot/projects/xen31/sys/i386/xen/pmap.c#17 (text+ko) ==== @@ -950,8 +950,10 @@ pmap_pte_release(pt_entry_t *pte) { - if ((pt_entry_t *)((vm_offset_t)pte & ~PAGE_MASK) == PADDR2) + if ((pt_entry_t *)((vm_offset_t)pte & ~PAGE_MASK) == PADDR2) { + *PMAP2 = 0; mtx_unlock(&PMAP2mutex); + } } static __inline void @@ -1034,9 +1036,6 @@ pte = pmap_pte(pmap, va); rtval = (PT_GET(pte) & PG_FRAME) | (va & PAGE_MASK); pmap_pte_release(pte); - - if (*PMAP2) - *PMAP2 = 0; } PMAP_UNLOCK(pmap); return (rtval); @@ -1066,10 +1065,6 @@ pte = pmap_pte(pmap, va); rtval = (*pte & PG_FRAME) | (va & PAGE_MASK); pmap_pte_release(pte); -#ifdef XEN - if (*PMAP2) - *PMAP2 = 0; -#endif } PMAP_UNLOCK(pmap); return (rtval); @@ -2941,8 +2936,6 @@ */ pmap_pte_set_w(pte, wired); pmap_pte_release(pte); - if (*PMAP2) - *PMAP2 = 0; PMAP_UNLOCK(pmap); } @@ -3444,8 +3437,6 @@ pmap_pte_release(pte); } PT_UPDATES_FLUSH(); - if (*PMAP2) - *PMAP2 = 0; } void @@ -3460,8 +3451,6 @@ pmap_pte_release(pte); } PT_UPDATES_FLUSH(); - if (*PMAP2) - *PMAP2 = 0; } /* @@ -3779,8 +3768,6 @@ pte = (ptep != NULL) ? PT_GET(ptep) : 0; pmap_pte_release(ptep); PMAP_UNLOCK(pmap); - if (*PMAP2) - *PMAP2 = 0; if (pte != 0) { vm_paddr_t pa; From owner-p4-projects@FreeBSD.ORG Thu Jan 17 04:59:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D494516A418; Thu, 17 Jan 2008 04:59:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9A6A016A41B for ; Thu, 17 Jan 2008 04:59:57 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8E1E013C442 for ; Thu, 17 Jan 2008 04:59:57 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0H4xvIa038455 for ; Thu, 17 Jan 2008 04:59:57 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0H4xvqG038452 for perforce@freebsd.org; Thu, 17 Jan 2008 04:59:57 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 17 Jan 2008 04:59:57 GMT Message-Id: <200801170459.m0H4xvqG038452@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133452 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 04:59:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=133452 Change 133452 by kmacy@pandemonium:kmacy:xen31 on 2008/01/17 04:59:46 bzero the the entire page allocated to the pv_chunk as opposed to just PG_ZERO bytes Affected files ... .. //depot/projects/xen31/sys/i386/xen/pmap.c#18 edit Differences ... ==== //depot/projects/xen31/sys/i386/xen/pmap.c#18 (text+ko) ==== @@ -300,6 +300,22 @@ CTASSERT(1 << PDESHIFT == sizeof(pd_entry_t)); CTASSERT(1 << PTESHIFT == sizeof(pt_entry_t)); +static __inline void +pagezero(void *page) +{ +#if defined(I686_CPU) + if (cpu_class == CPUCLASS_686) { +#if defined(CPU_ENABLE_SSE) + if (cpu_feature & CPUID_SSE2) + sse2_pagezero(page); + else +#endif + i686_pagezero(page); + } else +#endif + bzero(page, PAGE_SIZE); +} + void pd_set(struct pmap *pmap, int ptepindex, vm_paddr_t val, int type) { @@ -2051,7 +2067,7 @@ pc = (struct pv_chunk *)pmap_ptelist_alloc(&pv_vafree); pmap_qenter((vm_offset_t)pc, &m, 1); if ((m->flags & PG_ZERO) == 0) - bzero(pc, PG_ZERO); + pagezero(pc); pc->pc_pmap = pmap; pc->pc_map[0] = pc_freemask[0] & ~1ul; /* preallocated bit 0 */ for (field = 1; field < _NPCM; field++) @@ -3054,22 +3070,6 @@ PMAP_UNLOCK(dst_pmap); } -static __inline void -pagezero(void *page) -{ -#if defined(I686_CPU) - if (cpu_class == CPUCLASS_686) { -#if defined(CPU_ENABLE_SSE) - if (cpu_feature & CPUID_SSE2) - sse2_pagezero(page); - else -#endif - i686_pagezero(page); - } else -#endif - bzero(page, PAGE_SIZE); -} - /* * pmap_zero_page zeros the specified hardware page by mapping * the page into KVM and using bzero to clear its contents. From owner-p4-projects@FreeBSD.ORG Thu Jan 17 05:59:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D182116A41B; Thu, 17 Jan 2008 05:58:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9796016A417 for ; Thu, 17 Jan 2008 05:58:59 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8A02F13C442 for ; Thu, 17 Jan 2008 05:58:59 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0H5wxkq048214 for ; Thu, 17 Jan 2008 05:58:59 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0H5wxNJ048211 for perforce@freebsd.org; Thu, 17 Jan 2008 05:58:59 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 17 Jan 2008 05:58:59 GMT Message-Id: <200801170558.m0H5wxNJ048211@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 05:59:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=133455 Change 133455 by kmacy@pandemonium:kmacy:xen31 on 2008/01/17 05:58:52 ignore page table entries without the valid bit set, treat them as if they were zero Affected files ... .. //depot/projects/xen31/sys/i386/include/xen/xenpmap.h#8 edit Differences ... ==== //depot/projects/xen31/sys/i386/include/xen/xenpmap.h#8 (text+ko) ==== @@ -75,7 +75,7 @@ #define INVALID_P2M_ENTRY (~0UL) -#define pmap_valid_entry(E) ((E) > PAGE_SIZE) /* is PDE or PTE valid? */ +#define pmap_valid_entry(E) ((E) & PG_V) /* is PDE or PTE valid? */ #define SH_PD_SET_VA 1 #define SH_PD_SET_VA_MA 2 @@ -102,7 +102,7 @@ } #endif #define PT_GET(_ptp) \ - (pmap_valid_entry(*(_ptp)) ? xpmap_mtop(*(_ptp)) : *(_ptp)) + (pmap_valid_entry(*(_ptp)) ? xpmap_mtop(*(_ptp)) : (0)) #ifdef WRITABLE_PAGETABLES From owner-p4-projects@FreeBSD.ORG Thu Jan 17 06:00:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D48A16A49C; Thu, 17 Jan 2008 06:00:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2CD9B16A41B for ; Thu, 17 Jan 2008 06:00:01 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1B77713C469 for ; Thu, 17 Jan 2008 06:00:01 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0H600H8048271 for ; Thu, 17 Jan 2008 06:00:00 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0H6004M048268 for perforce@freebsd.org; Thu, 17 Jan 2008 06:00:00 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 17 Jan 2008 06:00:00 GMT Message-Id: <200801170600.m0H6004M048268@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133457 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 06:00:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=133457 Change 133457 by kmacy@pandemonium:kmacy:xen31 on 2008/01/17 05:59:54 white space cleanups to bring the diff between xen's pmap.c and native pmap.c to as little as possible Affected files ... .. //depot/projects/xen31/sys/i386/xen/pmap.c#19 edit Differences ... ==== //depot/projects/xen31/sys/i386/xen/pmap.c#19 (text+ko) ==== @@ -248,9 +248,6 @@ */ static caddr_t crashdumpmap; -#ifdef SMP -extern pt_entry_t *SMPpt; -#endif static pt_entry_t *PMAP1 = 0, *PMAP2; static pt_entry_t *PADDR1 = 0, *PADDR2; #ifdef SMP @@ -300,6 +297,16 @@ CTASSERT(1 << PDESHIFT == sizeof(pd_entry_t)); CTASSERT(1 << PTESHIFT == sizeof(pt_entry_t)); +/* + * If you get an error here, then you set KVA_PAGES wrong! See the + * description of KVA_PAGES in sys/i386/include/pmap.h. It must be + * multiple of 4 for a normal kernel, or a multiple of 8 for a PAE. + */ +CTASSERT(KERNBASE % (1 << 24) == 0); + + + + static __inline void pagezero(void *page) { @@ -431,8 +438,7 @@ SYSMAP(caddr_t, CMAP1, CADDR1, 1) SYSMAP(caddr_t, CMAP3, CADDR3, 1) *CMAP3 = 0; - - + /* * Crashdump maps. */ @@ -457,8 +463,9 @@ mtx_init(&PMAP2mutex, "PMAP2", NULL, MTX_DEF); virtual_avail = va; + *CMAP1 = 0; - + /* * Leave in place an identity mapping (virt == phys) for the low 1 MB * physical memory region that is used by the ACPI wakeup code. This @@ -558,7 +565,7 @@ va = (vm_offset_t)btext; while (va < endva) { pte = vtopte(va); - if (*pte) + if (*pte & PG_V) *pte |= pgeflag; invltlb(); /* Play it safe, invltlb() every time */ va += PAGE_SIZE; @@ -1116,7 +1123,7 @@ pte = PT_GET(pmap_pte_quick(pmap, va)); if (*PMAP1) *PMAP1 = 0; - if (pte != 0 && + if ((pte & PG_V) && ((pte & PG_RW) || (prot & VM_PROT_WRITE) == 0)) { m = PHYS_TO_VM_PAGE(pte & PG_FRAME); vm_page_hold(m); @@ -1571,7 +1578,7 @@ * If the page table page is mapped, we just increment the * hold count, and activate it. */ - if (ptema) { + if (ptema & PG_V) { m = PHYS_TO_VM_PAGE(xpmap_mtop(ptema) & PG_FRAME); m->wire_count++; } else { @@ -2104,12 +2111,11 @@ pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m) { pv_entry_t pv; + PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); - pv = get_pv_entry(pmap, FALSE); pv->pv_va = va; - TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); } @@ -2534,10 +2540,12 @@ } } #endif + pde = pmap_pde(pmap, va); if ((*pde & PG_PS) != 0) panic("pmap_enter: attempted pmap_enter on 4MB page"); pte = pmap_pte_quick(pmap, va); + /* * Page Directory table entry not valid, we need a new PT page */ @@ -2770,7 +2778,7 @@ * If the page table page is mapped, we just increment * the hold count, and activate it. */ - if (ptema) { + if (ptema & PG_V) { if (ptema & PG_PS) panic("pmap_enter_quick: unexpected mapping into 4MB page"); mpte = PHYS_TO_VM_PAGE(xpmap_mtop(ptema) & PG_FRAME); @@ -3036,14 +3044,14 @@ dst_pte = pmap_pte_quick(dst_pmap, addr); if (*dst_pte == 0 && pmap_try_insert_pv_entry(dst_pmap, addr, - PHYS_TO_VM_PAGE(xpmap_mtop(ptetemp) & PG_FRAME))) { + PHYS_TO_VM_PAGE(xpmap_mtop(ptetemp) & PG_FRAME))) { /* * Clear the wired, modified, and * accessed (referenced) bits * during the copy. */ - *dst_pte = ptetemp & ~(PG_W | PG_M | PG_A); - + *dst_pte = ptetemp & ~(PG_W | PG_M | + PG_A); dst_pmap->pm_stats.resident_count++; } else { free = NULL; @@ -3065,7 +3073,6 @@ *PMAP1 = 0; sched_unpin(); vm_page_unlock_queues(); - PT_UPDATES_FLUSH(); PMAP_UNLOCK(src_pmap); PMAP_UNLOCK(dst_pmap); } @@ -3085,9 +3092,6 @@ panic("pmap_zero_page: CMAP2 busy"); sched_pin(); *sysmaps->CMAP2 = PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(m)) | PG_A | PG_M; - KASSERT(*sysmaps->CMAP2 == (PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(m)) | PG_A | PG_M), - ("CMAP2 did not get set is %llx", *sysmaps->CMAP2)); - invlcaddr(sysmaps->CADDR2); pagezero(sysmaps->CADDR2); *sysmaps->CMAP2 = 0; @@ -3118,7 +3122,6 @@ pagezero(sysmaps->CADDR2); else bzero((char *)sysmaps->CADDR2 + off, size); - *sysmaps->CMAP2 = 0; sched_unpin(); mtx_unlock(&sysmaps->lock); @@ -3137,9 +3140,10 @@ if (*CMAP3) panic("pmap_zero_page: CMAP3 busy"); sched_pin(); - *CMAP3 = PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(m)) | PG_A | PG_M; + *CMAP3 = PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(m)) | PG_A | PG_M; invlcaddr(CADDR3); pagezero(CADDR3); + *CMAP3 = 0; sched_unpin(); } @@ -3157,26 +3161,17 @@ sysmaps = &sysmaps_pcpu[PCPU_GET(cpuid)]; mtx_lock(&sysmaps->lock); if (*sysmaps->CMAP1) - panic("pmap_copy_page: CMAP1 busy, CMAP1=%llx", *sysmaps->CMAP1); + panic("pmap_copy_page: CMAP1 busy"); if (*sysmaps->CMAP2) panic("pmap_copy_page: CMAP2 busy"); sched_pin(); invlpg((u_int)sysmaps->CADDR1); invlpg((u_int)sysmaps->CADDR2); - *sysmaps->CMAP1 = PG_V | xpmap_ptom(VM_PAGE_TO_PHYS(src)) | PG_A; + *sysmaps->CMAP1 = PG_V | xpmap_ptom(VM_PAGE_TO_PHYS(src)) | PG_A; *sysmaps->CMAP2 = PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(dst)) | PG_A | PG_M; - - KASSERT(*sysmaps->CMAP1 == (PG_V | xpmap_ptom(VM_PAGE_TO_PHYS(src)) | PG_A ), - ("CMAP1 did not get set is %llx", *sysmaps->CMAP1)); - KASSERT(*sysmaps->CMAP2 == (PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(dst)) | PG_A | PG_M), - ("CMAP2 did not get set is %llx", *sysmaps->CMAP2)); bcopy(sysmaps->CADDR1, sysmaps->CADDR2, PAGE_SIZE); *sysmaps->CMAP1 = 0; *sysmaps->CMAP2 = 0; - if (*sysmaps->CMAP1) - panic("pmap_copy_page: CMAP1 busy, CMAP1=%llx", *sysmaps->CMAP1); - if (*sysmaps->CMAP2) - panic("pmap_copy_page: CMAP2 busy"); sched_unpin(); mtx_unlock(&sysmaps->lock); } @@ -3295,8 +3290,9 @@ printf( "TPTE at %p IS ZERO @ VA %08x\n", pte, pv->pv_va); - panic("bad pte tpte"); + panic("bad pte"); } + /* * We cannot remove wired pages from a process' mapping at this time */ @@ -3513,8 +3509,6 @@ pv_entry_t pv, pvf, pvn; pmap_t pmap; pt_entry_t *pte; - vm_paddr_t v; - int rtval = 0; if (m->flags & PG_FICTITIOUS) @@ -3530,7 +3524,7 @@ pmap = PV_PMAP(pv); PMAP_LOCK(pmap); pte = pmap_pte_quick(pmap, pv->pv_va); - if (pte && ((v = *pte) & PG_A) != 0) { + if ((*pte & PG_A) != 0) { atomic_clear_int((u_int *)pte, PG_A); pmap_invalidate_page(pmap, pv->pv_va); rtval++; @@ -3555,8 +3549,7 @@ pv_entry_t pv; pmap_t pmap; pt_entry_t *pte; - vm_paddr_t val; - + mtx_assert(&vm_page_queue_mtx, MA_OWNED); if ((m->flags & PG_FICTITIOUS) != 0) return; @@ -3565,9 +3558,7 @@ pmap = PV_PMAP(pv); PMAP_LOCK(pmap); pte = pmap_pte_quick(pmap, pv->pv_va); - val = *pte; - - if ((val & PG_M) != 0) { + if ((*pte & PG_M) != 0) { /* * Regardless of whether a pte is 32 or 64 bits * in size, PG_M is among the least significant @@ -3592,8 +3583,7 @@ pv_entry_t pv; pmap_t pmap; pt_entry_t *pte; - vm_paddr_t val; - + mtx_assert(&vm_page_queue_mtx, MA_OWNED); if ((m->flags & PG_FICTITIOUS) != 0) return; @@ -3602,8 +3592,7 @@ pmap = PV_PMAP(pv); PMAP_LOCK(pmap); pte = pmap_pte_quick(pmap, pv->pv_va); - val = *pte; - if ((val & PG_A) != 0) { + if ((*pte & PG_A) != 0) { /* * Regardless of whether a pte is 32 or 64 bits * in size, PG_A is among the least significant @@ -3692,11 +3681,9 @@ { vm_offset_t base, offset, tmpva; pt_entry_t *pte; - vm_paddr_t opte, npte; + u_int opte, npte; pd_entry_t *pde; - vm_paddr_t val; - - + base = trunc_page(va); offset = va & PAGE_MASK; size = roundup(offset + size, PAGE_SIZE); @@ -3708,15 +3695,12 @@ /* 4MB pages and pages that aren't mapped aren't supported. */ for (tmpva = base; tmpva < (base + size); tmpva += PAGE_SIZE) { pde = pmap_pde(kernel_pmap, tmpva); - val = PT_GET(pde); - - if (val & PG_PS) + if (*pde & PG_PS) return (EINVAL); - if (val == 0) + if ((*pde & PG_V) == 0) return (EINVAL); pte = vtopte(va); - val = PT_GET(pte); - if (val == 0) + if ((*pte & PG_V) == 0) return (EINVAL); } @@ -3745,9 +3729,6 @@ * Flush CPU caches to make sure any data isn't cached that shouldn't * be, etc. */ - /* - * pmap_invalidate_range calls PT_UPDATES_FLUSH(); - */ pmap_invalidate_range(kernel_pmap, base, tmpva); pmap_invalidate_cache(); return (0); @@ -3768,6 +3749,7 @@ pte = (ptep != NULL) ? PT_GET(ptep) : 0; pmap_pte_release(ptep); PMAP_UNLOCK(pmap); + if (pte != 0) { vm_paddr_t pa; From owner-p4-projects@FreeBSD.ORG Thu Jan 17 06:05:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3F7E16A419; Thu, 17 Jan 2008 06:05:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B3B016A417 for ; Thu, 17 Jan 2008 06:05:06 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6C80C13C45A for ; Thu, 17 Jan 2008 06:05:06 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0H6565J050733 for ; Thu, 17 Jan 2008 06:05:06 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0H656hS050730 for perforce@freebsd.org; Thu, 17 Jan 2008 06:05:06 GMT (envelope-from scottl@freebsd.org) Date: Thu, 17 Jan 2008 06:05:06 GMT Message-Id: <200801170605.m0H656hS050730@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 133458 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 06:05:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=133458 Change 133458 by scottl@scottl-ix on 2008/01/17 06:04:16 Add some style to the netfront driver Affected files ... .. //depot/projects/xen31/sys/dev/xen/netfront/netfront.c#6 edit Differences ... ==== //depot/projects/xen31/sys/dev/xen/netfront/netfront.c#6 (text+ko) ==== @@ -144,93 +144,92 @@ * not the other way around. The size must track the free index arrays. */ struct xn_chain_data { - struct mbuf *xn_tx_chain[NET_TX_RING_SIZE+1]; + struct mbuf *xn_tx_chain[NET_TX_RING_SIZE+1]; struct mbuf *xn_rx_chain[NET_RX_RING_SIZE+1]; }; struct net_device_stats { - unsigned long rx_packets; /* total packets received */ - unsigned long tx_packets; /* total packets transmitted */ - unsigned long rx_bytes; /* total bytes received */ - unsigned long tx_bytes; /* total bytes transmitted */ - unsigned long rx_errors; /* bad packets received */ - unsigned long tx_errors; /* packet transmit problems */ - unsigned long rx_dropped; /* no space in linux buffers */ - unsigned long tx_dropped; /* no space available in linux */ - unsigned long multicast; /* multicast packets received */ - unsigned long collisions; + u_long rx_packets; /* total packets received */ + u_long tx_packets; /* total packets transmitted */ + u_long rx_bytes; /* total bytes received */ + u_long tx_bytes; /* total bytes transmitted */ + u_long rx_errors; /* bad packets received */ + u_long tx_errors; /* packet transmit problems */ + u_long rx_dropped; /* no space in linux buffers */ + u_long tx_dropped; /* no space available in linux */ + u_long multicast; /* multicast packets received */ + u_long collisions; /* detailed rx_errors: */ - unsigned long rx_length_errors; - unsigned long rx_over_errors; /* receiver ring buff overflow */ - unsigned long rx_crc_errors; /* recved pkt with crc error */ - unsigned long rx_frame_errors; /* recv'd frame alignment error */ - unsigned long rx_fifo_errors; /* recv'r fifo overrun */ - unsigned long rx_missed_errors; /* receiver missed packet */ + u_long rx_length_errors; + u_long rx_over_errors; /* receiver ring buff overflow */ + u_long rx_crc_errors; /* recved pkt with crc error */ + u_long rx_frame_errors; /* recv'd frame alignment error */ + u_long rx_fifo_errors; /* recv'r fifo overrun */ + u_long rx_missed_errors; /* receiver missed packet */ /* detailed tx_errors */ - unsigned long tx_aborted_errors; - unsigned long tx_carrier_errors; - unsigned long tx_fifo_errors; - unsigned long tx_heartbeat_errors; - unsigned long tx_window_errors; + u_long tx_aborted_errors; + u_long tx_carrier_errors; + u_long tx_fifo_errors; + u_long tx_heartbeat_errors; + u_long tx_window_errors; /* for cslip etc */ - unsigned long rx_compressed; - unsigned long tx_compressed; + u_long rx_compressed; + u_long tx_compressed; }; struct netfront_info { - struct ifnet *xn_ifp; + struct ifnet *xn_ifp; + + struct net_device_stats stats; + u_int tx_full; - struct net_device_stats stats; - unsigned int tx_full; - - netif_tx_front_ring_t tx; - netif_rx_front_ring_t rx; + netif_tx_front_ring_t tx; + netif_rx_front_ring_t rx; - struct mtx tx_lock; - struct mtx rx_lock; - struct sx sc_lock; + struct mtx tx_lock; + struct mtx rx_lock; + struct sx sc_lock; - unsigned int handle; - unsigned int irq; - unsigned int copying_receiver; - unsigned int carrier; + u_int handle; + u_int irq; + u_int copying_receiver; + u_int carrier; /* Receive-ring batched refills. */ #define RX_MIN_TARGET 32 #define RX_MAX_TARGET NET_RX_RING_SIZE - int rx_min_target, rx_max_target, rx_target; + int rx_min_target, rx_max_target, rx_target; - /* - * {tx,rx}_skbs store outstanding skbuffs. The first entry in each - * array is an index into a chain of free entries. - */ + /* + * {tx,rx}_skbs store outstanding skbuffs. The first entry in each + * array is an index into a chain of free entries. + */ - grant_ref_t gref_tx_head; - grant_ref_t grant_tx_ref[NET_TX_RING_SIZE + 1]; - grant_ref_t gref_rx_head; - grant_ref_t grant_rx_ref[NET_TX_RING_SIZE + 1]; + grant_ref_t gref_tx_head; + grant_ref_t grant_tx_ref[NET_TX_RING_SIZE + 1]; + grant_ref_t gref_rx_head; + grant_ref_t grant_rx_ref[NET_TX_RING_SIZE + 1]; #define TX_MAX_TARGET min(NET_RX_RING_SIZE, 256) - struct xenbus_device *xbdev; - int tx_ring_ref; - int rx_ring_ref; - uint8_t mac[ETHER_ADDR_LEN]; - struct xn_chain_data xn_cdata; /* mbufs */ - struct mbuf_head xn_rx_batch; /* head of the batch queue */ + struct xenbus_device *xbdev; + int tx_ring_ref; + int rx_ring_ref; + uint8_t mac[ETHER_ADDR_LEN]; + struct xn_chain_data xn_cdata; /* mbufs */ + struct mbuf_head xn_rx_batch; /* head of the batch queue */ - int xn_if_flags; - struct callout xn_stat_ch; + int xn_if_flags; + struct callout xn_stat_ch; - - unsigned long rx_pfn_array[NET_RX_RING_SIZE]; - multicall_entry_t rx_mcl[NET_RX_RING_SIZE+1]; - mmu_update_t rx_mmu[NET_RX_RING_SIZE]; + u_long rx_pfn_array[NET_RX_RING_SIZE]; + multicall_entry_t rx_mcl[NET_RX_RING_SIZE+1]; + mmu_update_t rx_mmu[NET_RX_RING_SIZE]; }; #define rx_mbufs xn_cdata.xn_rx_chain @@ -278,13 +277,13 @@ add_id_to_freelist(struct mbuf **list, unsigned short id) { list[id] = list[0]; - list[0] = (void *)(unsigned long)id; + list[0] = (void *)(u_long)id; } static inline unsigned short get_id_from_freelist(struct mbuf **list) { - unsigned int id = (unsigned int)(unsigned long)list[0]; + u_int id = (u_int)(u_long)list[0]; list[0] = list[id]; return (id); } @@ -661,24 +660,23 @@ static void netif_release_tx_bufs(struct netfront_info *np) { - struct mbuf *m; - int i; + struct mbuf *m; + int i; - for (i = 1; i <= NET_TX_RING_SIZE; i++) { - m = np->xn_cdata.xn_tx_chain[i]; + for (i = 1; i <= NET_TX_RING_SIZE; i++) { + m = np->xn_cdata.xn_tx_chain[i]; - if (((unsigned long)m) < KERNBASE) - continue; - gnttab_grant_foreign_access_ref( - np->grant_tx_ref[i], np->xbdev->otherend_id, - virt_to_mfn(mtod(m, vm_offset_t)), - GNTMAP_readonly); - gnttab_release_grant_reference( - &np->gref_tx_head, np->grant_tx_ref[i]); - np->grant_tx_ref[i] = GRANT_INVALID_REF; - add_id_to_freelist(np->tx_mbufs, i); - m_freem(m); - } + if (((u_long)m) < KERNBASE) + continue; + gnttab_grant_foreign_access_ref(np->grant_tx_ref[i], + np->xbdev->otherend_id, virt_to_mfn(mtod(m, vm_offset_t)), + GNTMAP_readonly); + gnttab_release_grant_reference(&np->gref_tx_head, + np->grant_tx_ref[i]); + np->grant_tx_ref[i] = GRANT_INVALID_REF; + add_id_to_freelist(np->tx_mbufs, i); + m_freem(m); + } } static void @@ -693,7 +691,7 @@ int nr_flips; netif_rx_request_t *req; vm_offset_t vaddr; - unsigned long pfn; + u_long pfn; req_prod = sc->rx.req_prod_pvt; @@ -702,27 +700,27 @@ /* * Allocate skbuffs greedily, even though we batch updates to the - * receive ring. This creates a less bursty demand on the memory allocator, - * so should reduce the chance of failed allocation requests both for - * ourself and for other kernel subsystems. + * receive ring. This creates a less bursty demand on the memory + * allocator, so should reduce the chance of failed allocation + * requests both for ourself and for other kernel subsystems. */ batch_target = sc->rx_target - (req_prod - sc->rx.rsp_cons); for (i = mbufq_len(&sc->xn_rx_batch); i < batch_target; i++) { MGETHDR(m_new, M_DONTWAIT, MT_DATA); if (m_new == NULL) - goto no_mbuf; + goto no_mbuf; m_cljget(m_new, M_DONTWAIT, MJUMPAGESIZE); if ((m_new->m_flags & M_EXT) == 0) { - m_freem(m_new); + m_freem(m_new); no_mbuf: - if (i != 0) - goto refill; - /* - * XXX set timer - */ - break; + if (i != 0) + goto refill; + /* + * XXX set timer + */ + break; } m_new->m_len = m_new->m_pkthdr.len = MJUMPAGESIZE; @@ -732,62 +730,62 @@ /* Is the batch large enough to be worthwhile? */ if (i < (sc->rx_target/2)) { - if (req_prod >sc->rx.sring->req_prod) - goto push; - return; + if (req_prod >sc->rx.sring->req_prod) + goto push; + return; } - /* Adjust our floating fill target if we risked running out of buffers. */ + /* Adjust floating fill target if we risked running out of buffers. */ if ( ((req_prod - sc->rx.sring->rsp_prod) < (sc->rx_target / 4)) && ((sc->rx_target *= 2) > sc->rx_max_target) ) sc->rx_target = sc->rx_max_target; refill: for (nr_flips = i = 0; ; i++) { - if ((m_new = mbufq_dequeue(&sc->xn_rx_batch)) == NULL) - break; + if ((m_new = mbufq_dequeue(&sc->xn_rx_batch)) == NULL) + break; + + m_new->m_ext.ext_args = (vm_paddr_t *)(uintptr_t)( + vtophys(m_new->m_ext.ext_buf) >> PAGE_SHIFT); + + id = xennet_rxidx(req_prod + i); + + PANIC_IF(sc->xn_cdata.xn_rx_chain[id] != NULL); + sc->xn_cdata.xn_rx_chain[id] = m_new; - m_new->m_ext.ext_args = (vm_paddr_t *)(uintptr_t)(vtophys(m_new->m_ext.ext_buf) >> PAGE_SHIFT); + ref = gnttab_claim_grant_reference(&sc->gref_rx_head); + PANIC_IF((signed short)ref < 0); + sc->grant_rx_ref[id] = ref; - id = xennet_rxidx(req_prod + i); - - PANIC_IF(sc->xn_cdata.xn_rx_chain[id] != NULL); - sc->xn_cdata.xn_rx_chain[id] = m_new; - - ref = gnttab_claim_grant_reference(&sc->gref_rx_head); - PANIC_IF((signed short)ref < 0); - sc->grant_rx_ref[id] = ref; - - vaddr = mtod(m_new, vm_offset_t); - pfn = vtophys(vaddr) >> PAGE_SHIFT; - req = RING_GET_REQUEST(&sc->rx, req_prod + i); + vaddr = mtod(m_new, vm_offset_t); + pfn = vtophys(vaddr) >> PAGE_SHIFT; + req = RING_GET_REQUEST(&sc->rx, req_prod + i); - if (sc->copying_receiver == 0) { - gnttab_grant_foreign_transfer_ref(ref, - sc->xbdev->otherend_id, - pfn); - sc->rx_pfn_array[nr_flips] = PFNTOMFN(pfn); - if (!xen_feature(XENFEAT_auto_translated_physmap)) { - /* Remove this page before passing - * back to Xen. - */ - set_phys_to_machine(pfn, INVALID_P2M_ENTRY); - MULTI_update_va_mapping(&sc->rx_mcl[i], - vaddr, 0, 0); - } - nr_flips++; - } else { - gnttab_grant_foreign_access_ref(ref, - sc->xbdev->otherend_id, - PFNTOMFN(pfn), - 0); + if (sc->copying_receiver == 0) { + gnttab_grant_foreign_transfer_ref(ref, + sc->xbdev->otherend_id, pfn); + sc->rx_pfn_array[nr_flips] = PFNTOMFN(pfn); + if (!xen_feature(XENFEAT_auto_translated_physmap)) { + /* Remove this page before passing + * back to Xen. + */ + set_phys_to_machine(pfn, INVALID_P2M_ENTRY); + MULTI_update_va_mapping(&sc->rx_mcl[i], + vaddr, 0, 0); } - req->id = id; - req->gref = ref; + nr_flips++; + } else { + gnttab_grant_foreign_access_ref(ref, + sc->xbdev->otherend_id, + PFNTOMFN(pfn), 0); + } + req->id = id; + req->gref = ref; - sc->rx_pfn_array[i] = vtomach(mtod(m_new,vm_offset_t)) >> PAGE_SHIFT; + sc->rx_pfn_array[i] = + vtomach(mtod(m_new,vm_offset_t)) >> PAGE_SHIFT; } - KASSERT(i, ("no mbufs processed")); /* should have returned earlier */ + KASSERT(i, ("no mbufs processed")); /* should have returned earlier */ KASSERT(mbufq_len(&sc->xn_rx_batch) == 0, ("not all mbufs processed")); /* * We may have allocated buffers which have entries outstanding @@ -796,39 +794,40 @@ PT_UPDATES_FLUSH(); if (nr_flips != 0) { #ifdef notyet - /* Tell the ballon driver what is going on. */ - balloon_update_driver_allowance(i); + /* Tell the ballon driver what is going on. */ + balloon_update_driver_allowance(i); #endif - set_xen_guest_handle(reservation.extent_start, sc->rx_pfn_array); - reservation.nr_extents = i; - reservation.extent_order = 0; - reservation.address_bits = 0; - reservation.domid = DOMID_SELF; + set_xen_guest_handle(reservation.extent_start,sc->rx_pfn_array); + reservation.nr_extents = i; + reservation.extent_order = 0; + reservation.address_bits = 0; + reservation.domid = DOMID_SELF; - if (!xen_feature(XENFEAT_auto_translated_physmap)) { + if (!xen_feature(XENFEAT_auto_translated_physmap)) { - /* After all PTEs have been zapped, flush the TLB. */ - sc->rx_mcl[i-1].args[MULTI_UVMFLAGS_INDEX] = - UVMF_TLB_FLUSH|UVMF_ALL; + /* After all PTEs have been zapped, flush the TLB. */ + sc->rx_mcl[i-1].args[MULTI_UVMFLAGS_INDEX] = + UVMF_TLB_FLUSH|UVMF_ALL; - /* Give away a batch of pages. */ - sc->rx_mcl[i].op = __HYPERVISOR_memory_op; - sc->rx_mcl[i].args[0] = XENMEM_decrease_reservation; - sc->rx_mcl[i].args[1] = (unsigned long)&reservation; - /* Zap PTEs and give away pages in one big multicall. */ - (void)HYPERVISOR_multicall(sc->rx_mcl, i+1); - - /* Check return status of HYPERVISOR_dom_mem_op(). */ - if (unlikely(sc->rx_mcl[i].result != i)) - panic("Unable to reduce memory reservation\n"); + /* Give away a batch of pages. */ + sc->rx_mcl[i].op = __HYPERVISOR_memory_op; + sc->rx_mcl[i].args[0] = XENMEM_decrease_reservation; + sc->rx_mcl[i].args[1] = (u_long)&reservation; + /* Zap PTEs and give away pages in one big multicall. */ + (void)HYPERVISOR_multicall(sc->rx_mcl, i+1); + /* Check return status of HYPERVISOR_dom_mem_op(). */ + if (unlikely(sc->rx_mcl[i].result != i)) + panic("Unable to reduce memory reservation\n"); } else { - if (HYPERVISOR_memory_op(XENMEM_decrease_reservation, - &reservation) != i) - panic("Unable to reduce memory reservation\n"); - } + if (HYPERVISOR_memory_op( + XENMEM_decrease_reservation, &reservation) + != i) + panic("Unable to reduce memory " + "reservation\n"); + } } else { - wmb(); + wmb(); } /* Above is a suitable barrier to ensure backend will see requests. */ @@ -836,126 +835,127 @@ push: RING_PUSH_REQUESTS_AND_CHECK_NOTIFY(&sc->rx, notify); if (notify) - notify_remote_via_irq(sc->irq); + notify_remote_via_irq(sc->irq); } static void xn_rxeof(struct netfront_info *np) { - struct ifnet *ifp; - struct netfront_rx_info rinfo; - struct netif_rx_response *rx = &rinfo.rx; - struct netif_extra_info *extras = rinfo.extras; - RING_IDX i, rp; - multicall_entry_t *mcl; - struct mbuf *m; - struct mbuf_head rxq, errq, tmpq; - int err, pages_flipped = 0; + struct ifnet *ifp; + struct netfront_rx_info rinfo; + struct netif_rx_response *rx = &rinfo.rx; + struct netif_extra_info *extras = rinfo.extras; + RING_IDX i, rp; + multicall_entry_t *mcl; + struct mbuf *m; + struct mbuf_head rxq, errq, tmpq; + int err, pages_flipped = 0; + + XN_RX_LOCK_ASSERT(np); + if (!netfront_carrier_ok(np)) + return; - XN_RX_LOCK_ASSERT(np); - if (!netfront_carrier_ok(np)) - return; + mbufq_init(&tmpq); + mbufq_init(&errq); + mbufq_init(&rxq); - mbufq_init(&tmpq); - mbufq_init(&errq); - mbufq_init(&rxq); - - ifp = np->xn_ifp; + ifp = np->xn_ifp; - rp = np->rx.sring->rsp_prod; - rmb(); /* Ensure we see queued responses up to 'rp'. */ + rp = np->rx.sring->rsp_prod; + rmb(); /* Ensure we see queued responses up to 'rp'. */ + + i = np->rx.rsp_cons; + while ((i != rp)) { + memcpy(rx, RING_GET_RESPONSE(&np->rx, i), sizeof(*rx)); + memset(extras, 0, sizeof(rinfo.extras)); + + err = xennet_get_responses(np, &rinfo, rp, &tmpq, + &pages_flipped); - i = np->rx.rsp_cons; - while ((i != rp)) { - memcpy(rx, RING_GET_RESPONSE(&np->rx, i), sizeof(*rx)); - memset(extras, 0, sizeof(rinfo.extras)); + if (unlikely(err)) { + while ((m = mbufq_dequeue(&tmpq))) + mbufq_tail(&errq, m); + np->stats.rx_errors++; + i = np->rx.rsp_cons; + continue; + } - err = xennet_get_responses(np, &rinfo, rp, &tmpq, - &pages_flipped); + m = mbufq_dequeue(&tmpq); - if (unlikely(err)) { - while ((m = mbufq_dequeue(&tmpq))) - mbufq_tail(&errq, m); - np->stats.rx_errors++; - i = np->rx.rsp_cons; - continue; - } + m->m_data += rx->offset;/* (rx->addr & PAGE_MASK); */ + m->m_pkthdr.len = m->m_len = rx->status; + m->m_pkthdr.rcvif = ifp; - m = mbufq_dequeue(&tmpq); - - - m->m_data += rx->offset;/* (rx->addr & PAGE_MASK); */ - m->m_pkthdr.len = m->m_len = rx->status; - m->m_pkthdr.rcvif = ifp; - - if ( rx->flags & NETRXF_data_validated ) { - /* Tell the stack the checksums are okay */ - /* - * XXX this isn't necessarily the case - need to add check - * - */ + if ( rx->flags & NETRXF_data_validated ) { + /* Tell the stack the checksums are okay */ + /* + * XXX this isn't necessarily the case - need to add + * check + */ - m->m_pkthdr.csum_flags |= - (CSUM_IP_CHECKED | CSUM_IP_VALID | CSUM_DATA_VALID | CSUM_PSEUDO_HDR); - m->m_pkthdr.csum_data = 0xffff; - } + m->m_pkthdr.csum_flags |= + (CSUM_IP_CHECKED | CSUM_IP_VALID | CSUM_DATA_VALID + | CSUM_PSEUDO_HDR); + m->m_pkthdr.csum_data = 0xffff; + } - np->stats.rx_packets++; - np->stats.rx_bytes += rx->status; + np->stats.rx_packets++; + np->stats.rx_bytes += rx->status; - mbufq_tail(&rxq, m); - np->rx.rsp_cons = ++i; - } + mbufq_tail(&rxq, m); + np->rx.rsp_cons = ++i; + } - if (pages_flipped) { - /* Some pages are no longer absent... */ + if (pages_flipped) { + /* Some pages are no longer absent... */ #ifdef notyet - balloon_update_driver_allowance(-pages_flipped); + balloon_update_driver_allowance(-pages_flipped); #endif - /* Do all the remapping work, and M->P updates, in one big hypercall. */ - if (!!xen_feature(XENFEAT_auto_translated_physmap)) { - mcl = np->rx_mcl + pages_flipped; - mcl->op = __HYPERVISOR_mmu_update; - mcl->args[0] = (unsigned long)np->rx_mmu; - mcl->args[1] = pages_flipped; - mcl->args[2] = 0; - mcl->args[3] = DOMID_SELF; - (void)HYPERVISOR_multicall(np->rx_mcl, pages_flipped + 1); - } + /* Do all the remapping work, and M->P updates, in one big + * hypercall. + */ + if (!!xen_feature(XENFEAT_auto_translated_physmap)) { + mcl = np->rx_mcl + pages_flipped; + mcl->op = __HYPERVISOR_mmu_update; + mcl->args[0] = (u_long)np->rx_mmu; + mcl->args[1] = pages_flipped; + mcl->args[2] = 0; + mcl->args[3] = DOMID_SELF; + (void)HYPERVISOR_multicall(np->rx_mcl, + pages_flipped + 1); } + } - while ((m = mbufq_dequeue(&errq))) - m_freem(m); + while ((m = mbufq_dequeue(&errq))) + m_freem(m); + /* + * Process all the mbufs after the remapping is complete. + * Break the mbuf chain first though. + */ + while ((m = mbufq_dequeue(&rxq)) != NULL) { + ifp->if_ipackets++; - /* - * Process all the mbufs after the remapping is complete. - * Break the mbuf chain first though. + /* + * Do we really need to drop the rx lock? */ - while ((m = mbufq_dequeue(&rxq)) != NULL) { - ifp->if_ipackets++; - - /* - * Do we really need to drop the rx lock? - */ - XN_RX_UNLOCK(np); - /* Pass it up. */ - (*ifp->if_input)(ifp, m); - XN_RX_LOCK(np); - } + XN_RX_UNLOCK(np); + /* Pass it up. */ + (*ifp->if_input)(ifp, m); + XN_RX_LOCK(np); + } - np->rx.rsp_cons = i; + np->rx.rsp_cons = i; - /* If we get a callback with very few responses, reduce fill target. */ - /* NB. Note exponential increase, linear decrease. */ - if (((np->rx.req_prod_pvt - np->rx.sring->rsp_prod) > - ((3*np->rx_target) / 4)) && (--np->rx_target < np->rx_min_target)) - np->rx_target = np->rx_min_target; + /* If we get a callback with very few responses, reduce fill target. */ + /* NB. Note exponential increase, linear decrease. */ + if (((np->rx.req_prod_pvt - np->rx.sring->rsp_prod) > + ((3*np->rx_target) / 4)) && (--np->rx_target < np->rx_min_target)) + np->rx_target = np->rx_min_target; - network_alloc_rx_buffers(np); + network_alloc_rx_buffers(np); - np->rx.sring->rsp_event = i + 1; - + np->rx.sring->rsp_event = i + 1; } static void @@ -986,7 +986,7 @@ KASSERT(m != NULL, ("mbuf not found in xn_tx_chain")); M_ASSERTVALID(m); if (unlikely(gnttab_query_foreign_access( - np->grant_tx_ref[id]) != 0)) { + np->grant_tx_ref[id]) != 0)) { printk("network_tx_buf_gc: warning " "-- grant still in use by backend " "domain.\n"); @@ -1005,17 +1005,17 @@ np->tx.rsp_cons = prod; /* - * Set a new event, then check for race with update of tx_cons. Note - * that it is essential to schedule a callback, no matter how few - * buffers are pending. Even if there is space in the transmit ring, - * higher layers may be blocked because too much data is outstanding: - * in such cases notification from Xen is likely to be the only kick + * Set a new event, then check for race with update of + * tx_cons. Note that it is essential to schedule a + * callback, no matter how few buffers are pending. Even if + * there is space in the transmit ring, higher layers may + * be blocked because too much data is outstanding: in such + * cases notification from Xen is likely to be the only kick * that we'll get. */ np->tx.sring->rsp_event = - prod + ((np->tx.sring->req_prod - prod) >> 1) + 1; - - + prod + ((np->tx.sring->req_prod - prod) >> 1) + 1; + mb(); } while (prod != np->tx.sring->rsp_prod); @@ -1041,12 +1041,12 @@ if (!(np->rx.rsp_cons != np->rx.sring->rsp_prod && likely(netfront_carrier_ok(np)) && - ifp->if_drv_flags & IFF_DRV_RUNNING)) + ifp->if_drv_flags & IFF_DRV_RUNNING)) return; if (np->tx.rsp_cons != np->tx.sring->rsp_prod) { - XN_TX_LOCK(np); - xn_txeof(np); - XN_TX_UNLOCK(np); + XN_TX_LOCK(np); + xn_txeof(np); + XN_TX_UNLOCK(np); } XN_RX_LOCK(np); @@ -1055,7 +1055,7 @@ if (ifp->if_drv_flags & IFF_DRV_RUNNING && !IFQ_DRV_IS_EMPTY(&ifp->if_snd)) - xn_start(ifp); + xn_start(ifp); } @@ -1063,62 +1063,61 @@ xennet_move_rx_slot(struct netfront_info *np, struct mbuf *m, grant_ref_t ref) { - int new = xennet_rxidx(np->rx.req_prod_pvt); + int new = xennet_rxidx(np->rx.req_prod_pvt); - PANIC_IF(np->rx_mbufs[new] != NULL); - np->rx_mbufs[new] = m; - np->grant_rx_ref[new] = ref; - RING_GET_REQUEST(&np->rx, np->rx.req_prod_pvt)->id = new; - RING_GET_REQUEST(&np->rx, np->rx.req_prod_pvt)->gref = ref; - np->rx.req_prod_pvt++; + PANIC_IF(np->rx_mbufs[new] != NULL); + np->rx_mbufs[new] = m; + np->grant_rx_ref[new] = ref; + RING_GET_REQUEST(&np->rx, np->rx.req_prod_pvt)->id = new; + RING_GET_REQUEST(&np->rx, np->rx.req_prod_pvt)->gref = ref; + np->rx.req_prod_pvt++; } static int xennet_get_extras(struct netfront_info *np, - struct netif_extra_info *extras, RING_IDX rp) + struct netif_extra_info *extras, RING_IDX rp) { - struct netif_extra_info *extra; - RING_IDX cons = np->rx.rsp_cons; + struct netif_extra_info *extra; + RING_IDX cons = np->rx.rsp_cons; - int err = 0; + int err = 0; - do { - struct mbuf *m; - grant_ref_t ref; + do { + struct mbuf *m; + grant_ref_t ref; - if (unlikely(cons + 1 == rp)) { + if (unlikely(cons + 1 == rp)) { #if 0 - if (net_ratelimit()) - WPRINTK("Missing extra info\n"); + if (net_ratelimit()) + WPRINTK("Missing extra info\n"); #endif - err = -EINVAL; - break; - } + err = -EINVAL; + break; + } - extra = (struct netif_extra_info *) - RING_GET_RESPONSE(&np->rx, ++cons); + extra = (struct netif_extra_info *) + RING_GET_RESPONSE(&np->rx, ++cons); - if (unlikely(!extra->type || - extra->type >= XEN_NETIF_EXTRA_TYPE_MAX)) { + if (unlikely(!extra->type || + extra->type >= XEN_NETIF_EXTRA_TYPE_MAX)) { #if 0 - if (net_ratelimit()) - WPRINTK("Invalid extra type: %d\n", - extra->type); + if (net_ratelimit()) + WPRINTK("Invalid extra type: %d\n", + extra->type); #endif - err = -EINVAL; - } else { - memcpy(&extras[extra->type - 1], extra, - sizeof(*extra)); - } + err = -EINVAL; + } else { + memcpy(&extras[extra->type - 1], extra, sizeof(*extra)); + } - m = xennet_get_rx_mbuf(np, cons); - ref = xennet_get_rx_ref(np, cons); - xennet_move_rx_slot(np, m, ref); - } while (extra->flags & XEN_NETIF_EXTRA_FLAG_MORE); + m = xennet_get_rx_mbuf(np, cons); + ref = xennet_get_rx_ref(np, cons); + xennet_move_rx_slot(np, m, ref); + } while (extra->flags & XEN_NETIF_EXTRA_FLAG_MORE); - np->rx.rsp_cons = cons; - return err; + np->rx.rsp_cons = cons; + return err; } static int @@ -1127,124 +1126,126 @@ struct mbuf_head *list, int *pages_flipped_p) { - int pages_flipped = *pages_flipped_p; - struct mmu_update *mmu; - struct multicall_entry *mcl; - struct netif_rx_response *rx = &rinfo->rx; - struct netif_extra_info *extras = rinfo->extras; - RING_IDX cons = np->rx.rsp_cons; - struct mbuf *m = xennet_get_rx_mbuf(np, cons); - grant_ref_t ref = xennet_get_rx_ref(np, cons); - int max = 24 /* MAX_SKB_FRAGS + (rx->status <= RX_COPY_THRESHOLD) */; - int frags = 1; - int err = 0; - unsigned long ret; + int pages_flipped = *pages_flipped_p; + struct mmu_update *mmu; + struct multicall_entry *mcl; + struct netif_rx_response *rx = &rinfo->rx; + struct netif_extra_info *extras = rinfo->extras; + RING_IDX cons = np->rx.rsp_cons; + struct mbuf *m = xennet_get_rx_mbuf(np, cons); + grant_ref_t ref = xennet_get_rx_ref(np, cons); + int max = 24 /* MAX_SKB_FRAGS + (rx->status <= RX_COPY_THRESHOLD) */; + int frags = 1; + int err = 0; + u_long ret; - if (rx->flags & NETRXF_extra_info) { - err = xennet_get_extras(np, extras, rp); - cons = np->rx.rsp_cons; - } + if (rx->flags & NETRXF_extra_info) { + err = xennet_get_extras(np, extras, rp); + cons = np->rx.rsp_cons; + } - for (;;) { - unsigned long mfn; + for (;;) { + u_long mfn; - if (unlikely(rx->status < 0 || - rx->offset + rx->status > PAGE_SIZE)) { + if (unlikely(rx->status < 0 || + rx->offset + rx->status > PAGE_SIZE)) { #if 0 - if (net_ratelimit()) - WPRINTK("rx->offset: %x, size: %u\n", - rx->offset, rx->status); + if (net_ratelimit()) + WPRINTK("rx->offset: %x, size: %u\n", + rx->offset, rx->status); #endif - xennet_move_rx_slot(np, m, ref); - err = -EINVAL; - goto next; - } + xennet_move_rx_slot(np, m, ref); + err = -EINVAL; + goto next; + } - /* - * This definitely indicates a bug, either in this driver or in - * the backend driver. In future this should flag the bad - * situation to the system controller to reboot the backed. - */ - if (ref == GRANT_INVALID_REF) { + /* + * This definitely indicates a bug, either in this driver or in + * the backend driver. In future this should flag the bad + * situation to the system controller to reboot the backed. + */ + if (ref == GRANT_INVALID_REF) { #if 0 - if (net_ratelimit()) - WPRINTK("Bad rx response id %d.\n", rx->id); + if (net_ratelimit()) + WPRINTK("Bad rx response id %d.\n", rx->id); #endif - err = -EINVAL; - goto next; + err = -EINVAL; + goto next; + } + + if (!np->copying_receiver) { + /* Memory pressure, insufficient buffer + * headroom, ... + */ + if (!(mfn = gnttab_end_foreign_transfer_ref(ref))) { + if (net_ratelimit()) + WPRINTK("Unfulfilled rx req " + "(id=%d, st=%d).\n", + rx->id, rx->status); + xennet_move_rx_slot(np, m, ref); + err = -ENOMEM; + goto next; } - if (!np->copying_receiver) { - /* Memory pressure, insufficient buffer - * headroom, ... - */ - if (!(mfn = gnttab_end_foreign_transfer_ref(ref))) { - if (net_ratelimit()) - WPRINTK("Unfulfilled rx req " - "(id=%d, st=%d).\n", - rx->id, rx->status); - xennet_move_rx_slot(np, m, ref); - err = -ENOMEM; - goto next; - } + if (!xen_feature( + XENFEAT_auto_translated_physmap)) { + /* Remap the page. */ + void *vaddr = mtod(m, void *); + uint32_t pfn; - if (!xen_feature(XENFEAT_auto_translated_physmap)) { - /* Remap the page. */ - void *vaddr = mtod(m, void *); - uint32_t pfn; - - mcl = np->rx_mcl + pages_flipped; - mmu = np->rx_mmu + pages_flipped; + mcl = np->rx_mcl + pages_flipped; + mmu = np->rx_mmu + pages_flipped; - MULTI_update_va_mapping(mcl, - (unsigned long)vaddr, - (mfn << PAGE_SHIFT) | PG_RW | PG_V | PG_M | PG_A, - 0); - pfn = (uint32_t)m->m_ext.ext_args; - mmu->ptr = ((vm_paddr_t)mfn << PAGE_SHIFT) - | MMU_MACHPHYS_UPDATE; - mmu->val = pfn; + MULTI_update_va_mapping(mcl, + (u_long)vaddr, + (mfn << PAGE_SHIFT) | PG_RW | + PG_V | PG_M | PG_A, 0); + pfn = (uint32_t)m->m_ext.ext_args; + mmu->ptr = ((vm_paddr_t)mfn << + PAGE_SHIFT) | MMU_MACHPHYS_UPDATE; + mmu->val = pfn; - set_phys_to_machine(pfn, mfn); - } + set_phys_to_machine(pfn, mfn); + } pages_flipped++; } else { - ret = gnttab_end_foreign_access_ref(ref, 0); - PANIC_IF(!ret); + ret = gnttab_end_foreign_access_ref( + ref, 0); + PANIC_IF(!ret); } - gnttab_release_grant_reference(&np->gref_rx_head, ref); - mbufq_tail(list, m); + gnttab_release_grant_reference(&np->gref_rx_head, ref); + mbufq_tail(list, m); next: - if (!(rx->flags & NETRXF_more_data)) - break; + if (!(rx->flags & NETRXF_more_data)) + break; - if (cons + frags == rp) { - if (net_ratelimit()) - WPRINTK("Need more frags\n"); - err = -ENOENT; - break; - } + if (cons + frags == rp) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 17 06:08:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14DA716A41A; Thu, 17 Jan 2008 06:08:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CE86316A419 for ; Thu, 17 Jan 2008 06:08:09 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C0B7413C45A for ; Thu, 17 Jan 2008 06:08:09 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0H6893G051039 for ; Thu, 17 Jan 2008 06:08:09 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0H689bd051036 for perforce@freebsd.org; Thu, 17 Jan 2008 06:08:09 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 17 Jan 2008 06:08:09 GMT Message-Id: <200801170608.m0H689bd051036@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133459 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 06:08:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=133459 Change 133459 by kmacy@pandemonium:kmacy:xen31 on 2008/01/17 06:07:53 remove xen macros from pmap_ptelist functions Affected files ... .. //depot/projects/xen31/sys/i386/xen/pmap.c#20 edit Differences ... ==== //depot/projects/xen31/sys/i386/xen/pmap.c#20 (text+ko) ==== @@ -621,28 +621,19 @@ *head = *pte; if (*head & PG_V) panic("pmap_ptelist_alloc: va with PG_V set!"); -#ifdef XEN - PT_SET_MA(va, (vm_paddr_t)0); -#else *pte = 0; -#endif return (va); } static void pmap_ptelist_free(vm_offset_t *head, vm_offset_t va) { -#ifndef XEN pt_entry_t *pte; if (va & PG_V) panic("pmap_ptelist_free: freeing va with PG_V set!"); - pte = vtopte(va); *pte = *head; /* virtual! PG_V is 0 though */ -#else - PT_SET_MA(va, (vm_paddr_t)*head); -#endif *head = va; } From owner-p4-projects@FreeBSD.ORG Thu Jan 17 06:38:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66ADA16A41A; Thu, 17 Jan 2008 06:38:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2C41E16A418 for ; Thu, 17 Jan 2008 06:38:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1D7D413C4D1 for ; Thu, 17 Jan 2008 06:38:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0H6cfpR061780 for ; Thu, 17 Jan 2008 06:38:41 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0H6cfZ5061777 for perforce@freebsd.org; Thu, 17 Jan 2008 06:38:41 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 17 Jan 2008 06:38:41 GMT Message-Id: <200801170638.m0H6cfZ5061777@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133460 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 06:38:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=133460 Change 133460 by kmacy@pandemonium:kmacy:xen31 on 2008/01/17 06:37:47 fix pmap_release to release the pdpt rather than releasing the first page in the pdir twice Affected files ... .. //depot/projects/xen31/sys/i386/xen/pmap.c#21 edit Differences ... ==== //depot/projects/xen31/sys/i386/xen/pmap.c#21 (text+ko) ==== @@ -1692,7 +1692,12 @@ { vm_page_t m, ptdpg[NPGPTD+1]; vm_paddr_t ma; - int i, npgptd = NPGPTD + 1; + int i; +#ifdef PAE + int npgptd = NPGPTD + 1; +#else + int npgptd = NPGPTD; +#endif KASSERT(pmap->pm_stats.resident_count == 0, ("pmap_release: pmap resident count %ld != 0", @@ -1705,8 +1710,10 @@ for (i = 0; i < NPGPTD; i++) ptdpg[i] = PHYS_TO_VM_PAGE(PT_GET(&pmap->pm_pdir[PTDPTDI + i]) & PG_FRAME); - - ptdpg[NPGPTD] = PHYS_TO_VM_PAGE(vtophys(pmap->pm_pdir)); + +#ifdef PAE + ptdpg[NPGPTD] = PHYS_TO_VM_PAGE(vtophys(pmap->pm_pdpt)); +#endif for (i = 0; i < nkpt + NPGPTD; i++) PD_CLEAR_VA(pmap, PTDPTDI + i, FALSE); From owner-p4-projects@FreeBSD.ORG Thu Jan 17 07:20:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD29416A46B; Thu, 17 Jan 2008 07:20:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 79B5316A421 for ; Thu, 17 Jan 2008 07:20:26 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6836713C458 for ; Thu, 17 Jan 2008 07:20:26 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0H7KQBR069124 for ; Thu, 17 Jan 2008 07:20:26 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0H7KQRP069120 for perforce@freebsd.org; Thu, 17 Jan 2008 07:20:26 GMT (envelope-from scottl@freebsd.org) Date: Thu, 17 Jan 2008 07:20:26 GMT Message-Id: <200801170720.m0H7KQRP069120@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 133461 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 07:20:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=133461 Change 133461 by scottl@scottl-ix on 2008/01/17 07:20:20 Fix a few more style problems and change some linux-isms. Affected files ... .. //depot/projects/xen31/sys/dev/xen/netfront/netfront.c#7 edit Differences ... ==== //depot/projects/xen31/sys/dev/xen/netfront/netfront.c#7 (text+ko) ==== @@ -749,13 +749,14 @@ id = xennet_rxidx(req_prod + i); - PANIC_IF(sc->xn_cdata.xn_rx_chain[id] != NULL); + KASSERT(sc->xn_cdata.xn_rx_chain[id] == NULL, + ("non-NULL xm_rx_chain")); sc->xn_cdata.xn_rx_chain[id] = m_new; ref = gnttab_claim_grant_reference(&sc->gref_rx_head); - PANIC_IF((signed short)ref < 0); + KASSERT((short)ref >= 0, ("negative ref")); sc->grant_rx_ref[id] = ref; - + vaddr = mtod(m_new, vm_offset_t); pfn = vtophys(vaddr) >> PAGE_SHIFT; req = RING_GET_REQUEST(&sc->rx, req_prod + i); @@ -987,9 +988,9 @@ M_ASSERTVALID(m); if (unlikely(gnttab_query_foreign_access( np->grant_tx_ref[id]) != 0)) { - printk("network_tx_buf_gc: warning " - "-- grant still in use by backend " - "domain.\n"); + printf("network_tx_buf_gc: warning " + "-- grant still in use by backend " + "domain.\n"); goto out; } gnttab_end_foreign_access_ref( @@ -1040,9 +1041,9 @@ if (!(np->rx.rsp_cons != np->rx.sring->rsp_prod && - likely(netfront_carrier_ok(np)) && - ifp->if_drv_flags & IFF_DRV_RUNNING)) - return; + likely(netfront_carrier_ok(np)) && + ifp->if_drv_flags & IFF_DRV_RUNNING)) + return; if (np->tx.rsp_cons != np->tx.sring->rsp_prod) { XN_TX_LOCK(np); xn_txeof(np); @@ -1054,7 +1055,7 @@ XN_RX_UNLOCK(np); if (ifp->if_drv_flags & IFF_DRV_RUNNING && - !IFQ_DRV_IS_EMPTY(&ifp->if_snd)) + !IFQ_DRV_IS_EMPTY(&ifp->if_snd)) xn_start(ifp); } @@ -1065,7 +1066,7 @@ { int new = xennet_rxidx(np->rx.req_prod_pvt); - PANIC_IF(np->rx_mbufs[new] != NULL); + KASSERT(np->rx_mbufs[new] == NULL, ("rx_mbufs != NULL")); np->rx_mbufs[new] = m; np->grant_rx_ref[new] = ref; RING_GET_REQUEST(&np->rx, np->rx.req_prod_pvt)->id = new; @@ -1075,8 +1076,7 @@ static int xennet_get_extras(struct netfront_info *np, - struct netif_extra_info *extras, RING_IDX rp) - + struct netif_extra_info *extras, RING_IDX rp) { struct netif_extra_info *extra; RING_IDX cons = np->rx.rsp_cons; @@ -1182,56 +1182,53 @@ WPRINTK("Unfulfilled rx req " "(id=%d, st=%d).\n", rx->id, rx->status); - xennet_move_rx_slot(np, m, ref); - err = -ENOMEM; - goto next; - } + xennet_move_rx_slot(np, m, ref); + err = -ENOMEM; + goto next; + } + + if (!xen_feature( XENFEAT_auto_translated_physmap)) { + /* Remap the page. */ + void *vaddr = mtod(m, void *); + uint32_t pfn; - if (!xen_feature( - XENFEAT_auto_translated_physmap)) { - /* Remap the page. */ - void *vaddr = mtod(m, void *); - uint32_t pfn; + mcl = np->rx_mcl + pages_flipped; + mmu = np->rx_mmu + pages_flipped; - mcl = np->rx_mcl + pages_flipped; - mmu = np->rx_mmu + pages_flipped; + MULTI_update_va_mapping(mcl, (u_long)vaddr, + (mfn << PAGE_SHIFT) | PG_RW | + PG_V | PG_M | PG_A, 0); + pfn = (uint32_t)m->m_ext.ext_args; + mmu->ptr = ((vm_paddr_t)mfn << PAGE_SHIFT) | + MMU_MACHPHYS_UPDATE; + mmu->val = pfn; - MULTI_update_va_mapping(mcl, - (u_long)vaddr, - (mfn << PAGE_SHIFT) | PG_RW | - PG_V | PG_M | PG_A, 0); - pfn = (uint32_t)m->m_ext.ext_args; - mmu->ptr = ((vm_paddr_t)mfn << - PAGE_SHIFT) | MMU_MACHPHYS_UPDATE; - mmu->val = pfn; + set_phys_to_machine(pfn, mfn); + } + pages_flipped++; + } else { + ret = gnttab_end_foreign_access_ref(ref, 0); + KASSERT(ret, ("ret != 0")); + } - set_phys_to_machine(pfn, mfn); - } - pages_flipped++; - } else { - ret = gnttab_end_foreign_access_ref( - ref, 0); - PANIC_IF(!ret); - } + gnttab_release_grant_reference(&np->gref_rx_head, ref); + mbufq_tail(list, m); - gnttab_release_grant_reference(&np->gref_rx_head, ref); - mbufq_tail(list, m); +next: + if (!(rx->flags & NETRXF_more_data)) + break; - next: - if (!(rx->flags & NETRXF_more_data)) + if (cons + frags == rp) { + if (net_ratelimit()) + WPRINTK("Need more frags\n"); + err = -ENOENT; break; + } - if (cons + frags == rp) { - if (net_ratelimit()) - WPRINTK("Need more frags\n"); - err = -ENOENT; - break; - } - - rx = RING_GET_RESPONSE(&np->rx, cons + frags); - m = xennet_get_rx_mbuf(np, cons + frags); - ref = xennet_get_rx_ref(np, cons + frags); - frags++; + rx = RING_GET_RESPONSE(&np->rx, cons + frags); + m = xennet_get_rx_mbuf(np, cons + frags); + ref = xennet_get_rx_ref(np, cons + frags); + frags++; } if (unlikely(frags > max)) { @@ -1312,10 +1309,10 @@ tx = RING_GET_REQUEST(&sc->tx, i); tx->id = id; ref = gnttab_claim_grant_reference(&sc->gref_tx_head); - PANIC_IF((signed short)ref < 0); + KASSERT((short)ref >= 0, ("Negative ref")); mfn = virt_to_mfn(mtod(new_m, vm_offset_t)); - gnttab_grant_foreign_access_ref( - ref, sc->xbdev->otherend_id, mfn, GNTMAP_readonly); + gnttab_grant_foreign_access_ref(ref, sc->xbdev->otherend_id, + mfn, GNTMAP_readonly); tx->gref = sc->grant_tx_ref[id] = ref; tx->size = new_m->m_pkthdr.len; #if 0 @@ -1324,9 +1321,9 @@ tx->flags = 0; new_m->m_next = NULL; new_m->m_nextpkt = NULL; - + m_freem(m_head); - + sc->xn_cdata.xn_tx_chain[id] = new_m; BPF_MTAP(ifp, new_m); From owner-p4-projects@FreeBSD.ORG Thu Jan 17 09:48:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CFFD16A468; Thu, 17 Jan 2008 09:48:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11E1E16A41A for ; Thu, 17 Jan 2008 09:48:01 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ED0E713C455 for ; Thu, 17 Jan 2008 09:48:00 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0H9m04R001846 for ; Thu, 17 Jan 2008 09:48:00 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0H9m0f4001843 for perforce@freebsd.org; Thu, 17 Jan 2008 09:48:00 GMT (envelope-from scottl@freebsd.org) Date: Thu, 17 Jan 2008 09:48:00 GMT Message-Id: <200801170948.m0H9m0f4001843@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 133465 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 09:48:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=133465 Change 133465 by scottl@scottl-ix on 2008/01/17 09:47:34 Fix a few more whitespace issues Affected files ... .. //depot/projects/xen31/sys/dev/xen/netfront/netfront.c#8 edit Differences ... ==== //depot/projects/xen31/sys/dev/xen/netfront/netfront.c#8 (text+ko) ==== @@ -947,7 +947,7 @@ } np->rx.rsp_cons = i; - + /* If we get a callback with very few responses, reduce fill target. */ /* NB. Note exponential increase, linear decrease. */ if (((np->rx.req_prod_pvt - np->rx.sring->rsp_prod) > @@ -1039,7 +1039,6 @@ struct netfront_info *np = xsc; struct ifnet *ifp = np->xn_ifp; - if (!(np->rx.rsp_cons != np->rx.sring->rsp_prod && likely(netfront_carrier_ok(np)) && ifp->if_drv_flags & IFF_DRV_RUNNING)) @@ -1049,7 +1048,7 @@ xn_txeof(np); XN_TX_UNLOCK(np); } - + XN_RX_LOCK(np); xn_rxeof(np); XN_RX_UNLOCK(np); @@ -1281,13 +1280,11 @@ sc = ifp->if_softc; tx_bytes = 0; - if (!netfront_carrier_ok(sc)) return; for (i = sc->tx.req_prod_pvt; TRUE; i++) { - IF_DEQUEUE(&ifp->if_snd, m_head); if (m_head == NULL) break; @@ -1299,7 +1296,7 @@ } id = get_id_from_freelist(sc->xn_cdata.xn_tx_chain); - + /* * Start packing the mbufs in this chain into * the fragment pointers. Stop when we run out @@ -1330,7 +1327,7 @@ sc->stats.tx_bytes += new_m->m_pkthdr.len; sc->stats.tx_packets++; } - + sc->tx.req_prod_pvt = i; RING_PUSH_REQUESTS_AND_CHECK_NOTIFY(&sc->tx, notify); if (notify) @@ -1345,8 +1342,6 @@ #endif } - - return; } From owner-p4-projects@FreeBSD.ORG Thu Jan 17 10:07:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76CE616A420; Thu, 17 Jan 2008 10:07:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3CB8616A418 for ; Thu, 17 Jan 2008 10:07:21 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2A82413C4E3 for ; Thu, 17 Jan 2008 10:07:21 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0HA7LtC008874 for ; Thu, 17 Jan 2008 10:07:21 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0HA7LE7008871 for perforce@freebsd.org; Thu, 17 Jan 2008 10:07:21 GMT (envelope-from scottl@freebsd.org) Date: Thu, 17 Jan 2008 10:07:21 GMT Message-Id: <200801171007.m0HA7LE7008871@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 133467 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 10:07:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=133467 Change 133467 by scottl@scottl-ix on 2008/01/17 10:07:19 Disable a couple of optimizations that result in traffic stopping on the interface. The netfront/xn driver now seems to work reliably. Affected files ... .. //depot/projects/xen31/sys/dev/xen/netfront/netfront.c#9 edit Differences ... ==== //depot/projects/xen31/sys/dev/xen/netfront/netfront.c#9 (text+ko) ==== @@ -948,11 +948,13 @@ np->rx.rsp_cons = i; +#if 0 /* If we get a callback with very few responses, reduce fill target. */ /* NB. Note exponential increase, linear decrease. */ if (((np->rx.req_prod_pvt - np->rx.sring->rsp_prod) > ((3*np->rx_target) / 4)) && (--np->rx_target < np->rx_min_target)) np->rx_target = np->rx_min_target; +#endif network_alloc_rx_buffers(np); @@ -1039,10 +1041,12 @@ struct netfront_info *np = xsc; struct ifnet *ifp = np->xn_ifp; +#if 0 if (!(np->rx.rsp_cons != np->rx.sring->rsp_prod && likely(netfront_carrier_ok(np)) && ifp->if_drv_flags & IFF_DRV_RUNNING)) return; +#endif if (np->tx.rsp_cons != np->tx.sring->rsp_prod) { XN_TX_LOCK(np); xn_txeof(np); From owner-p4-projects@FreeBSD.ORG Thu Jan 17 10:08:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF34416A41B; Thu, 17 Jan 2008 10:08:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A4E6D16A419 for ; Thu, 17 Jan 2008 10:08:23 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 92C8B13C4EE for ; Thu, 17 Jan 2008 10:08:23 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0HA8NQq008904 for ; Thu, 17 Jan 2008 10:08:23 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0HA8Nmk008901 for perforce@freebsd.org; Thu, 17 Jan 2008 10:08:23 GMT (envelope-from scottl@freebsd.org) Date: Thu, 17 Jan 2008 10:08:23 GMT Message-Id: <200801171008.m0HA8Nmk008901@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 133468 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 10:08:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=133468 Change 133468 by scottl@scottl-ix on 2008/01/17 10:08:04 Stop stray interrupts from being fatal until their source can be tracked down and fixed. Affected files ... .. //depot/projects/xen31/sys/i386/i386/intr_machdep.c#3 edit Differences ... ==== //depot/projects/xen31/sys/i386/i386/intr_machdep.c#3 (text+ko) ==== @@ -395,7 +395,8 @@ /* Schedule the ithread if needed. */ if (thread) { error = intr_event_schedule_thread(ie); - KASSERT(error == 0, ("bad stray interrupt")); + if (error != 0) + log(LOG_CRIT, "bad stray interrupt %d", vector); } critical_exit(); td->td_intr_nesting_level--; From owner-p4-projects@FreeBSD.ORG Thu Jan 17 18:18:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C28F16A418; Thu, 17 Jan 2008 18:18:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9711816A46D for ; Thu, 17 Jan 2008 18:18:35 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A4EB013C448 for ; Thu, 17 Jan 2008 18:18:35 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0HIIZ76015132 for ; Thu, 17 Jan 2008 18:18:35 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0HIIZnF015129 for perforce@freebsd.org; Thu, 17 Jan 2008 18:18:35 GMT (envelope-from jhb@freebsd.org) Date: Thu, 17 Jan 2008 18:18:35 GMT Message-Id: <200801171818.m0HIIZnF015129@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 Cc: Subject: PERFORCE change 133485 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 18:18:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=133485 Change 133485 by jhb@jhb_mutex on 2008/01/17 18:18:04 Outsmart gcc so that we still exhaust the stack. Affected files ... .. //depot/projects/smpng/sys/modules/crash/crash.c#41 edit Differences ... ==== //depot/projects/smpng/sys/modules/crash/crash.c#41 (text+ko) ==== @@ -751,12 +751,25 @@ test_witness_order_funcs); #endif +static int blow_stack(void); + static int +eat_stack(void) +{ + u_int32_t dummy[128]; + + dummy[0] = arc4random(); + dummy[0] += blow_stack(); + return (dummy[0]); +} + +static int blow_stack(void) { - char dummy[512]; + u_int32_t dummy[128]; - dummy[0] += blow_stack(); + dummy[0] = arc4random(); + dummy[0] += eat_stack(); return (dummy[0]); } From owner-p4-projects@FreeBSD.ORG Thu Jan 17 20:47:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1E8816A41A; Thu, 17 Jan 2008 20:47:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F38016A418 for ; Thu, 17 Jan 2008 20:47:20 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A087B13C4D3 for ; Thu, 17 Jan 2008 20:47:20 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0HKlKpT027595 for ; Thu, 17 Jan 2008 20:47:20 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0HKlJTU027592 for perforce@freebsd.org; Thu, 17 Jan 2008 20:47:19 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 17 Jan 2008 20:47:19 GMT Message-Id: <200801172047.m0HKlJTU027592@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133496 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 20:47:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=133496 Change 133496 by kmacy@kmacy:storage:toehead on 2008/01/17 20:46:45 IFC 133494 Affected files ... .. //depot/projects/toehead/Makefile.inc1#2 integrate .. //depot/projects/toehead/gnu/usr.bin/cvs/Makefile#3 integrate .. //depot/projects/toehead/gnu/usr.bin/cvs/contrib/Makefile#3 integrate .. //depot/projects/toehead/lib/libc/amd64/_fpmath.h#2 integrate .. //depot/projects/toehead/lib/libc/i386/_fpmath.h#2 integrate .. //depot/projects/toehead/lib/libc/ia64/_fpmath.h#2 integrate .. //depot/projects/toehead/lib/libc/sys/access.2#2 integrate .. //depot/projects/toehead/lib/msun/src/math_private.h#3 integrate .. //depot/projects/toehead/share/man/man4/mfi.4#2 integrate .. //depot/projects/toehead/share/misc/pci_vendors#2 integrate .. //depot/projects/toehead/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/toehead/sys/amd64/include/_types.h#2 integrate .. //depot/projects/toehead/sys/amd64/include/float.h#2 integrate .. //depot/projects/toehead/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/toehead/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/toehead/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/toehead/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/toehead/sys/dev/acpica/acpi_hpet.h#1 branch .. //depot/projects/toehead/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/toehead/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/toehead/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/toehead/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/toehead/sys/i386/isa/clock.c#2 integrate .. //depot/projects/toehead/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/toehead/sys/kern/uipc_shm.c#2 integrate .. //depot/projects/toehead/sys/net/if_bridge.c#3 integrate .. //depot/projects/toehead/tools/regression/posixshm/Makefile#1 branch .. //depot/projects/toehead/tools/regression/posixshm/posixshm.c#1 branch .. //depot/projects/toehead/tools/regression/posixshm/posixshm.t#1 branch .. //depot/projects/toehead/tools/regression/posixshm/test.c#1 branch .. //depot/projects/toehead/tools/regression/posixshm/test.h#1 branch .. //depot/projects/toehead/tools/tools/aac/aac_checkq.c#2 integrate .. //depot/projects/toehead/usr.bin/systat/cmds.c#2 integrate .. //depot/projects/toehead/usr.bin/systat/convtbl.c#2 integrate .. //depot/projects/toehead/usr.bin/systat/devs.c#2 integrate .. //depot/projects/toehead/usr.bin/systat/fetch.c#2 integrate .. //depot/projects/toehead/usr.bin/systat/icmp.c#2 integrate .. //depot/projects/toehead/usr.bin/systat/icmp6.c#2 integrate .. //depot/projects/toehead/usr.bin/systat/iostat.c#2 integrate .. //depot/projects/toehead/usr.bin/systat/ip.c#2 integrate .. //depot/projects/toehead/usr.bin/systat/ip6.c#2 integrate .. //depot/projects/toehead/usr.bin/systat/keyboard.c#2 integrate .. //depot/projects/toehead/usr.bin/systat/main.c#2 integrate .. //depot/projects/toehead/usr.bin/systat/mbufs.c#2 integrate .. //depot/projects/toehead/usr.bin/systat/netcmds.c#2 integrate .. //depot/projects/toehead/usr.bin/systat/netstat.c#2 integrate .. //depot/projects/toehead/usr.bin/systat/pigs.c#2 integrate .. //depot/projects/toehead/usr.bin/systat/swap.c#2 integrate .. //depot/projects/toehead/usr.bin/systat/tcp.c#2 integrate .. //depot/projects/toehead/usr.bin/systat/vmstat.c#2 integrate Differences ... ==== //depot/projects/toehead/Makefile.inc1#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.591 2007/12/04 12:55:27 yar Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.592 2008/01/16 15:05:49 brueffer Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -227,7 +227,7 @@ # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - -DWITHOUT_FORTRAN -DWITHOUT_GDB + -DWITHOUT_GDB # world stage WMAKEENV= ${CROSSENV} \ ==== //depot/projects/toehead/gnu/usr.bin/cvs/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/gnu/usr.bin/cvs/Makefile,v 1.17 2008/01/13 08:58:25 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cvs/Makefile,v 1.18 2008/01/16 17:16:36 obrien Exp $ -SUBDIR = lib libdiff cvs cvsbug doc +SUBDIR = lib libdiff cvs contrib cvsbug doc .include ==== //depot/projects/toehead/gnu/usr.bin/cvs/contrib/Makefile#3 (text+ko) ==== @@ -1,4 +1,6 @@ -# $FreeBSD: src/gnu/usr.bin/cvs/contrib/Makefile,v 1.19 2008/01/13 09:45:53 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cvs/contrib/Makefile,v 1.20 2008/01/16 17:15:59 obrien Exp $ + +.POSIX: .include "../Makefile.inc" ==== //depot/projects/toehead/lib/libc/amd64/_fpmath.h#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/libc/amd64/_fpmath.h,v 1.6 2005/03/07 04:55:21 das Exp $ + * $FreeBSD: src/lib/libc/amd64/_fpmath.h,v 1.7 2008/01/17 16:39:06 bde Exp $ */ union IEEEl2bits { @@ -36,6 +36,11 @@ unsigned int junkl :16; unsigned int junkh :32; } bits; + struct { + unsigned long man :64; + unsigned int expsign :16; + unsigned long junk :48; + } xbits; }; #define LDBL_NBIT 0x80000000 @@ -47,4 +52,4 @@ #define LDBL_TO_ARRAY32(u, a) do { \ (a)[0] = (uint32_t)(u).bits.manl; \ (a)[1] = (uint32_t)(u).bits.manh; \ -} while(0) +} while (0) ==== //depot/projects/toehead/lib/libc/i386/_fpmath.h#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/libc/i386/_fpmath.h,v 1.5 2005/03/07 04:55:22 das Exp $ + * $FreeBSD: src/lib/libc/i386/_fpmath.h,v 1.6 2008/01/17 16:39:06 bde Exp $ */ union IEEEl2bits { @@ -35,6 +35,11 @@ unsigned int sign :1; unsigned int junk :16; } bits; + struct { + unsigned long long man :64; + unsigned int expsign :16; + unsigned int junk :16; + } xbits; }; #define LDBL_NBIT 0x80000000 @@ -46,4 +51,4 @@ #define LDBL_TO_ARRAY32(u, a) do { \ (a)[0] = (uint32_t)(u).bits.manl; \ (a)[1] = (uint32_t)(u).bits.manh; \ -} while(0) +} while (0) ==== //depot/projects/toehead/lib/libc/ia64/_fpmath.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/ia64/_fpmath.h,v 1.6 2005/03/07 04:55:40 das Exp $ + * $FreeBSD: src/lib/libc/ia64/_fpmath.h,v 1.7 2008/01/17 16:39:07 bde Exp $ */ #include @@ -46,6 +46,17 @@ unsigned int manl :32; #endif } bits; + struct { +#if _BYTE_ORDER == _LITTLE_ENDIAN + unsigned long man :64; + unsigned int expsign :16; + unsigned long junk :48; +#else /* _BIG_ENDIAN */ + unsigned long junk :48; + unsigned int expsign :16; + unsigned long man :64; +#endif + } xbits; }; #if _BYTE_ORDER == _LITTLE_ENDIAN @@ -68,4 +79,4 @@ #define LDBL_TO_ARRAY32(u, a) do { \ (a)[0] = (uint32_t)(u).bits.manl; \ (a)[1] = (uint32_t)(u).bits.manh; \ -} while(0) +} while (0) ==== //depot/projects/toehead/lib/libc/sys/access.2#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)access.2 8.2 (Berkeley) 4/1/94 -.\" $FreeBSD: src/lib/libc/sys/access.2,v 1.20 2007/12/08 22:50:35 remko Exp $ +.\" $FreeBSD: src/lib/libc/sys/access.2,v 1.21 2008/01/16 19:36:21 remko Exp $ .\" -.Dd December 8, 2007 +.Dd January 16, 2007 .Dt ACCESS 2 .Os .Sh NAME @@ -146,9 +146,9 @@ make sense for particular filesystem objects (e.g. 'delete' menu item only highlighted in a writable folder ... avoiding interpretation of the st_mode bits that the application might not understand -- -e.g. in the case of AFS). It also allows a cheaper file existance -test than -.Ns Xr stat 2 . +e.g. in the case of AFS). +It also allows a cheaper file existance test than +.Xr stat 2 . .Sh SEE ALSO .Xr chmod 2 , .Xr intro 2 , ==== //depot/projects/toehead/lib/msun/src/math_private.h#3 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math_private.h,v 1.21 2007/12/18 23:46:32 das Exp $ + * $FreeBSD: src/lib/msun/src/math_private.h,v 1.22 2008/01/17 17:02:11 bde Exp $ */ #ifndef _MATH_PRIVATE_H_ @@ -154,6 +154,22 @@ (d) = sf_u.value; \ } while (0) +#ifdef FLT_EVAL_METHOD +/* + * Attempt to get strict C99 semantics for assignment with non-C99 compilers. + */ +#if FLT_EVAL_METHOD == 0 || __GNUC__ == 0 +#define STRICT_ASSIGN(type, lval, rval) ((lval) = (rval)) +#else +#define STRICT_ASSIGN(type, lval, rval) do { \ + volatile type __lval; \ + \ + __lval = (rval); \ + (lval) = __lval; \ +} while (0) +#endif +#endif + /* * Common routine to process the arguments to nan(), nanf(), and nanl(). */ ==== //depot/projects/toehead/share/man/man4/mfi.4#2 (text) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mfi.4,v 1.6 2007/08/13 19:29:16 jhb Exp $ +.\" $FreeBSD: src/share/man/man4/mfi.4,v 1.7 2008/01/17 19:36:13 ambrisko Exp $ .\" -.Dd April 3, 2006 +.Dd January 17, 2008 .Dt MFI 4 .Os .Sh NAME @@ -83,7 +83,11 @@ .It LSI MegaRAID SAS 8480E .It -Dell PERC5/i +LSI MegaRAID SAS 1078 +.It +Dell PERC5 +.It +Dell PERC6 .El .Sh FILES .Bl -tag -width ".Pa /dev/mfid?" -compact ==== //depot/projects/toehead/share/misc/pci_vendors#2 (text+ko) ==== @@ -1,4 +1,4 @@ -; $FreeBSD: src/share/misc/pci_vendors,v 1.36 2007/10/29 00:31:09 benjsc Exp $ +; $FreeBSD: src/share/misc/pci_vendors,v 1.37 2008/01/17 19:29:01 ambrisko Exp $ ; ; Automatically generated by src/tools/tools/pciid/mk_pci_vendors.pl ; (with the -l option), using the following source lists: @@ -218,7 +218,7 @@ 005A SAS 3000 series, 6-port with 1066E -StorPort 005C SAS1064A PCI-X Fusion-MPT SAS 005E SAS 3000 series, 6-port with 1066 -StorPort - 0060 SAS1078 PCI-X Fusion-MPT SAS + 0060 MegaRAID SAS 1078 0062 LSISAS1078 PCI-Express Fusion-MPT SAS 008F 53C810 LSI 53C8xx SCSI host adapter chip 0407 MegaRAID ==== //depot/projects/toehead/sys/amd64/amd64/pmap.c#3 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.604 2008/01/14 21:25:06 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.605 2008/01/17 18:25:51 alc Exp $"); /* * Manages physical address maps. @@ -149,11 +149,7 @@ #define PMAP_SHPGPERPROC 200 #endif -#if defined(DIAGNOSTIC) -#define PMAP_DIAGNOSTIC -#endif - -#if !defined(PMAP_DIAGNOSTIC) +#if !defined(DIAGNOSTIC) #define PMAP_INLINE __gnu89_inline #else #define PMAP_INLINE @@ -2249,12 +2245,9 @@ boolean_t invlva; va = trunc_page(va); -#ifdef PMAP_DIAGNOSTIC - if (va > VM_MAX_KERNEL_ADDRESS) - panic("pmap_enter: toobig"); - if ((va >= UPT_MIN_ADDRESS) && (va < UPT_MAX_ADDRESS)) - panic("pmap_enter: invalid to pmap_enter page table pages (va: 0x%lx)", va); -#endif + KASSERT(va <= VM_MAX_KERNEL_ADDRESS, ("pmap_enter: toobig")); + KASSERT(va < UPT_MIN_ADDRESS || va >= UPT_MAX_ADDRESS, + ("pmap_enter: invalid to pmap_enter page table pages (va: 0x%lx)", va)); mpte = NULL; @@ -2268,19 +2261,9 @@ if (va < VM_MAXUSER_ADDRESS) { mpte = pmap_allocpte(pmap, va, M_WAITOK); } -#if 0 && defined(PMAP_DIAGNOSTIC) - else { - pd_entry_t *pdeaddr = pmap_pde(pmap, va); - origpte = *pdeaddr; - if ((origpte & PG_V) == 0) { - panic("pmap_enter: invalid kernel page table page, pde=%p, va=%p\n", - origpte, va); - } - } -#endif pde = pmap_pde(pmap, va); - if (pde != NULL) { + if (pde != NULL && (*pde & PG_V) != 0) { if ((*pde & PG_PS) != 0) panic("pmap_enter: attempted pmap_enter on 2MB page"); pte = pmap_pde_to_pte(pde, va); @@ -2291,7 +2274,7 @@ * Page Directory table entry not valid, we need a new PT page */ if (pte == NULL) - panic("pmap_enter: invalid page directory va=%#lx\n", va); + panic("pmap_enter: invalid page directory va=%#lx", va); pa = VM_PAGE_TO_PHYS(m); om = NULL; @@ -2745,8 +2728,8 @@ pdp_entry_t *pdpe; pd_entry_t srcptepaddr, *pde; - if (addr >= UPT_MIN_ADDRESS) - panic("pmap_copy: invalid to pmap_copy page tables"); + KASSERT(addr < UPT_MIN_ADDRESS, + ("pmap_copy: invalid to pmap_copy page tables")); pml4e = pmap_pml4e(src_pmap, addr); if ((*pml4e & PG_V) == 0) { @@ -2784,8 +2767,8 @@ } srcmpte = PHYS_TO_VM_PAGE(srcptepaddr & PG_FRAME); - if (srcmpte->wire_count == 0) - panic("pmap_copy: source page table page is unused"); + KASSERT(srcmpte->wire_count > 0, + ("pmap_copy: source page table page is unused")); if (va_next > end_addr) va_next = end_addr; ==== //depot/projects/toehead/sys/amd64/include/_types.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/amd64/include/_types.h,v 1.11 2006/01/09 06:05:56 imp Exp $ + * $FreeBSD: src/sys/amd64/include/_types.h,v 1.12 2008/01/17 13:12:46 bde Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -64,7 +64,7 @@ typedef unsigned int __cpumask_t; typedef __int64_t __critical_t; typedef double __double_t; -typedef double __float_t; +typedef float __float_t; typedef __int64_t __intfptr_t; typedef __int64_t __intmax_t; typedef __int64_t __intptr_t; ==== //depot/projects/toehead/sys/amd64/include/float.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 - * $FreeBSD: src/sys/amd64/include/float.h,v 1.15 2005/01/05 20:17:20 imp Exp $ + * $FreeBSD: src/sys/amd64/include/float.h,v 1.16 2008/01/17 13:12:46 bde Exp $ */ #ifndef _MACHINE_FLOAT_H_ @@ -42,7 +42,7 @@ #define FLT_RADIX 2 /* b */ #define FLT_ROUNDS __flt_rounds() #if __ISO_C_VISIBLE >= 1999 -#define FLT_EVAL_METHOD (-1) /* i387 semantics are...interesting */ +#define FLT_EVAL_METHOD 0 /* no promotions */ #define DECIMAL_DIG 21 /* max precision in decimal digits */ #endif ==== //depot/projects/toehead/sys/amd64/isa/clock.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.235 2007/10/26 03:23:53 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.236 2008/01/17 18:59:38 jhb Exp $"); /* * Routines to handle clock hardware. @@ -286,6 +286,7 @@ start = rdtsc(); end = start + (tsc_freq * n) / 1000000; do { + cpu_spinwait(); now = rdtsc(); } while (now < end || (now > start && end < start)); sched_unpin(); ==== //depot/projects/toehead/sys/arm/arm/pmap.c#4 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.96 2008/01/03 07:34:33 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.97 2008/01/17 12:41:59 cognet Exp $"); #include #include #include @@ -3828,7 +3828,8 @@ bzero(&pmap->pm_stats, sizeof pmap->pm_stats); pmap->pm_stats.resident_count = 1; if (vector_page < KERNBASE) { - pmap_enter(pmap, vector_page, PHYS_TO_VM_PAGE(systempage.pv_pa), + pmap_enter(pmap, vector_page, + VM_PROT_READ, PHYS_TO_VM_PAGE(systempage.pv_pa), VM_PROT_READ, 1); } return (1); ==== //depot/projects/toehead/sys/boot/forth/loader.conf.5#2 (text+ko) ==== @@ -22,8 +22,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.26 2005/11/18 10:34:24 ru Exp $ -.Dd November 15, 2005 +.\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.28 2008/01/16 07:00:55 keramida Exp $ +.Dd January 16, 2008 .Dt LOADER.CONF 5 .Os .Sh NAME @@ -238,6 +238,16 @@ .Xr boot 8 , .Xr loader 8 , .Xr loader.4th 8 +.Sh BUGS +The +.Xr loader 8 +stops reading +.Nm +when it encounters a syntax error, so any options which are vital for +booting a particular system (i.e.\& +.Dq Va hw.ata.ata_dma Ns "=0" ) +should precede any experimental additions to +.Nm . .Sh HISTORY The file .Nm ==== //depot/projects/toehead/sys/dev/acpica/acpi_hpet.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_hpet.c,v 1.13 2008/01/15 18:50:47 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_hpet.c,v 1.14 2008/01/16 18:47:07 jhb Exp $"); #include "opt_acpi.h" #include @@ -38,6 +38,7 @@ #include #include +#include ACPI_SERIAL_DECL(hpet, "ACPI HPET support"); @@ -58,12 +59,6 @@ static char *hpet_ids[] = { "PNP0103", NULL }; -#define HPET_MEM_WIDTH 0x400 /* Expected memory region size */ -#define HPET_OFFSET_INFO 0 /* Location of info in region */ -#define HPET_OFFSET_PERIOD 4 /* Location of period (1/hz) */ -#define HPET_OFFSET_ENABLE 0x10 /* Location of enable word */ -#define HPET_OFFSET_VALUE 0xf0 /* Location of actual timer value */ - #define DEV_HPET(x) (acpi_get_magic(x) == (uintptr_t)&acpi_hpet_devclass) struct timecounter hpet_timecounter = { @@ -79,25 +74,25 @@ struct acpi_hpet_softc *sc; sc = tc->tc_priv; - return (bus_read_4(sc->mem_res, HPET_OFFSET_VALUE)); + return (bus_read_4(sc->mem_res, HPET_MAIN_COUNTER)); } static void hpet_enable(struct acpi_hpet_softc *sc) { uint32_t val; - - val = bus_read_4(sc->mem_res, HPET_OFFSET_ENABLE); - bus_write_4(sc->mem_res, HPET_OFFSET_ENABLE, val | 1); + + val = bus_read_4(sc->mem_res, HPET_CONFIG); + bus_write_4(sc->mem_res, HPET_CONFIG, val | HPET_CNF_ENABLE); } static void hpet_disable(struct acpi_hpet_softc *sc) { uint32_t val; - - val = bus_read_4(sc->mem_res, HPET_OFFSET_ENABLE); - bus_write_4(sc->mem_res, HPET_OFFSET_ENABLE, val & ~1); + + val = bus_read_4(sc->mem_res, HPET_CONFIG); + bus_write_4(sc->mem_res, HPET_CONFIG, val & ~HPET_CNF_ENABLE); } /* Discover the HPET via the ACPI table of the same name. */ @@ -187,7 +182,7 @@ hpet_enable(sc); /* Read basic statistics about the timer. */ - val = bus_read_4(sc->mem_res, HPET_OFFSET_PERIOD); + val = bus_read_4(sc->mem_res, HPET_PERIOD); if (val == 0) { device_printf(dev, "invalid period\n"); hpet_disable(sc); @@ -197,12 +192,13 @@ freq = (1000000000000000LL + val / 2) / val; if (bootverbose) { - val = bus_read_4(sc->mem_res, HPET_OFFSET_INFO); + val = bus_read_4(sc->mem_res, HPET_CAPABILITIES); device_printf(dev, "vend: 0x%x rev: 0x%x num: %d hz: %jd opts:%s%s\n", - val >> 16, val & 0xff, (val >> 18) & 0xf, freq, - ((val >> 15) & 1) ? " leg_route" : "", - ((val >> 13) & 1) ? " count_size" : ""); + val >> 16, val & HPET_CAP_REV_ID, + (val & HPET_CAP_NUM_TIM) >> 8, freq, + (val & HPET_CAP_LEG_RT) ? " legacy_route" : "", + (val & HPET_CAP_COUNT_SIZE) ? " 64-bit" : ""); } if (testenv("debug.acpi.hpet_test")) @@ -212,9 +208,9 @@ * Don't attach if the timer never increments. Since the spec * requires it to be at least 10 MHz, it has to change in 1 us. */ - val = bus_read_4(sc->mem_res, HPET_OFFSET_VALUE); + val = bus_read_4(sc->mem_res, HPET_MAIN_COUNTER); DELAY(1); - val2 = bus_read_4(sc->mem_res, HPET_OFFSET_VALUE); + val2 = bus_read_4(sc->mem_res, HPET_MAIN_COUNTER); if (val == val2) { device_printf(dev, "HPET never increments, disabling\n"); hpet_disable(sc); @@ -278,11 +274,11 @@ binuptime(&b0); binuptime(&b0); binuptime(&b1); - u1 = bus_read_4(sc->mem_res, HPET_OFFSET_VALUE); + u1 = bus_read_4(sc->mem_res, HPET_MAIN_COUNTER); for (i = 1; i < 1000; i++) - u2 = bus_read_4(sc->mem_res, HPET_OFFSET_VALUE); + u2 = bus_read_4(sc->mem_res, HPET_MAIN_COUNTER); binuptime(&b2); - u2 = bus_read_4(sc->mem_res, HPET_OFFSET_VALUE); + u2 = bus_read_4(sc->mem_res, HPET_MAIN_COUNTER); bintime_sub(&b2, &b1); bintime_sub(&b1, &b0); ==== //depot/projects/toehead/sys/dev/cxgb/cxgb_main.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.46 2008/01/15 03:27:41 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.47 2008/01/16 21:33:34 kmacy Exp $"); #include #include @@ -1772,15 +1772,15 @@ break; case SIOCSIFADDR: case SIOCGIFADDR: - PORT_LOCK(p); if (ifa->ifa_addr->sa_family == AF_INET) { + PORT_LOCK(p); ifp->if_flags |= IFF_UP; if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) cxgb_init_locked(p); arp_ifinit(ifp, ifa); + PORT_UNLOCK(p); } else error = ether_ioctl(ifp, command, data); - PORT_UNLOCK(p); break; case SIOCSIFFLAGS: callout_drain(&p->adapter->cxgb_tick_ch); ==== //depot/projects/toehead/sys/dev/drm/drm_drv.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/drm_drv.c,v 1.6 2006/09/07 23:04:47 anholt Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/drm_drv.c,v 1.7 2008/01/16 13:54:40 remko Exp $"); #include "dev/drm/drmP.h" #include "dev/drm/drm.h" @@ -711,6 +711,9 @@ return EINVAL; } + if (--priv->refs != 0) + goto done; + if (dev->driver.preclose != NULL) dev->driver.preclose(dev, filp); @@ -786,17 +789,17 @@ dev->buf_pgid = 0; #endif /* __NetBSD__ || __OpenBSD__ */ - if (--priv->refs == 0) { - if (dev->driver.postclose != NULL) - dev->driver.postclose(dev, priv); - TAILQ_REMOVE(&dev->files, priv, link); - free(priv, M_DRM); - } + if (dev->driver.postclose != NULL) + dev->driver.postclose(dev, priv); + + TAILQ_REMOVE(&dev->files, priv, link); + free(priv, M_DRM); /* ======================================================== * End inline drm_release */ + done: atomic_inc( &dev->counts[_DRM_STAT_CLOSES] ); #ifdef __FreeBSD__ device_unbusy(dev->device); ==== //depot/projects/toehead/sys/dev/if_ndis/if_ndis.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.130 2007/12/09 20:14:01 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.131 2008/01/17 20:11:58 jhb Exp $"); #include #include @@ -3264,7 +3264,7 @@ return; } - tsleep(&error, PWAIT, "ssidscan", hz * 3); + pause("ssidscan", hz * 3); if (!NDIS_INITIALIZED(sc)) /* The interface was downed while we were sleeping */ return; ==== //depot/projects/toehead/sys/i386/i386/pmap.c#3 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.607 2008/01/14 22:51:43 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.608 2008/01/17 18:25:52 alc Exp $"); /* * Manages physical address maps. @@ -158,11 +158,7 @@ #define PMAP_SHPGPERPROC 200 #endif -#if defined(DIAGNOSTIC) -#define PMAP_DIAGNOSTIC -#endif - -#if !defined(PMAP_DIAGNOSTIC) +#if !defined(DIAGNOSTIC) #define PMAP_INLINE __gnu89_inline #else #define PMAP_INLINE @@ -2308,12 +2304,9 @@ boolean_t invlva; va = trunc_page(va); -#ifdef PMAP_DIAGNOSTIC - if (va > VM_MAX_KERNEL_ADDRESS) - panic("pmap_enter: toobig"); - if ((va >= UPT_MIN_ADDRESS) && (va < UPT_MAX_ADDRESS)) - panic("pmap_enter: invalid to pmap_enter page table pages (va: 0x%x)", va); -#endif + KASSERT(va <= VM_MAX_KERNEL_ADDRESS, ("pmap_enter: toobig")); + KASSERT(va < UPT_MIN_ADDRESS || va >= UPT_MAX_ADDRESS, + ("pmap_enter: invalid to pmap_enter page table pages (va: 0x%x)", va)); mpte = NULL; @@ -2328,16 +2321,6 @@ if (va < VM_MAXUSER_ADDRESS) { mpte = pmap_allocpte(pmap, va, M_WAITOK); } -#if 0 && defined(PMAP_DIAGNOSTIC) - else { - pd_entry_t *pdeaddr = pmap_pde(pmap, va); - origpte = *pdeaddr; - if ((origpte & PG_V) == 0) { - panic("pmap_enter: invalid kernel page table page, pdir=%p, pde=%p, va=%p\n", - pmap->pm_pdir[PTDPTDI], origpte, va); - } - } -#endif pde = pmap_pde(pmap, va); if ((*pde & PG_PS) != 0) @@ -2348,7 +2331,7 @@ * Page Directory table entry not valid, we need a new PT page */ if (pte == NULL) { - panic("pmap_enter: invalid page directory pdir=%#jx, va=%#x\n", + panic("pmap_enter: invalid page directory pdir=%#jx, va=%#x", (uintmax_t)pmap->pm_pdir[PTDPTDI], va); } @@ -2795,8 +2778,8 @@ pd_entry_t srcptepaddr; unsigned ptepindex; - if (addr >= UPT_MIN_ADDRESS) - panic("pmap_copy: invalid to pmap_copy page tables"); + KASSERT(addr < UPT_MIN_ADDRESS, + ("pmap_copy: invalid to pmap_copy page tables")); pdnxt = (addr + NBPDR) & ~PDRMASK; ptepindex = addr >> PDRSHIFT; @@ -2816,8 +2799,8 @@ } srcmpte = PHYS_TO_VM_PAGE(srcptepaddr & PG_FRAME); - if (srcmpte->wire_count == 0) - panic("pmap_copy: source page table page is unused"); + KASSERT(srcmpte->wire_count > 0, + ("pmap_copy: source page table page is unused")); if (pdnxt > end_addr) pdnxt = end_addr; ==== //depot/projects/toehead/sys/i386/isa/clock.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.240 2007/10/26 03:23:54 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.241 2008/01/17 18:59:38 jhb Exp $"); /* * Routines to handle clock hardware. @@ -291,6 +291,7 @@ start = rdtsc(); end = start + (tsc_freq * n) / 1000000; do { + cpu_spinwait(); now = rdtsc(); } while (now < end || (now > start && end < start)); sched_unpin(); ==== //depot/projects/toehead/sys/kern/kern_rwlock.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_rwlock.c,v 1.33 2007/12/15 23:13:31 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_rwlock.c,v 1.34 2008/01/17 20:15:15 jhb Exp $"); #include "opt_ddb.h" #include "opt_no_adaptive_rwlocks.h" @@ -806,7 +806,7 @@ (v & RW_LOCK_WRITE_WAITERS)); if (v & RW_LOCK_READ_WAITERS) turnstile_unpend(ts, TS_EXCLUSIVE_LOCK); - else if (ts) + else turnstile_disown(ts); turnstile_chain_unlock(&rw->lock_object); out: ==== //depot/projects/toehead/sys/kern/uipc_shm.c#2 (text+ko) ==== @@ -31,9 +31,6 @@ * * TODO: * - * (1) Convert test utilities into regression tests and import them into - * src/tools/regression. - * * (2) Need to export data to a userland tool via a sysctl. Should ipcs(1) * and ipcrm(1) be expanded or should new tools to manage both POSIX * kernel semaphores and POSIX shared memory be written? @@ -52,7 +49,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_shm.c,v 1.1 2008/01/08 21:58:15 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_shm.c,v 1.2 2008/01/16 15:51:23 jhb Exp $"); #include "opt_mac.h" ==== //depot/projects/toehead/sys/net/if_bridge.c#3 (text+ko) ==== @@ -47,11 +47,6 @@ * 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 Jason L. Wright - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -80,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.109 2007/12/18 09:13:04 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.110 2008/01/17 09:46:16 thompsa Exp $"); #include "opt_inet.h" #include "opt_inet6.h" ==== //depot/projects/toehead/tools/tools/aac/aac_checkq.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/tools/tools/aac/aac_checkq.c,v 1.3 2005/11/06 15:47:06 maxim Exp $"); +__FBSDID("$FreeBSD: src/tools/tools/aac/aac_checkq.c,v 1.4 2008/01/17 18:59:59 emaste Exp $"); #include #include @@ -33,6 +33,8 @@ #include #include +#include +#include /* * Simple program to print out the queue stats on the given queue index. ==== //depot/projects/toehead/usr.bin/systat/cmds.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #include -__FBSDID("$FreeBSD: src/usr.bin/systat/cmds.c,v 1.5 2003/01/04 21:58:25 phk Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/systat/cmds.c,v 1.6 2008/01/16 19:27:42 delphij Exp $"); #ifdef lint static const char sccsid[] = "@(#)cmds.c 8.2 (Berkeley) 4/29/95"; @@ -49,8 +49,7 @@ #include "extern.h" void -command(cmd) - const char *cmd; +command(const char *cmd) { struct cmdtab *p; char *cp, *tmpstr, *tmpstr1; @@ -150,8 +149,7 @@ } struct cmdtab * -lookup(name) - const char *name; +lookup(const char *name) { const char *p, *q; struct cmdtab *ct, *found; @@ -179,7 +177,7 @@ } void -status() +status(void) { error("Showing %s, refresh every %d seconds.", @@ -187,8 +185,7 @@ } int -prefix(s1, s2) - const char *s1, *s2; +prefix(const char *s1, const char *s2) { while (*s1 == *s2) { ==== //depot/projects/toehead/usr.bin/systat/convtbl.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/usr.bin/systat/convtbl.c,v 1.12 2007/01/18 09:24:08 ru Exp $ + * $FreeBSD: src/usr.bin/systat/convtbl.c,v 1.13 2008/01/16 19:27:42 delphij Exp $ */ #include @@ -126,7 +126,7 @@ } const char * -get_helplist() +get_helplist(void) { int i; size_t len; ==== //depot/projects/toehead/usr.bin/systat/devs.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 17 22:05:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62C8C16A41A; Thu, 17 Jan 2008 22:05:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 27F3016A417 for ; Thu, 17 Jan 2008 22:05:49 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3B1E813C469 for ; Thu, 17 Jan 2008 22:05:49 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0HM5nt3040010 for ; Thu, 17 Jan 2008 22:05:49 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0HM5m4x040006 for perforce@freebsd.org; Thu, 17 Jan 2008 22:05:48 GMT (envelope-from scottl@freebsd.org) Date: Thu, 17 Jan 2008 22:05:48 GMT Message-Id: <200801172205.m0HM5m4x040006@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 133506 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 22:05:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=133506 Change 133506 by scottl@scottl-ix on 2008/01/17 22:05:01 Remove an unused mutex. Affected files ... .. //depot/projects/xen31/sys/dev/xen/blkfront/blkfront.c#12 edit Differences ... ==== //depot/projects/xen31/sys/dev/xen/blkfront/blkfront.c#12 (text+ko) ==== @@ -109,8 +109,6 @@ #define MAXIMUM_OUTSTANDING_BLOCK_REQS \ (BLKIF_MAX_SEGMENTS_PER_REQUEST * BLK_RING_SIZE) -static struct mtx blkif_io_block_lock; - static void kick_pending_request_queues(struct blkfront_info *); static int blkif_open(struct disk *dp); static int blkif_close(struct disk *dp); @@ -234,7 +232,6 @@ { int err, vdevice, i; struct blkfront_info *info; - /* FIXME: Use dynamic device id if this is not set. */ err = xenbus_scanf(XBT_NIL, dev->nodename, @@ -1004,7 +1001,6 @@ } MTX_SYSINIT(ioreq, &blkif_io_lock, "BIO LOCK", MTX_NOWITNESS); /* XXX how does one enroll a lock? */ -MTX_SYSINIT(ioreq_block, &blkif_io_block_lock, "BIO BLOCK LOCK", MTX_SPIN | MTX_NOWITNESS); SYSINIT(xbdev, SI_SUB_PSEUDO, SI_ORDER_SECOND, xenbus_init, NULL); From owner-p4-projects@FreeBSD.ORG Thu Jan 17 22:44:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D313516A41A; Thu, 17 Jan 2008 22:44:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C1E516A418 for ; Thu, 17 Jan 2008 22:44:30 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5851B13C44B for ; Thu, 17 Jan 2008 22:44:30 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0HMiUvP076217 for ; Thu, 17 Jan 2008 22:44:30 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0HMiT9t076195 for perforce@freebsd.org; Thu, 17 Jan 2008 22:44:29 GMT (envelope-from scottl@freebsd.org) Date: Thu, 17 Jan 2008 22:44:29 GMT Message-Id: <200801172244.m0HMiT9t076195@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 133507 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 22:44:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=133507 Change 133507 by scottl@scottl-ix on 2008/01/17 22:43:59 Start a branch off of xen31 for doing newbus work Affected files ... .. //depot/projects/xen31-xenbus/COPYRIGHT#1 branch .. //depot/projects/xen31-xenbus/LOCKS#1 branch .. //depot/projects/xen31-xenbus/MAINTAINERS#1 branch .. //depot/projects/xen31-xenbus/Makefile#1 branch .. //depot/projects/xen31-xenbus/Makefile.inc1#1 branch .. //depot/projects/xen31-xenbus/ObsoleteFiles.inc#1 branch .. //depot/projects/xen31-xenbus/README#1 branch .. //depot/projects/xen31-xenbus/UPDATING#1 branch .. //depot/projects/xen31-xenbus/bin/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/Makefile.inc#1 branch .. //depot/projects/xen31-xenbus/bin/cat/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/cat/cat.1#1 branch .. //depot/projects/xen31-xenbus/bin/cat/cat.c#1 branch .. //depot/projects/xen31-xenbus/bin/chflags/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/chflags/chflags.1#1 branch .. //depot/projects/xen31-xenbus/bin/chflags/chflags.c#1 branch .. //depot/projects/xen31-xenbus/bin/chio/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/chio/chio.1#1 branch .. //depot/projects/xen31-xenbus/bin/chio/chio.c#1 branch .. //depot/projects/xen31-xenbus/bin/chio/defs.h#1 branch .. //depot/projects/xen31-xenbus/bin/chio/pathnames.h#1 branch .. //depot/projects/xen31-xenbus/bin/chmod/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/chmod/chmod.1#1 branch .. //depot/projects/xen31-xenbus/bin/chmod/chmod.c#1 branch .. //depot/projects/xen31-xenbus/bin/cp/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/cp/cp.1#1 branch .. //depot/projects/xen31-xenbus/bin/cp/cp.c#1 branch .. //depot/projects/xen31-xenbus/bin/cp/extern.h#1 branch .. //depot/projects/xen31-xenbus/bin/cp/utils.c#1 branch .. //depot/projects/xen31-xenbus/bin/csh/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/xen31-xenbus/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/xen31-xenbus/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/xen31-xenbus/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/xen31-xenbus/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/xen31-xenbus/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/xen31-xenbus/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/xen31-xenbus/bin/csh/config.h#1 branch .. //depot/projects/xen31-xenbus/bin/csh/config_p.h#1 branch .. //depot/projects/xen31-xenbus/bin/csh/host.defs#1 branch .. //depot/projects/xen31-xenbus/bin/csh/iconv.h#1 branch .. //depot/projects/xen31-xenbus/bin/csh/iconv_stub.c#1 branch .. //depot/projects/xen31-xenbus/bin/date/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/date/date.1#1 branch .. //depot/projects/xen31-xenbus/bin/date/date.c#1 branch .. //depot/projects/xen31-xenbus/bin/date/extern.h#1 branch .. //depot/projects/xen31-xenbus/bin/date/netdate.c#1 branch .. //depot/projects/xen31-xenbus/bin/date/vary.c#1 branch .. //depot/projects/xen31-xenbus/bin/date/vary.h#1 branch .. //depot/projects/xen31-xenbus/bin/dd/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/dd/args.c#1 branch .. //depot/projects/xen31-xenbus/bin/dd/conv.c#1 branch .. //depot/projects/xen31-xenbus/bin/dd/conv_tab.c#1 branch .. //depot/projects/xen31-xenbus/bin/dd/dd.1#1 branch .. //depot/projects/xen31-xenbus/bin/dd/dd.c#1 branch .. //depot/projects/xen31-xenbus/bin/dd/dd.h#1 branch .. //depot/projects/xen31-xenbus/bin/dd/extern.h#1 branch .. //depot/projects/xen31-xenbus/bin/dd/gen.c#1 branch .. //depot/projects/xen31-xenbus/bin/dd/misc.c#1 branch .. //depot/projects/xen31-xenbus/bin/dd/position.c#1 branch .. //depot/projects/xen31-xenbus/bin/dd/ref.ascii#1 branch .. //depot/projects/xen31-xenbus/bin/dd/ref.ebcdic#1 branch .. //depot/projects/xen31-xenbus/bin/dd/ref.ibm#1 branch .. //depot/projects/xen31-xenbus/bin/dd/ref.lcase#1 branch .. //depot/projects/xen31-xenbus/bin/dd/ref.oldascii#1 branch .. //depot/projects/xen31-xenbus/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/xen31-xenbus/bin/dd/ref.oldibm#1 branch .. //depot/projects/xen31-xenbus/bin/dd/ref.pareven#1 branch .. //depot/projects/xen31-xenbus/bin/dd/ref.parnone#1 branch .. //depot/projects/xen31-xenbus/bin/dd/ref.parodd#1 branch .. //depot/projects/xen31-xenbus/bin/dd/ref.parset#1 branch .. //depot/projects/xen31-xenbus/bin/dd/ref.swab#1 branch .. //depot/projects/xen31-xenbus/bin/dd/ref.ucase#1 branch .. //depot/projects/xen31-xenbus/bin/df/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/df/df.1#1 branch .. //depot/projects/xen31-xenbus/bin/df/df.c#1 branch .. //depot/projects/xen31-xenbus/bin/domainname/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/domainname/domainname.1#1 branch .. //depot/projects/xen31-xenbus/bin/domainname/domainname.c#1 branch .. //depot/projects/xen31-xenbus/bin/echo/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/echo/echo.1#1 branch .. //depot/projects/xen31-xenbus/bin/echo/echo.c#1 branch .. //depot/projects/xen31-xenbus/bin/ed/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/ed/POSIX#1 branch .. //depot/projects/xen31-xenbus/bin/ed/README#1 branch .. //depot/projects/xen31-xenbus/bin/ed/buf.c#1 branch .. //depot/projects/xen31-xenbus/bin/ed/cbc.c#1 branch .. //depot/projects/xen31-xenbus/bin/ed/ed.1#1 branch .. //depot/projects/xen31-xenbus/bin/ed/ed.h#1 branch .. //depot/projects/xen31-xenbus/bin/ed/glbl.c#1 branch .. //depot/projects/xen31-xenbus/bin/ed/io.c#1 branch .. //depot/projects/xen31-xenbus/bin/ed/main.c#1 branch .. //depot/projects/xen31-xenbus/bin/ed/re.c#1 branch .. //depot/projects/xen31-xenbus/bin/ed/sub.c#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/=.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/README#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/TODO#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/a.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/a.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/a.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/a1.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/a2.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/addr.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/addr.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/addr.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/addr1.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/addr2.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/ascii.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/bang1.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/bang1.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/bang1.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/bang1.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/bang2.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/c.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/c.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/c.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/c1.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/c2.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/d.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/d.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/d.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/d.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/e1.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/e1.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/e1.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/e1.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/e2.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/e2.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/e2.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/e2.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/e3.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/e3.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/e3.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/e3.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/e4.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/e4.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/e4.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/f1.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/f2.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/g1.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/g1.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/g1.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/g1.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/g2.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/g2.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/g2.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/g2.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/g3.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/g3.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/g3.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/g3.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/g4.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/g4.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/g4.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/g5.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/g5.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/g5.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/h.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/i.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/i.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/i.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/i1.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/i2.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/i3.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/j.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/j.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/j.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/k.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/k.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/k.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/k1.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/k2.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/k3.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/k4.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/l.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/l.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/l.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/m.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/m.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/m.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/m.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/n.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/n.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/n.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/nl.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/nl1.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/nl1.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/nl1.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/nl2.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/nl2.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/nl2.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/p.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/p.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/p.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/q.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/q.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/q.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/q1.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/r1.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/r1.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/r1.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/r1.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/r2.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/r2.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/r2.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/r2.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/r3.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/r3.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/r3.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/s1.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/s1.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/s1.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/s1.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/s10.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/s2.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/s2.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/s2.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/s2.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/s3.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/s3.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/s3.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/s3.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/s4.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/s5.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/s6.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/s7.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/s8.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/s9.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/t.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/t.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/t1.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/t1.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/t1.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/t1.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/t2.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/t2.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/t2.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/t2.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/u.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/u.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/u.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/u.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/v.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/v.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/v.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/w.d#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/w.r#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/w.t#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/w1.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/w2.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/w3.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/x.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/test/z.err#1 branch .. //depot/projects/xen31-xenbus/bin/ed/undo.c#1 branch .. //depot/projects/xen31-xenbus/bin/expr/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/expr/expr.1#1 branch .. //depot/projects/xen31-xenbus/bin/expr/expr.y#1 branch .. //depot/projects/xen31-xenbus/bin/getfacl/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/getfacl/getfacl.1#1 branch .. //depot/projects/xen31-xenbus/bin/getfacl/getfacl.c#1 branch .. //depot/projects/xen31-xenbus/bin/hostname/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/hostname/hostname.1#1 branch .. //depot/projects/xen31-xenbus/bin/hostname/hostname.c#1 branch .. //depot/projects/xen31-xenbus/bin/kenv/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/kenv/kenv.1#1 branch .. //depot/projects/xen31-xenbus/bin/kenv/kenv.c#1 branch .. //depot/projects/xen31-xenbus/bin/kill/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/kill/kill.1#1 branch .. //depot/projects/xen31-xenbus/bin/kill/kill.c#1 branch .. //depot/projects/xen31-xenbus/bin/ln/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/ln/ln.1#1 branch .. //depot/projects/xen31-xenbus/bin/ln/ln.c#1 branch .. //depot/projects/xen31-xenbus/bin/ln/symlink.7#1 branch .. //depot/projects/xen31-xenbus/bin/ls/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/ls/cmp.c#1 branch .. //depot/projects/xen31-xenbus/bin/ls/extern.h#1 branch .. //depot/projects/xen31-xenbus/bin/ls/ls.1#1 branch .. //depot/projects/xen31-xenbus/bin/ls/ls.c#1 branch .. //depot/projects/xen31-xenbus/bin/ls/ls.h#1 branch .. //depot/projects/xen31-xenbus/bin/ls/print.c#1 branch .. //depot/projects/xen31-xenbus/bin/ls/util.c#1 branch .. //depot/projects/xen31-xenbus/bin/mkdir/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/mkdir/mkdir.1#1 branch .. //depot/projects/xen31-xenbus/bin/mkdir/mkdir.c#1 branch .. //depot/projects/xen31-xenbus/bin/mv/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/mv/mv.1#1 branch .. //depot/projects/xen31-xenbus/bin/mv/mv.c#1 branch .. //depot/projects/xen31-xenbus/bin/pax/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/pax/ar_io.c#1 branch .. //depot/projects/xen31-xenbus/bin/pax/ar_subs.c#1 branch .. //depot/projects/xen31-xenbus/bin/pax/buf_subs.c#1 branch .. //depot/projects/xen31-xenbus/bin/pax/cache.c#1 branch .. //depot/projects/xen31-xenbus/bin/pax/cache.h#1 branch .. //depot/projects/xen31-xenbus/bin/pax/cpio.1#1 branch .. //depot/projects/xen31-xenbus/bin/pax/cpio.c#1 branch .. //depot/projects/xen31-xenbus/bin/pax/cpio.h#1 branch .. //depot/projects/xen31-xenbus/bin/pax/extern.h#1 branch .. //depot/projects/xen31-xenbus/bin/pax/file_subs.c#1 branch .. //depot/projects/xen31-xenbus/bin/pax/ftree.c#1 branch .. //depot/projects/xen31-xenbus/bin/pax/ftree.h#1 branch .. //depot/projects/xen31-xenbus/bin/pax/gen_subs.c#1 branch .. //depot/projects/xen31-xenbus/bin/pax/getoldopt.c#1 branch .. //depot/projects/xen31-xenbus/bin/pax/options.c#1 branch .. //depot/projects/xen31-xenbus/bin/pax/options.h#1 branch .. //depot/projects/xen31-xenbus/bin/pax/pat_rep.c#1 branch .. //depot/projects/xen31-xenbus/bin/pax/pat_rep.h#1 branch .. //depot/projects/xen31-xenbus/bin/pax/pax.1#1 branch .. //depot/projects/xen31-xenbus/bin/pax/pax.c#1 branch .. //depot/projects/xen31-xenbus/bin/pax/pax.h#1 branch .. //depot/projects/xen31-xenbus/bin/pax/sel_subs.c#1 branch .. //depot/projects/xen31-xenbus/bin/pax/sel_subs.h#1 branch .. //depot/projects/xen31-xenbus/bin/pax/tables.c#1 branch .. //depot/projects/xen31-xenbus/bin/pax/tables.h#1 branch .. //depot/projects/xen31-xenbus/bin/pax/tar.1#1 branch .. //depot/projects/xen31-xenbus/bin/pax/tar.c#1 branch .. //depot/projects/xen31-xenbus/bin/pax/tar.h#1 branch .. //depot/projects/xen31-xenbus/bin/pax/tty_subs.c#1 branch .. //depot/projects/xen31-xenbus/bin/ps/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/ps/extern.h#1 branch .. //depot/projects/xen31-xenbus/bin/ps/fmt.c#1 branch .. //depot/projects/xen31-xenbus/bin/ps/keyword.c#1 branch .. //depot/projects/xen31-xenbus/bin/ps/nlist.c#1 branch .. //depot/projects/xen31-xenbus/bin/ps/print.c#1 branch .. //depot/projects/xen31-xenbus/bin/ps/ps.1#1 branch .. //depot/projects/xen31-xenbus/bin/ps/ps.c#1 branch .. //depot/projects/xen31-xenbus/bin/ps/ps.h#1 branch .. //depot/projects/xen31-xenbus/bin/pwd/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/pwd/pwd.1#1 branch .. //depot/projects/xen31-xenbus/bin/pwd/pwd.c#1 branch .. //depot/projects/xen31-xenbus/bin/rcp/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/rcp/extern.h#1 branch .. //depot/projects/xen31-xenbus/bin/rcp/rcp.1#1 branch .. //depot/projects/xen31-xenbus/bin/rcp/rcp.c#1 branch .. //depot/projects/xen31-xenbus/bin/rcp/util.c#1 branch .. //depot/projects/xen31-xenbus/bin/realpath/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/realpath/realpath.1#1 branch .. //depot/projects/xen31-xenbus/bin/realpath/realpath.c#1 branch .. //depot/projects/xen31-xenbus/bin/rm/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/rm/rm.1#1 branch .. //depot/projects/xen31-xenbus/bin/rm/rm.c#1 branch .. //depot/projects/xen31-xenbus/bin/rmail/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/rmdir/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/rmdir/rmdir.1#1 branch .. //depot/projects/xen31-xenbus/bin/rmdir/rmdir.c#1 branch .. //depot/projects/xen31-xenbus/bin/setfacl/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/setfacl/file.c#1 branch .. //depot/projects/xen31-xenbus/bin/setfacl/mask.c#1 branch .. //depot/projects/xen31-xenbus/bin/setfacl/merge.c#1 branch .. //depot/projects/xen31-xenbus/bin/setfacl/remove.c#1 branch .. //depot/projects/xen31-xenbus/bin/setfacl/setfacl.1#1 branch .. //depot/projects/xen31-xenbus/bin/setfacl/setfacl.c#1 branch .. //depot/projects/xen31-xenbus/bin/setfacl/setfacl.h#1 branch .. //depot/projects/xen31-xenbus/bin/setfacl/util.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/sh/TOUR#1 branch .. //depot/projects/xen31-xenbus/bin/sh/alias.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/alias.h#1 branch .. //depot/projects/xen31-xenbus/bin/sh/arith.h#1 branch .. //depot/projects/xen31-xenbus/bin/sh/arith.y#1 branch .. //depot/projects/xen31-xenbus/bin/sh/arith_lex.l#1 branch .. //depot/projects/xen31-xenbus/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/xen31-xenbus/bin/sh/bltin/echo.1#1 branch .. //depot/projects/xen31-xenbus/bin/sh/bltin/echo.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/builtins.def#1 branch .. //depot/projects/xen31-xenbus/bin/sh/cd.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/cd.h#1 branch .. //depot/projects/xen31-xenbus/bin/sh/error.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/error.h#1 branch .. //depot/projects/xen31-xenbus/bin/sh/eval.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/eval.h#1 branch .. //depot/projects/xen31-xenbus/bin/sh/exec.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/exec.h#1 branch .. //depot/projects/xen31-xenbus/bin/sh/expand.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/expand.h#1 branch .. //depot/projects/xen31-xenbus/bin/sh/funcs/cmv#1 branch .. //depot/projects/xen31-xenbus/bin/sh/funcs/dirs#1 branch .. //depot/projects/xen31-xenbus/bin/sh/funcs/kill#1 branch .. //depot/projects/xen31-xenbus/bin/sh/funcs/login#1 branch .. //depot/projects/xen31-xenbus/bin/sh/funcs/newgrp#1 branch .. //depot/projects/xen31-xenbus/bin/sh/funcs/popd#1 branch .. //depot/projects/xen31-xenbus/bin/sh/funcs/pushd#1 branch .. //depot/projects/xen31-xenbus/bin/sh/funcs/suspend#1 branch .. //depot/projects/xen31-xenbus/bin/sh/histedit.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/init.h#1 branch .. //depot/projects/xen31-xenbus/bin/sh/input.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/input.h#1 branch .. //depot/projects/xen31-xenbus/bin/sh/jobs.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/jobs.h#1 branch .. //depot/projects/xen31-xenbus/bin/sh/mail.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/mail.h#1 branch .. //depot/projects/xen31-xenbus/bin/sh/main.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/main.h#1 branch .. //depot/projects/xen31-xenbus/bin/sh/memalloc.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/memalloc.h#1 branch .. //depot/projects/xen31-xenbus/bin/sh/miscbltin.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/mkbuiltins#1 branch .. //depot/projects/xen31-xenbus/bin/sh/mkinit.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/mknodes.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/mksyntax.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/mktokens#1 branch .. //depot/projects/xen31-xenbus/bin/sh/myhistedit.h#1 branch .. //depot/projects/xen31-xenbus/bin/sh/mystring.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/mystring.h#1 branch .. //depot/projects/xen31-xenbus/bin/sh/nodes.c.pat#1 branch .. //depot/projects/xen31-xenbus/bin/sh/nodetypes#1 branch .. //depot/projects/xen31-xenbus/bin/sh/options.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/options.h#1 branch .. //depot/projects/xen31-xenbus/bin/sh/output.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/output.h#1 branch .. //depot/projects/xen31-xenbus/bin/sh/parser.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/parser.h#1 branch .. //depot/projects/xen31-xenbus/bin/sh/redir.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/redir.h#1 branch .. //depot/projects/xen31-xenbus/bin/sh/sh.1#1 branch .. //depot/projects/xen31-xenbus/bin/sh/shell.h#1 branch .. //depot/projects/xen31-xenbus/bin/sh/show.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/show.h#1 branch .. //depot/projects/xen31-xenbus/bin/sh/trap.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/trap.h#1 branch .. //depot/projects/xen31-xenbus/bin/sh/var.c#1 branch .. //depot/projects/xen31-xenbus/bin/sh/var.h#1 branch .. //depot/projects/xen31-xenbus/bin/sleep/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/sleep/sleep.1#1 branch .. //depot/projects/xen31-xenbus/bin/sleep/sleep.c#1 branch .. //depot/projects/xen31-xenbus/bin/stty/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/stty/cchar.c#1 branch .. //depot/projects/xen31-xenbus/bin/stty/extern.h#1 branch .. //depot/projects/xen31-xenbus/bin/stty/gfmt.c#1 branch .. //depot/projects/xen31-xenbus/bin/stty/key.c#1 branch .. //depot/projects/xen31-xenbus/bin/stty/modes.c#1 branch .. //depot/projects/xen31-xenbus/bin/stty/print.c#1 branch .. //depot/projects/xen31-xenbus/bin/stty/stty.1#1 branch .. //depot/projects/xen31-xenbus/bin/stty/stty.c#1 branch .. //depot/projects/xen31-xenbus/bin/stty/stty.h#1 branch .. //depot/projects/xen31-xenbus/bin/stty/util.c#1 branch .. //depot/projects/xen31-xenbus/bin/sync/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/sync/sync.8#1 branch .. //depot/projects/xen31-xenbus/bin/sync/sync.c#1 branch .. //depot/projects/xen31-xenbus/bin/test/Makefile#1 branch .. //depot/projects/xen31-xenbus/bin/test/TEST.README#1 branch .. //depot/projects/xen31-xenbus/bin/test/TEST.csh#1 branch .. //depot/projects/xen31-xenbus/bin/test/TEST.sh#1 branch .. //depot/projects/xen31-xenbus/bin/test/test.1#1 branch .. //depot/projects/xen31-xenbus/bin/test/test.c#1 branch .. //depot/projects/xen31-xenbus/cddl/Makefile#1 branch .. //depot/projects/xen31-xenbus/cddl/Makefile.inc#1 branch .. //depot/projects/xen31-xenbus/cddl/lib/Makefile#1 branch .. //depot/projects/xen31-xenbus/cddl/lib/Makefile.inc#1 branch .. //depot/projects/xen31-xenbus/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/xen31-xenbus/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/xen31-xenbus/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/xen31-xenbus/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/xen31-xenbus/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/xen31-xenbus/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/xen31-xenbus/cddl/sbin/Makefile#1 branch .. //depot/projects/xen31-xenbus/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/xen31-xenbus/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/xen31-xenbus/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/xen31-xenbus/cddl/usr.bin/Makefile#1 branch .. //depot/projects/xen31-xenbus/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/xen31-xenbus/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/xen31-xenbus/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/xen31-xenbus/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/xen31-xenbus/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/xen31-xenbus/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/xen31-xenbus/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/xen31-xenbus/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/xen31-xenbus/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/xen31-xenbus/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/xen31-xenbus/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/xen31-xenbus/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/xen31-xenbus/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/xen31-xenbus/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/xen31-xenbus/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/xen31-xenbus/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/xen31-xenbus/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/xen31-xenbus/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/xen31-xenbus/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/xen31-xenbus/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/xen31-xenbus/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/xen31-xenbus/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/xen31-xenbus/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/xen31-xenbus/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/xen31-xenbus/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/xen31-xenbus/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/AUTHORS#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/BUGS#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/COPYING#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/ChangeLog#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/FAQ#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/INSTALL#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/NEWS#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/README#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/README.attrcache#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/README.ldap#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/README.y2k#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/amd.8#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/amd.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/amd.h#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/amfs_generic.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/autil.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/clock.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/conf.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/info_exec.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/map.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/opts.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/readdir.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/restart.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/sched.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amq/amq.8#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amq/amq.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amq/amq.h#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/bootstrap#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/doc/stamp-vti#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/doc/version.texi#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/ldap.schema#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/libamu/strutil.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/scripts/test-attrcache.in#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/tasks#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/vers.m4#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/xen31-xenbus/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/AUTHORS#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/ChangeLog#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/FAQ#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/INSTALL#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Makefile.am#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Makefile.in#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/NEWS#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/README#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Test/array.b#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Test/atan.b#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Test/div.b#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Test/exp.b#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Test/fact.b#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Test/jn.b#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Test/ln.b#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Test/mul.b#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Test/raise.b#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Test/signum#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Test/sine.b#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/Test/timetest#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/acconfig.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/aclocal.m4#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/bc/bc.y#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/bc/const.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/bc/execute.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/bc/global.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/bc/global.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/bc/load.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/bc/main.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/bc/proto.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/bc/scan.l#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/bc/storage.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/bc/util.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/config.h.in#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/configure#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/configure.in#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/dc/array.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/dc/dc.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/dc/dc.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/dc/eval.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/dc/misc.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/dc/stack.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/dc/string.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/doc/bc.1#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/doc/dc.1#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/h/number.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/install-sh#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/lib/number.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/missing#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/xen31-xenbus/contrib/bc/stamp-h.in#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/CHANGES#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/FAQ#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/Makefile.in#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/README#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/README.idnkit#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/acconfig.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/config.guess#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/config.sub#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/config.threads.in#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/configure.in#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/Bv9ARM.ch10.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/isc-logo.eps#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/isc-logo.pdf#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/man.dig.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/man.dnssec-keygen.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/man.dnssec-signzone.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/man.host.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/man.named-checkconf.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/man.named-checkzone.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/man.named.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/man.rndc-confgen.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/man.rndc.conf.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/arm/man.rndc.html#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/xen31-xenbus/contrib/bind9/doc/rfc/rfc2052.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 17 22:47:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E8BD16A420; Thu, 17 Jan 2008 22:47:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E0B3D16A41B for ; Thu, 17 Jan 2008 22:47:33 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CF96413C44B for ; Thu, 17 Jan 2008 22:47:33 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0HMlXHI078544 for ; Thu, 17 Jan 2008 22:47:33 GMT (envelope-from andre@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0HMlXlo078541 for perforce@freebsd.org; Thu, 17 Jan 2008 22:47:33 GMT (envelope-from andre@freebsd.org) Date: Thu, 17 Jan 2008 22:47:33 GMT Message-Id: <200801172247.m0HMlXlo078541@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andre@freebsd.org using -f From: Andre Oppermann To: Perforce Change Reviews Cc: Subject: PERFORCE change 133508 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 22:47:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=133508 Change 133508 by andre@andre_flirtbox on 2008/01/17 22:47:02 Catch segments with length zero that make to into tcp_reass(). This should normally be filtered out by tcp_do_segment() but for some reason still makes it here. Zero length segments are completely useless for reassembly. Undo the TAILQ_FOREACH_SAFE change as it turns out that the queue macros use a very interesting c language construct I've just learned about. Second the debugger led me astray when examining tvar in a crash dump. Everything indeed works as advertized. Use a trq struct on the stack for the missing segment. This prevents starvation when we run out of memory in the reassembly uma zone. The code now handles a full download of the FreeBSD cd images at 2% inbound packet loss (through ipfw). Affected files ... .. //depot/projects/tcp_reass/netinet/tcp_reass.c#9 edit Differences ... ==== //depot/projects/tcp_reass/netinet/tcp_reass.c#9 (text+ko) ==== @@ -73,6 +73,7 @@ * them in place. Only when trimming from the tail it actually frees them. * Normally we don't get mbuf chains so this isn't too much of a concern * right now. TODO. + * Add a timer that cleans out the reassembly queue after 2MSL or so. TODO. */ #include "opt_inet.h" @@ -145,6 +146,7 @@ struct socket *so = tp->t_inpcb->inp_socket; struct mbuf *n; int i, flags = 0, mcnt; + struct trq tqes; INP_LOCK_ASSERT(tp->t_inpcb); @@ -161,6 +163,9 @@ goto present; } + /* XXX: should not happen, but does for some reason. */ + if (*tlenp == 0) + return (0); KASSERT(*tlenp > 0, ("%s: segment doesn't contain any data", __func__)); KASSERT(SEQ_LEQ(tp->rcv_nxt, th->th_seq), @@ -169,8 +174,7 @@ ("%s: got missing segment but queue is empty", __func__)); #ifdef INVARIANTS - TAILQ_FOREACH(tqe, &tp->t_trq, trq_q) { - tqen = TAILQ_NEXT(tqe, trq_q); + TAILQ_FOREACH_SAFE(tqe, &tp->t_trq, trq_q, tqen) { KASSERT(SEQ_GEQ(tqe->trq_seq, tp->rcv_nxt), ("%s: trq_seq < rcv_nxt", __func__)); KASSERT(tqen == NULL || @@ -280,8 +284,7 @@ tcpstat.tcps_rcvoobyte += *tlenp; /* See where it fits. */ - TAILQ_FOREACH(tqe, &tp->t_trq, trq_q) { - tqen = TAILQ_NEXT(tqe, trq_q); + TAILQ_FOREACH_SAFE(tqe, &tp->t_trq, trq_q, tqen) { /* Segment is after this blocks coverage. */ if (SEQ_LT(tqe->trq_seq + tqe->trq_len, th->th_seq)) continue; @@ -371,7 +374,10 @@ insert: /* Prepare to insert into block queue. */ - tqen = uma_zalloc(tcp_reass_zone, (M_NOWAIT|M_ZERO)); + if (tp->rcv_nxt == th->th_seq) + tqen = &tqes; + else + tqen = uma_zalloc(tcp_reass_zone, (M_NOWAIT|M_ZERO)); if (tqen == NULL) { tcpstat.tcps_rcvmemdrop++; m_freem(m); @@ -408,7 +414,6 @@ KASSERT(!TAILQ_EMPTY(&tp->t_trq), ("%s: queue empty at present", __func__)); SOCKBUF_LOCK(&so->so_rcv); - tqen = TAILQ_NEXT(TAILQ_FIRST(&tp->t_trq), trq_q); TAILQ_FOREACH_SAFE(tqe, &tp->t_trq, trq_q, tqen) { KASSERT(SEQ_GEQ(tqe->trq_seq, tp->rcv_nxt), ("%s: trq_seq < rcv_nxt", __func__)); @@ -428,7 +433,8 @@ tp->rcv_nxt += tqe->trq_len; tp->t_trqmcnt -= tqe->trq_mcnt; TAILQ_REMOVE(&tp->t_trq, tqe, trq_q); - uma_zfree(tcp_reass_zone, tqe); + if (tqe != &tqes) + uma_zfree(tcp_reass_zone, tqe); tcp_reass_qsize--; } /* NB: sorwakeup_locked() does an implicit socket buffer unlock. */ From owner-p4-projects@FreeBSD.ORG Thu Jan 17 23:59:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF2A416A420; Thu, 17 Jan 2008 23:59:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9CE5416A417 for ; Thu, 17 Jan 2008 23:59:39 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8016413C43E for ; Thu, 17 Jan 2008 23:59:39 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0HNxdvA071841 for ; Thu, 17 Jan 2008 23:59:39 GMT (envelope-from andre@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0HNxTbf071836 for perforce@freebsd.org; Thu, 17 Jan 2008 23:59:29 GMT (envelope-from andre@freebsd.org) Date: Thu, 17 Jan 2008 23:59:29 GMT Message-Id: <200801172359.m0HNxTbf071836@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andre@freebsd.org using -f From: Andre Oppermann To: Perforce Change Reviews Cc: Subject: PERFORCE change 133513 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 23:59:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=133513 Change 133513 by andre@andre_flirtbox on 2008/01/17 23:59:01 Integrate 133512 Affected files ... .. //depot/projects/tcp_reass/amd64/amd64/pmap.c#2 integrate .. //depot/projects/tcp_reass/amd64/include/_types.h#2 integrate .. //depot/projects/tcp_reass/amd64/include/float.h#2 integrate .. //depot/projects/tcp_reass/amd64/isa/clock.c#2 integrate .. //depot/projects/tcp_reass/arm/arm/pmap.c#2 integrate .. //depot/projects/tcp_reass/arm/arm/support.S#2 integrate .. //depot/projects/tcp_reass/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/tcp_reass/boot/forth/loader.conf.5#2 integrate .. //depot/projects/tcp_reass/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/tcp_reass/compat/linux/linux_file.c#2 integrate .. //depot/projects/tcp_reass/compat/linux/linux_misc.c#2 integrate .. //depot/projects/tcp_reass/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/tcp_reass/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/tcp_reass/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/tcp_reass/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/tcp_reass/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/tcp_reass/compat/svr4/imgact_svr4.c#2 integrate .. //depot/projects/tcp_reass/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/tcp_reass/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/tcp_reass/conf/files#2 integrate .. //depot/projects/tcp_reass/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/tcp_reass/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/tcp_reass/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/tcp_reass/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/tcp_reass/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/tcp_reass/crypto/rijndael/rijndael-api.c#2 integrate .. //depot/projects/tcp_reass/crypto/rijndael/test00.c#2 integrate .. //depot/projects/tcp_reass/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/tcp_reass/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/tcp_reass/dev/acpica/acpi_hpet.h#1 branch .. //depot/projects/tcp_reass/dev/ath/if_ath.c#2 integrate .. //depot/projects/tcp_reass/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/tcp_reass/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/tcp_reass/dev/cxgb/cxgb_multiq.c#1 branch .. //depot/projects/tcp_reass/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/tcp_reass/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/tcp_reass/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/tcp_reass/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/tcp_reass/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/tcp_reass/dev/drm/drm_drv.c#2 integrate .. //depot/projects/tcp_reass/dev/gem/if_gem.c#2 integrate .. //depot/projects/tcp_reass/dev/hptrr/hptrr_osm_bsd.c#2 integrate .. //depot/projects/tcp_reass/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/tcp_reass/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/tcp_reass/dev/md/md.c#2 integrate .. //depot/projects/tcp_reass/dev/msk/if_msk.c#2 integrate .. //depot/projects/tcp_reass/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/tcp_reass/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/tcp_reass/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/tcp_reass/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/tcp_reass/dev/mxge/mxge_lro.c#2 integrate .. //depot/projects/tcp_reass/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/tcp_reass/dev/mxge/mxge_rss_eth_z8e.c#1 branch .. //depot/projects/tcp_reass/dev/mxge/mxge_rss_ethp_z8e.c#1 branch .. //depot/projects/tcp_reass/dev/mxge/rss_eth_z8e.h#1 branch .. //depot/projects/tcp_reass/dev/mxge/rss_ethp_z8e.h#1 branch .. //depot/projects/tcp_reass/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/tcp_reass/dev/pci/pci_user.c#2 integrate .. //depot/projects/tcp_reass/dev/puc/pucdata.c#2 integrate .. //depot/projects/tcp_reass/dev/re/if_re.c#2 integrate .. //depot/projects/tcp_reass/dev/stge/if_stge.c#2 integrate .. //depot/projects/tcp_reass/dev/stge/if_stgereg.h#2 integrate .. //depot/projects/tcp_reass/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/tcp_reass/fs/cd9660/cd9660_lookup.c#2 integrate .. //depot/projects/tcp_reass/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/tcp_reass/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/tcp_reass/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/tcp_reass/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/tcp_reass/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/tcp_reass/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/tcp_reass/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/tcp_reass/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/tcp_reass/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/tcp_reass/fs/msdosfs/msdosfs_lookup.c#2 integrate .. //depot/projects/tcp_reass/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/tcp_reass/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/tcp_reass/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/tcp_reass/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/tcp_reass/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/tcp_reass/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/tcp_reass/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/tcp_reass/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/tcp_reass/fs/procfs/procfs.c#2 integrate .. //depot/projects/tcp_reass/fs/pseudofs/pseudofs_vncache.c#2 integrate .. //depot/projects/tcp_reass/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/tcp_reass/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/tcp_reass/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/tcp_reass/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/tcp_reass/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/tcp_reass/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/tcp_reass/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/tcp_reass/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/tcp_reass/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/tcp_reass/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/tcp_reass/gnu/fs/ext2fs/ext2_lookup.c#2 integrate .. //depot/projects/tcp_reass/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/tcp_reass/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/tcp_reass/gnu/fs/ext2fs/fs.h#2 integrate .. //depot/projects/tcp_reass/gnu/fs/reiserfs/reiserfs_inode.c#2 integrate .. //depot/projects/tcp_reass/gnu/fs/reiserfs/reiserfs_namei.c#2 integrate .. //depot/projects/tcp_reass/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/tcp_reass/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/tcp_reass/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/tcp_reass/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate .. //depot/projects/tcp_reass/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/tcp_reass/i386/i386/pmap.c#2 integrate .. //depot/projects/tcp_reass/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/tcp_reass/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/tcp_reass/i386/include/pmap.h#2 integrate .. //depot/projects/tcp_reass/i386/isa/clock.c#2 integrate .. //depot/projects/tcp_reass/i386/linux/imgact_linux.c#2 integrate .. //depot/projects/tcp_reass/kern/imgact_aout.c#2 integrate .. //depot/projects/tcp_reass/kern/imgact_elf.c#2 integrate .. //depot/projects/tcp_reass/kern/imgact_gzip.c#2 integrate .. //depot/projects/tcp_reass/kern/kern_acct.c#2 integrate .. //depot/projects/tcp_reass/kern/kern_alq.c#2 integrate .. //depot/projects/tcp_reass/kern/kern_cpu.c#2 integrate .. //depot/projects/tcp_reass/kern/kern_descrip.c#2 integrate .. //depot/projects/tcp_reass/kern/kern_exec.c#2 integrate .. //depot/projects/tcp_reass/kern/kern_exit.c#2 integrate .. //depot/projects/tcp_reass/kern/kern_jail.c#2 integrate .. //depot/projects/tcp_reass/kern/kern_ktrace.c#2 integrate .. //depot/projects/tcp_reass/kern/kern_linker.c#2 integrate .. //depot/projects/tcp_reass/kern/kern_mib.c#2 integrate .. //depot/projects/tcp_reass/kern/kern_rwlock.c#2 integrate .. //depot/projects/tcp_reass/kern/kern_sig.c#2 integrate .. //depot/projects/tcp_reass/kern/link_elf.c#2 integrate .. //depot/projects/tcp_reass/kern/link_elf_obj.c#2 integrate .. //depot/projects/tcp_reass/kern/sched_ule.c#2 integrate .. //depot/projects/tcp_reass/kern/tty_cons.c#2 integrate .. //depot/projects/tcp_reass/kern/uipc_mbuf.c#2 integrate .. //depot/projects/tcp_reass/kern/uipc_mqueue.c#2 integrate .. //depot/projects/tcp_reass/kern/uipc_shm.c#2 integrate .. //depot/projects/tcp_reass/kern/uipc_syscalls.c#2 integrate .. //depot/projects/tcp_reass/kern/uipc_usrreq.c#2 integrate .. //depot/projects/tcp_reass/kern/vfs_acl.c#2 integrate .. //depot/projects/tcp_reass/kern/vfs_aio.c#2 integrate .. //depot/projects/tcp_reass/kern/vfs_bio.c#2 integrate .. //depot/projects/tcp_reass/kern/vfs_cache.c#2 integrate .. //depot/projects/tcp_reass/kern/vfs_default.c#2 integrate .. //depot/projects/tcp_reass/kern/vfs_extattr.c#2 integrate .. //depot/projects/tcp_reass/kern/vfs_lookup.c#2 integrate .. //depot/projects/tcp_reass/kern/vfs_mount.c#2 integrate .. //depot/projects/tcp_reass/kern/vfs_subr.c#2 integrate .. //depot/projects/tcp_reass/kern/vfs_syscalls.c#2 integrate .. //depot/projects/tcp_reass/kern/vfs_vnops.c#2 integrate .. //depot/projects/tcp_reass/kern/vnode_if.src#2 integrate .. //depot/projects/tcp_reass/modules/cxgb/cxgb/Makefile#2 integrate .. //depot/projects/tcp_reass/modules/mxge/Makefile#2 integrate .. //depot/projects/tcp_reass/modules/mxge/mxge_rss_eth_z8e/Makefile#1 branch .. //depot/projects/tcp_reass/modules/mxge/mxge_rss_ethp_z8e/Makefile#1 branch .. //depot/projects/tcp_reass/net/if_bridge.c#2 integrate .. //depot/projects/tcp_reass/netinet/tcp_reass.c#10 edit .. //depot/projects/tcp_reass/netinet/tcp_var.h#4 edit .. //depot/projects/tcp_reass/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/tcp_reass/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/tcp_reass/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/tcp_reass/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/tcp_reass/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/tcp_reass/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/tcp_reass/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/tcp_reass/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/tcp_reass/pci/if_rlreg.h#2 integrate .. //depot/projects/tcp_reass/security/audit/audit_arg.c#2 integrate .. //depot/projects/tcp_reass/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/tcp_reass/security/audit/audit_worker.c#2 integrate .. //depot/projects/tcp_reass/security/mac/mac_process.c#2 integrate .. //depot/projects/tcp_reass/security/mac/mac_syscalls.c#2 integrate .. //depot/projects/tcp_reass/sys/mbuf.h#2 integrate .. //depot/projects/tcp_reass/sys/param.h#2 integrate .. //depot/projects/tcp_reass/sys/pmc.h#2 integrate .. //depot/projects/tcp_reass/sys/vnode.h#2 integrate .. //depot/projects/tcp_reass/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/tcp_reass/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/tcp_reass/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/tcp_reass/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/tcp_reass/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/tcp_reass/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/tcp_reass/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/tcp_reass/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/tcp_reass/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/tcp_reass/vm/swap_pager.c#2 integrate .. //depot/projects/tcp_reass/vm/vm_contig.c#2 integrate .. //depot/projects/tcp_reass/vm/vm_object.c#2 integrate .. //depot/projects/tcp_reass/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/tcp_reass/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.603 2008/01/08 08:30:30 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.605 2008/01/17 18:25:51 alc Exp $"); /* * Manages physical address maps. @@ -149,11 +149,7 @@ #define PMAP_SHPGPERPROC 200 #endif -#if defined(DIAGNOSTIC) -#define PMAP_DIAGNOSTIC -#endif - -#if !defined(PMAP_DIAGNOSTIC) +#if !defined(DIAGNOSTIC) #define PMAP_INLINE __gnu89_inline #else #define PMAP_INLINE @@ -2249,12 +2245,9 @@ boolean_t invlva; va = trunc_page(va); -#ifdef PMAP_DIAGNOSTIC - if (va > VM_MAX_KERNEL_ADDRESS) - panic("pmap_enter: toobig"); - if ((va >= UPT_MIN_ADDRESS) && (va < UPT_MAX_ADDRESS)) - panic("pmap_enter: invalid to pmap_enter page table pages (va: 0x%lx)", va); -#endif + KASSERT(va <= VM_MAX_KERNEL_ADDRESS, ("pmap_enter: toobig")); + KASSERT(va < UPT_MIN_ADDRESS || va >= UPT_MAX_ADDRESS, + ("pmap_enter: invalid to pmap_enter page table pages (va: 0x%lx)", va)); mpte = NULL; @@ -2268,19 +2261,9 @@ if (va < VM_MAXUSER_ADDRESS) { mpte = pmap_allocpte(pmap, va, M_WAITOK); } -#if 0 && defined(PMAP_DIAGNOSTIC) - else { - pd_entry_t *pdeaddr = pmap_pde(pmap, va); - origpte = *pdeaddr; - if ((origpte & PG_V) == 0) { - panic("pmap_enter: invalid kernel page table page, pde=%p, va=%p\n", - origpte, va); - } - } -#endif pde = pmap_pde(pmap, va); - if (pde != NULL) { + if (pde != NULL && (*pde & PG_V) != 0) { if ((*pde & PG_PS) != 0) panic("pmap_enter: attempted pmap_enter on 2MB page"); pte = pmap_pde_to_pte(pde, va); @@ -2291,7 +2274,7 @@ * Page Directory table entry not valid, we need a new PT page */ if (pte == NULL) - panic("pmap_enter: invalid page directory va=%#lx\n", va); + panic("pmap_enter: invalid page directory va=%#lx", va); pa = VM_PAGE_TO_PHYS(m); om = NULL; @@ -2745,8 +2728,8 @@ pdp_entry_t *pdpe; pd_entry_t srcptepaddr, *pde; - if (addr >= UPT_MIN_ADDRESS) - panic("pmap_copy: invalid to pmap_copy page tables"); + KASSERT(addr < UPT_MIN_ADDRESS, + ("pmap_copy: invalid to pmap_copy page tables")); pml4e = pmap_pml4e(src_pmap, addr); if ((*pml4e & PG_V) == 0) { @@ -2784,8 +2767,8 @@ } srcmpte = PHYS_TO_VM_PAGE(srcptepaddr & PG_FRAME); - if (srcmpte->wire_count == 0) - panic("pmap_copy: source page table page is unused"); + KASSERT(srcmpte->wire_count > 0, + ("pmap_copy: source page table page is unused")); if (va_next > end_addr) va_next = end_addr; @@ -3104,7 +3087,7 @@ PMAP_LOCK(pmap); pde = pmap_pde(pmap, addr); if (pde != NULL && (*pde & PG_V)) { - pte = vtopte(addr); + pte = pmap_pde_to_pte(pde, addr); rv = (*pte & PG_V) == 0; } PMAP_UNLOCK(pmap); ==== //depot/projects/tcp_reass/amd64/include/_types.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/amd64/include/_types.h,v 1.11 2006/01/09 06:05:56 imp Exp $ + * $FreeBSD: src/sys/amd64/include/_types.h,v 1.12 2008/01/17 13:12:46 bde Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -64,7 +64,7 @@ typedef unsigned int __cpumask_t; typedef __int64_t __critical_t; typedef double __double_t; -typedef double __float_t; +typedef float __float_t; typedef __int64_t __intfptr_t; typedef __int64_t __intmax_t; typedef __int64_t __intptr_t; ==== //depot/projects/tcp_reass/amd64/include/float.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 - * $FreeBSD: src/sys/amd64/include/float.h,v 1.15 2005/01/05 20:17:20 imp Exp $ + * $FreeBSD: src/sys/amd64/include/float.h,v 1.16 2008/01/17 13:12:46 bde Exp $ */ #ifndef _MACHINE_FLOAT_H_ @@ -42,7 +42,7 @@ #define FLT_RADIX 2 /* b */ #define FLT_ROUNDS __flt_rounds() #if __ISO_C_VISIBLE >= 1999 -#define FLT_EVAL_METHOD (-1) /* i387 semantics are...interesting */ +#define FLT_EVAL_METHOD 0 /* no promotions */ #define DECIMAL_DIG 21 /* max precision in decimal digits */ #endif ==== //depot/projects/tcp_reass/amd64/isa/clock.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.235 2007/10/26 03:23:53 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.236 2008/01/17 18:59:38 jhb Exp $"); /* * Routines to handle clock hardware. @@ -286,6 +286,7 @@ start = rdtsc(); end = start + (tsc_freq * n) / 1000000; do { + cpu_spinwait(); now = rdtsc(); } while (now < end || (now > start && end < start)); sched_unpin(); ==== //depot/projects/tcp_reass/arm/arm/pmap.c#2 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.96 2008/01/03 07:34:33 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.97 2008/01/17 12:41:59 cognet Exp $"); #include #include #include @@ -3828,7 +3828,8 @@ bzero(&pmap->pm_stats, sizeof pmap->pm_stats); pmap->pm_stats.resident_count = 1; if (vector_page < KERNBASE) { - pmap_enter(pmap, vector_page, PHYS_TO_VM_PAGE(systempage.pv_pa), + pmap_enter(pmap, vector_page, + VM_PROT_READ, PHYS_TO_VM_PAGE(systempage.pv_pa), VM_PROT_READ, 1); } return (1); ==== //depot/projects/tcp_reass/arm/arm/support.S#2 (text+ko) ==== @@ -23,10 +23,79 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +/* + * Copyright 2003 Wasabi Systems, Inc. + * All rights reserved. + * + * Written by Steve C. Woodford for Wasabi Systems, Inc. + * + * 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 for the NetBSD Project by + * Wasabi Systems, Inc. + * 4. The name of Wasabi Systems, Inc. may not be used to endorse + * or promote products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC + * 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. + */ +/* + * Copyright (c) 1997 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Neil A. Carson and Mark Brinicombe + * + * 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. + * + * 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. + */ #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.13 2007/10/13 12:05:03 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.14 2008/01/12 21:11:43 cognet Exp $"); #include "assym.s" ==== //depot/projects/tcp_reass/arm/xscale/ixp425/if_npe.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.7 2007/11/04 21:54:52 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.8 2008/01/17 23:37:46 jhb Exp $"); /* * Intel XScale NPE Ethernet driver. @@ -1140,90 +1140,6 @@ } /* - * Defragment an mbuf chain, returning at most maxfrags separate - * mbufs+clusters. If this is not possible NULL is returned and - * the original mbuf chain is left in it's present (potentially - * modified) state. We use two techniques: collapsing consecutive - * mbufs and replacing consecutive mbufs by a cluster. - */ -static struct mbuf * -npe_defrag(struct mbuf *m0, int how, int maxfrags) -{ - struct mbuf *m, *n, *n2, **prev; - u_int curfrags; - - /* - * Calculate the current number of frags. - */ - curfrags = 0; - for (m = m0; m != NULL; m = m->m_next) - curfrags++; - /* - * First, try to collapse mbufs. Note that we always collapse - * towards the front so we don't need to deal with moving the - * pkthdr. This may be suboptimal if the first mbuf has much - * less data than the following. - */ - m = m0; -again: - for (;;) { - n = m->m_next; - if (n == NULL) - break; - if ((m->m_flags & M_RDONLY) == 0 && - n->m_len < M_TRAILINGSPACE(m)) { - bcopy(mtod(n, void *), mtod(m, char *) + m->m_len, - n->m_len); - m->m_len += n->m_len; - m->m_next = n->m_next; - m_free(n); - if (--curfrags <= maxfrags) - return m0; - } else - m = n; - } - KASSERT(maxfrags > 1, - ("maxfrags %u, but normal collapse failed", maxfrags)); - /* - * Collapse consecutive mbufs to a cluster. - */ - prev = &m0->m_next; /* NB: not the first mbuf */ - while ((n = *prev) != NULL) { - if ((n2 = n->m_next) != NULL && - n->m_len + n2->m_len < MCLBYTES) { - m = m_getcl(how, MT_DATA, 0); - if (m == NULL) - goto bad; - bcopy(mtod(n, void *), mtod(m, void *), n->m_len); - bcopy(mtod(n2, void *), mtod(m, char *) + n->m_len, - n2->m_len); - m->m_len = n->m_len + n2->m_len; - m->m_next = n2->m_next; - *prev = m; - m_free(n); - m_free(n2); - if (--curfrags <= maxfrags) /* +1 cl -2 mbufs */ - return m0; - /* - * Still not there, try the normal collapse - * again before we allocate another cluster. - */ - goto again; - } - prev = &n->m_next; - } - /* - * No place where we can collapse to a cluster; punt. - * This can occur if, for example, you request 2 frags - * but the packet requires that both be clusters (we - * never reallocate the first mbuf to avoid moving the - * packet header). - */ -bad: - return NULL; -} - -/* * Dequeue packets and place on the h/w transmit queue. */ static void @@ -1254,7 +1170,7 @@ error = bus_dmamap_load_mbuf_sg(dma->mtag, npe->ix_map, m, segs, &nseg, 0); if (error == EFBIG) { - n = npe_defrag(m, M_DONTWAIT, NPE_MAXSEG); + n = m_collapse(m, M_DONTWAIT, NPE_MAXSEG); if (n == NULL) { if_printf(ifp, "%s: too many fragments %u\n", __func__, nseg); ==== //depot/projects/tcp_reass/boot/forth/loader.conf.5#2 (text+ko) ==== @@ -22,8 +22,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.26 2005/11/18 10:34:24 ru Exp $ -.Dd November 15, 2005 +.\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.28 2008/01/16 07:00:55 keramida Exp $ +.Dd January 16, 2008 .Dt LOADER.CONF 5 .Os .Sh NAME @@ -238,6 +238,16 @@ .Xr boot 8 , .Xr loader 8 , .Xr loader.4th 8 +.Sh BUGS +The +.Xr loader 8 +stops reading +.Nm +when it encounters a syntax error, so any options which are vital for +booting a particular system (i.e.\& +.Dq Va hw.ata.ata_dma Ns "=0" ) +should precede any experimental additions to +.Nm . .Sh HISTORY The file .Nm ==== //depot/projects/tcp_reass/cam/scsi/scsi_da.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.225 2007/12/11 06:41:38 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.226 2008/01/12 19:24:55 maxim Exp $"); #include @@ -477,7 +477,7 @@ * PR: usb/96546 */ {T_DIRECT, SIP_MEDIA_REMOVABLE, "EM732X", "MP3 Player*", - "1.0"}, /*quirks*/ DA_Q_NO_SYNC_CACHE + "1.00"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, { /* ==== //depot/projects/tcp_reass/compat/linux/linux_file.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.108 2008/01/10 01:10:41 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.109 2008/01/13 14:43:59 attilio Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -598,7 +598,7 @@ if (cookies) free(cookies, M_TEMP); - VOP_UNLOCK(vp, 0, td); + VOP_UNLOCK(vp, 0); VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); free(buf, M_TEMP); ==== //depot/projects/tcp_reass/compat/linux/linux_misc.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.215 2007/10/24 19:03:52 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.216 2008/01/13 14:43:59 attilio Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -377,7 +377,7 @@ * Lock no longer needed */ locked = 0; - VOP_UNLOCK(vp, 0, td); + VOP_UNLOCK(vp, 0); VFS_UNLOCK_GIANT(vfslocked); /* @@ -458,7 +458,7 @@ cleanup: /* Unlock vnode if needed */ if (locked) { - VOP_UNLOCK(vp, 0, td); + VOP_UNLOCK(vp, 0); VFS_UNLOCK_GIANT(vfslocked); } ==== //depot/projects/tcp_reass/compat/ndis/subr_ndis.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.110 2007/12/03 23:43:58 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.111 2008/01/13 14:43:59 attilio Exp $"); /* * This file implements a translation layer between the BSD networking @@ -2970,7 +2970,7 @@ /* Get the file size. */ VOP_GETATTR(nd.ni_vp, vap, td->td_ucred, td); - VOP_UNLOCK(nd.ni_vp, 0, td); + VOP_UNLOCK(nd.ni_vp, 0); VFS_UNLOCK_GIANT(vfslocked); fh->nf_vp = nd.ni_vp; ==== //depot/projects/tcp_reass/compat/opensolaris/kern/opensolaris_kobj.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kobj.c,v 1.5 2008/01/10 01:10:42 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kobj.c,v 1.6 2008/01/13 14:43:59 attilio Exp $"); #include #include @@ -77,12 +77,12 @@ flags = FREAD; NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_SYSSPACE, file, td); - error = vn_open_cred(&nd, &flags, 0, td->td_ucred, NULL); + error = vn_open_cred(&nd, &flags, 0, curthread->td_ucred, NULL); NDFREE(&nd, NDF_ONLY_PNBUF); if (error != 0) return (NULL); /* We just unlock so we hold a reference. */ - VOP_UNLOCK(nd.ni_vp, 0, td); + VOP_UNLOCK(nd.ni_vp, 0); return (nd.ni_vp); } @@ -125,7 +125,7 @@ vn_lock(vp, LK_SHARED | LK_RETRY); error = VOP_GETATTR(vp, &va, td->td_ucred, td); - VOP_UNLOCK(vp, 0, td); + VOP_UNLOCK(vp, 0); if (error == 0) *size = (uint64_t)va.va_size; return (error); @@ -178,7 +178,7 @@ vn_lock(vp, LK_SHARED | LK_RETRY); error = VOP_READ(vp, &auio, IO_UNIT | IO_SYNC, td->td_ucred); - VOP_UNLOCK(vp, 0, td); + VOP_UNLOCK(vp, 0); return (error != 0 ? -1 : size - auio.uio_resid); } ==== //depot/projects/tcp_reass/compat/opensolaris/kern/opensolaris_vfs.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_vfs.c,v 1.8 2008/01/10 01:10:42 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_vfs.c,v 1.9 2008/01/13 14:43:59 attilio Exp $"); #include #include @@ -194,7 +194,7 @@ */ vn_lock(vp, LK_SHARED | LK_RETRY); mp = vfs_mount_alloc(vp, vfsp, fspath, td); - VOP_UNLOCK(vp, 0, td); + VOP_UNLOCK(vp, 0); mp->mnt_optnew = NULL; vfs_setmntopt(mp, "from", fspec, 0); @@ -260,7 +260,7 @@ panic("mount: lost mount"); mountcheckdirs(vp, mvp); vput(mvp); - VOP_UNLOCK(vp, 0, td); + VOP_UNLOCK(vp, 0); if ((mp->mnt_flag & MNT_RDONLY) == 0) error = vfs_allocate_syncvnode(mp); vfs_unbusy(mp, td); @@ -272,7 +272,7 @@ VI_LOCK(vp); vp->v_iflag &= ~VI_MOUNT; VI_UNLOCK(vp); - VOP_UNLOCK(vp, 0, td); + VOP_UNLOCK(vp, 0); vfs_unbusy(mp, td); vfs_mount_destroy(mp); } ==== //depot/projects/tcp_reass/compat/opensolaris/sys/vnode.h#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/compat/opensolaris/sys/vnode.h,v 1.4 2008/01/10 01:10:42 attilio Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/vnode.h,v 1.5 2008/01/13 14:44:01 attilio Exp $ */ #ifndef _OPENSOLARIS_SYS_VNODE_H_ @@ -175,7 +175,7 @@ if (error == 0) { /* We just unlock so we hold a reference. */ VN_HOLD(nd.ni_vp); - VOP_UNLOCK(nd.ni_vp, 0, td); + VOP_UNLOCK(nd.ni_vp, 0); *vpp = nd.ni_vp; } return (error); @@ -213,7 +213,6 @@ static __inline int zfs_vop_fsync(vnode_t *vp, int flag, cred_t *cr) { - struct thread *td = curthread; struct mount *mp; int error, vfslocked; @@ -223,8 +222,8 @@ if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) goto drop; vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); - error = VOP_FSYNC(vp, MNT_WAIT, td); - VOP_UNLOCK(vp, 0, td); + error = VOP_FSYNC(vp, MNT_WAIT, curthread); + VOP_UNLOCK(vp, 0); vn_finished_write(mp); drop: VFS_UNLOCK_GIANT(vfslocked); ==== //depot/projects/tcp_reass/compat/pecoff/imgact_pecoff.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.42 2008/01/10 01:10:42 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.43 2008/01/13 14:44:01 attilio Exp $"); #include #include @@ -316,7 +316,7 @@ * Check permissions, modes, uid, etc on the file, and "open" it. */ error = exec_check_permissions(imgp); - VOP_UNLOCK(nd.ni_vp, 0, td); + VOP_UNLOCK(nd.ni_vp, 0); if (error) goto fail; if ((error = pecoff_read_from(td, imgp->vp, 0, (caddr_t) & dh, sizeof(dh))) != 0) @@ -579,14 +579,13 @@ imgp->image_header; struct coff_filehdr *fp; int error, peofs; - struct thread *td = curthread; error = pecoff_signature(FIRST_THREAD_IN_PROC(imgp->proc), imgp->vp, dp); if (error) { return -1; } - VOP_UNLOCK(imgp->vp, 0, td); + VOP_UNLOCK(imgp->vp, 0); peofs = dp->d_peofs + sizeof(signature) - 1; fp = malloc(PECOFF_HDR_SIZE, M_TEMP, M_WAITOK); ==== //depot/projects/tcp_reass/compat/svr4/imgact_svr4.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.27 2008/01/10 01:10:42 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.28 2008/01/13 14:44:01 attilio Exp $"); #include #include @@ -68,7 +68,6 @@ vm_offset_t buffer; unsigned long bss_size; int error; - struct thread *td = curthread; if (((a_out->a_magic >> 16) & 0xff) != 0x64) return -1; @@ -115,7 +114,7 @@ } PROC_UNLOCK(imgp->proc); - VOP_UNLOCK(imgp->vp, 0, td); + VOP_UNLOCK(imgp->vp, 0); /* * Destroy old process VM and create a new one (with a new stack) ==== //depot/projects/tcp_reass/compat/svr4/svr4_fcntl.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.42 2008/01/10 01:10:42 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.43 2008/01/13 14:44:01 attilio Exp $"); #include "opt_mac.h" @@ -272,7 +272,7 @@ #ifdef MAC vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); error = mac_vnode_check_revoke(td->td_ucred, vp); - VOP_UNLOCK(vp, 0, td); + VOP_UNLOCK(vp, 0); if (error) goto out; #endif ==== //depot/projects/tcp_reass/compat/svr4/svr4_misc.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.99 2008/01/10 01:10:43 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.100 2008/01/13 14:44:01 attilio Exp $"); #include "opt_mac.h" @@ -396,7 +396,7 @@ eof: td->td_retval[0] = nbytes - resid; out: - VOP_UNLOCK(vp, 0, td); + VOP_UNLOCK(vp, 0); VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); if (cookies) @@ -529,7 +529,7 @@ eof: *retval = uap->nbytes - resid; out: - VOP_UNLOCK(vp, 0, td); + VOP_UNLOCK(vp, 0); VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); if (cookiebuf) @@ -629,7 +629,7 @@ if (error) goto fail; #endif - VOP_UNLOCK(vp, 0, td); + VOP_UNLOCK(vp, 0); error = change_root(vp, td); vrele(vp); VFS_UNLOCK_GIANT(vfslocked); ==== //depot/projects/tcp_reass/conf/files#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1262 2008/01/08 21:58:14 jhb Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1264 2008/01/15 20:34:47 gallatin Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -518,6 +518,7 @@ dev/cxgb/cxgb_l2t.c optional cxgb pci dev/cxgb/cxgb_lro.c optional cxgb pci dev/cxgb/cxgb_sge.c optional cxgb pci +dev/cxgb/cxgb_multiq.c optional cxgb pci dev/cxgb/common/cxgb_mc5.c optional cxgb pci dev/cxgb/common/cxgb_vsc7323.c optional cxgb pci dev/cxgb/common/cxgb_vsc8211.c optional cxgb pci @@ -828,6 +829,8 @@ dev/mxge/mxge_lro.c optional mxge pci dev/mxge/mxge_eth_z8e.c optional mxge pci dev/mxge/mxge_ethp_z8e.c optional mxge pci +dev/mxge/mxge_rss_eth_z8e.c optional mxge pci +dev/mxge/mxge_rss_ethp_z8e.c optional mxge pci dev/my/if_my.c optional my dev/ncv/ncr53c500.c optional ncv dev/ncv/ncr53c500_pccard.c optional ncv pccard ==== //depot/projects/tcp_reass/contrib/dev/acpica/evgpe.c#2 (text+ko) ==== @@ -123,6 +123,10 @@ /* Local prototypes */ +static void +AcpiEvAsynchEnableGpe ( + void *Context); + static void ACPI_SYSTEM_XFACE AcpiEvAsynchExecuteGpeMethod ( void *Context); @@ -684,14 +688,26 @@ } } - if ((LocalGpeEventInfo.Flags & ACPI_GPE_XRUPT_TYPE_MASK) == + /* Defer enabling of GPE until all notify handlers are done */ + AcpiOsExecute(OSL_NOTIFY_HANDLER, AcpiEvAsynchEnableGpe, GpeEventInfo); + return_VOID; +} + +static void >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 18 00:02:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 335EE16A41A; Fri, 18 Jan 2008 00:02:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EBAC916A420 for ; Fri, 18 Jan 2008 00:02:42 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CEB3013C458 for ; Fri, 18 Jan 2008 00:02:42 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0I02gnE072911 for ; Fri, 18 Jan 2008 00:02:42 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0I02ggU072908 for perforce@freebsd.org; Fri, 18 Jan 2008 00:02:42 GMT (envelope-from scottl@freebsd.org) Date: Fri, 18 Jan 2008 00:02:42 GMT Message-Id: <200801180002.m0I02ggU072908@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 133514 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 00:02:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=133514 Change 133514 by scottl@scottl-ix on 2008/01/18 00:02:00 Selectively bring in driver changes from xen31 that are after the main integration point. Affected files ... .. //depot/projects/xen31-xenbus/sys/dev/xen/blkfront/blkfront.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/xen/netfront/netfront.c#2 integrate Differences ... ==== //depot/projects/xen31-xenbus/sys/dev/xen/blkfront/blkfront.c#2 (text+ko) ==== @@ -109,8 +109,6 @@ #define MAXIMUM_OUTSTANDING_BLOCK_REQS \ (BLKIF_MAX_SEGMENTS_PER_REQUEST * BLK_RING_SIZE) -static struct mtx blkif_io_block_lock; - static void kick_pending_request_queues(struct blkfront_info *); static int blkif_open(struct disk *dp); static int blkif_close(struct disk *dp); @@ -170,7 +168,7 @@ xb_diskinfo[sc->xb_unit].device, sc->xb_unit, sc->xb_disk->d_mediasize); #endif - sc->xb_disk->d_flags = DISKFLAG_NEEDSGIANT; + sc->xb_disk->d_flags = 0; disk_create(sc->xb_disk, DISK_VERSION_00); bioq_init(&sc->xb_bioq); @@ -195,7 +193,6 @@ xb_strategy(struct bio *bp) { struct xb_softc *sc = (struct xb_softc *)bp->bio_disk->d_drv1; - int flags; /* bogus disk? */ if (sc == NULL) { @@ -206,14 +203,14 @@ DPRINTK(""); - flags = splbio(); /* * Place it in the queue of disk activities for this disk */ + mtx_lock(&blkif_io_lock); bioq_disksort(&sc->xb_bioq, bp); - splx(flags); xb_startio(sc); + mtx_unlock(&blkif_io_lock); return; bad: @@ -235,7 +232,6 @@ { int err, vdevice, i; struct blkfront_info *info; - /* FIXME: Use dynamic device id if this is not set. */ err = xenbus_scanf(XBT_NIL, dev->nodename, @@ -378,8 +374,8 @@ info->ring_ref = err; err = bind_listening_port_to_irqhandler(dev->otherend_id, - "xbd", (driver_intr_t *)blkif_int, - info, INTR_TYPE_BIO, NULL); + "xbd", (driver_intr_t *)blkif_int, info, + INTR_TYPE_BIO | INTR_MPSAFE, NULL); if (err <= 0) { xenbus_dev_fatal(dev, err, "bind_evtchn_to_irqhandler failed"); @@ -767,24 +763,20 @@ xb_startio(struct xb_softc *sc) { struct bio *bp; - int flags, queued = 0; + int queued = 0; struct blkfront_info *info = sc->xb_info; DPRINTK(""); - flags = splbio(); + mtx_assert(&blkif_io_lock, MA_OWNED); while ((bp = bioq_takefirst(&sc->xb_bioq)) != NULL) { if (RING_FULL(&info->ring)) goto wait; - splx(flags); - if (blkif_queue_request(bp)) { - flags = splbio(); wait: bioq_insert_head(&sc->xb_bioq, bp); - splx(flags); break; } queued++; @@ -968,10 +960,10 @@ mtx_unlock(&blkif_io_lock); /* Send off requeued requests */ + mtx_lock(&blkif_io_lock); flush_requests(info); /* Kick any other new requests queued since we resumed */ - mtx_lock(&blkif_io_lock); kick_pending_request_queues(info); mtx_unlock(&blkif_io_lock); } @@ -1009,7 +1001,6 @@ } MTX_SYSINIT(ioreq, &blkif_io_lock, "BIO LOCK", MTX_NOWITNESS); /* XXX how does one enroll a lock? */ -MTX_SYSINIT(ioreq_block, &blkif_io_block_lock, "BIO BLOCK LOCK", MTX_SPIN | MTX_NOWITNESS); SYSINIT(xbdev, SI_SUB_PSEUDO, SI_ORDER_SECOND, xenbus_init, NULL); ==== //depot/projects/xen31-xenbus/sys/dev/xen/netfront/netfront.c#2 (text+ko) ==== @@ -144,93 +144,92 @@ * not the other way around. The size must track the free index arrays. */ struct xn_chain_data { - struct mbuf *xn_tx_chain[NET_TX_RING_SIZE+1]; + struct mbuf *xn_tx_chain[NET_TX_RING_SIZE+1]; struct mbuf *xn_rx_chain[NET_RX_RING_SIZE+1]; }; struct net_device_stats { - unsigned long rx_packets; /* total packets received */ - unsigned long tx_packets; /* total packets transmitted */ - unsigned long rx_bytes; /* total bytes received */ - unsigned long tx_bytes; /* total bytes transmitted */ - unsigned long rx_errors; /* bad packets received */ - unsigned long tx_errors; /* packet transmit problems */ - unsigned long rx_dropped; /* no space in linux buffers */ - unsigned long tx_dropped; /* no space available in linux */ - unsigned long multicast; /* multicast packets received */ - unsigned long collisions; + u_long rx_packets; /* total packets received */ + u_long tx_packets; /* total packets transmitted */ + u_long rx_bytes; /* total bytes received */ + u_long tx_bytes; /* total bytes transmitted */ + u_long rx_errors; /* bad packets received */ + u_long tx_errors; /* packet transmit problems */ + u_long rx_dropped; /* no space in linux buffers */ + u_long tx_dropped; /* no space available in linux */ + u_long multicast; /* multicast packets received */ + u_long collisions; /* detailed rx_errors: */ - unsigned long rx_length_errors; - unsigned long rx_over_errors; /* receiver ring buff overflow */ - unsigned long rx_crc_errors; /* recved pkt with crc error */ - unsigned long rx_frame_errors; /* recv'd frame alignment error */ - unsigned long rx_fifo_errors; /* recv'r fifo overrun */ - unsigned long rx_missed_errors; /* receiver missed packet */ + u_long rx_length_errors; + u_long rx_over_errors; /* receiver ring buff overflow */ + u_long rx_crc_errors; /* recved pkt with crc error */ + u_long rx_frame_errors; /* recv'd frame alignment error */ + u_long rx_fifo_errors; /* recv'r fifo overrun */ + u_long rx_missed_errors; /* receiver missed packet */ /* detailed tx_errors */ - unsigned long tx_aborted_errors; - unsigned long tx_carrier_errors; - unsigned long tx_fifo_errors; - unsigned long tx_heartbeat_errors; - unsigned long tx_window_errors; + u_long tx_aborted_errors; + u_long tx_carrier_errors; + u_long tx_fifo_errors; + u_long tx_heartbeat_errors; + u_long tx_window_errors; /* for cslip etc */ - unsigned long rx_compressed; - unsigned long tx_compressed; + u_long rx_compressed; + u_long tx_compressed; }; struct netfront_info { - struct ifnet *xn_ifp; + struct ifnet *xn_ifp; + + struct net_device_stats stats; + u_int tx_full; - struct net_device_stats stats; - unsigned int tx_full; - - netif_tx_front_ring_t tx; - netif_rx_front_ring_t rx; + netif_tx_front_ring_t tx; + netif_rx_front_ring_t rx; - struct mtx tx_lock; - struct mtx rx_lock; - struct sx sc_lock; + struct mtx tx_lock; + struct mtx rx_lock; + struct sx sc_lock; - unsigned int handle; - unsigned int irq; - unsigned int copying_receiver; - unsigned int carrier; + u_int handle; + u_int irq; + u_int copying_receiver; + u_int carrier; /* Receive-ring batched refills. */ #define RX_MIN_TARGET 32 #define RX_MAX_TARGET NET_RX_RING_SIZE - int rx_min_target, rx_max_target, rx_target; + int rx_min_target, rx_max_target, rx_target; - /* - * {tx,rx}_skbs store outstanding skbuffs. The first entry in each - * array is an index into a chain of free entries. - */ + /* + * {tx,rx}_skbs store outstanding skbuffs. The first entry in each + * array is an index into a chain of free entries. + */ - grant_ref_t gref_tx_head; - grant_ref_t grant_tx_ref[NET_TX_RING_SIZE + 1]; - grant_ref_t gref_rx_head; - grant_ref_t grant_rx_ref[NET_TX_RING_SIZE + 1]; + grant_ref_t gref_tx_head; + grant_ref_t grant_tx_ref[NET_TX_RING_SIZE + 1]; + grant_ref_t gref_rx_head; + grant_ref_t grant_rx_ref[NET_TX_RING_SIZE + 1]; #define TX_MAX_TARGET min(NET_RX_RING_SIZE, 256) - struct xenbus_device *xbdev; - int tx_ring_ref; - int rx_ring_ref; - uint8_t mac[ETHER_ADDR_LEN]; - struct xn_chain_data xn_cdata; /* mbufs */ - struct mbuf_head xn_rx_batch; /* head of the batch queue */ + struct xenbus_device *xbdev; + int tx_ring_ref; + int rx_ring_ref; + uint8_t mac[ETHER_ADDR_LEN]; + struct xn_chain_data xn_cdata; /* mbufs */ + struct mbuf_head xn_rx_batch; /* head of the batch queue */ - int xn_if_flags; - struct callout xn_stat_ch; + int xn_if_flags; + struct callout xn_stat_ch; - - unsigned long rx_pfn_array[NET_RX_RING_SIZE]; - multicall_entry_t rx_mcl[NET_RX_RING_SIZE+1]; - mmu_update_t rx_mmu[NET_RX_RING_SIZE]; + u_long rx_pfn_array[NET_RX_RING_SIZE]; + multicall_entry_t rx_mcl[NET_RX_RING_SIZE+1]; + mmu_update_t rx_mmu[NET_RX_RING_SIZE]; }; #define rx_mbufs xn_cdata.xn_rx_chain @@ -278,13 +277,13 @@ add_id_to_freelist(struct mbuf **list, unsigned short id) { list[id] = list[0]; - list[0] = (void *)(unsigned long)id; + list[0] = (void *)(u_long)id; } static inline unsigned short get_id_from_freelist(struct mbuf **list) { - unsigned int id = (unsigned int)(unsigned long)list[0]; + u_int id = (u_int)(u_long)list[0]; list[0] = list[id]; return (id); } @@ -661,24 +660,23 @@ static void netif_release_tx_bufs(struct netfront_info *np) { - struct mbuf *m; - int i; + struct mbuf *m; + int i; - for (i = 1; i <= NET_TX_RING_SIZE; i++) { - m = np->xn_cdata.xn_tx_chain[i]; + for (i = 1; i <= NET_TX_RING_SIZE; i++) { + m = np->xn_cdata.xn_tx_chain[i]; - if (((unsigned long)m) < KERNBASE) - continue; - gnttab_grant_foreign_access_ref( - np->grant_tx_ref[i], np->xbdev->otherend_id, - virt_to_mfn(mtod(m, vm_offset_t)), - GNTMAP_readonly); - gnttab_release_grant_reference( - &np->gref_tx_head, np->grant_tx_ref[i]); - np->grant_tx_ref[i] = GRANT_INVALID_REF; - add_id_to_freelist(np->tx_mbufs, i); - m_freem(m); - } + if (((u_long)m) < KERNBASE) + continue; + gnttab_grant_foreign_access_ref(np->grant_tx_ref[i], + np->xbdev->otherend_id, virt_to_mfn(mtod(m, vm_offset_t)), + GNTMAP_readonly); + gnttab_release_grant_reference(&np->gref_tx_head, + np->grant_tx_ref[i]); + np->grant_tx_ref[i] = GRANT_INVALID_REF; + add_id_to_freelist(np->tx_mbufs, i); + m_freem(m); + } } static void @@ -693,7 +691,7 @@ int nr_flips; netif_rx_request_t *req; vm_offset_t vaddr; - unsigned long pfn; + u_long pfn; req_prod = sc->rx.req_prod_pvt; @@ -702,27 +700,27 @@ /* * Allocate skbuffs greedily, even though we batch updates to the - * receive ring. This creates a less bursty demand on the memory allocator, - * so should reduce the chance of failed allocation requests both for - * ourself and for other kernel subsystems. + * receive ring. This creates a less bursty demand on the memory + * allocator, so should reduce the chance of failed allocation + * requests both for ourself and for other kernel subsystems. */ batch_target = sc->rx_target - (req_prod - sc->rx.rsp_cons); for (i = mbufq_len(&sc->xn_rx_batch); i < batch_target; i++) { MGETHDR(m_new, M_DONTWAIT, MT_DATA); if (m_new == NULL) - goto no_mbuf; + goto no_mbuf; m_cljget(m_new, M_DONTWAIT, MJUMPAGESIZE); if ((m_new->m_flags & M_EXT) == 0) { - m_freem(m_new); + m_freem(m_new); no_mbuf: - if (i != 0) - goto refill; - /* - * XXX set timer - */ - break; + if (i != 0) + goto refill; + /* + * XXX set timer + */ + break; } m_new->m_len = m_new->m_pkthdr.len = MJUMPAGESIZE; @@ -732,62 +730,63 @@ /* Is the batch large enough to be worthwhile? */ if (i < (sc->rx_target/2)) { - if (req_prod >sc->rx.sring->req_prod) - goto push; - return; + if (req_prod >sc->rx.sring->req_prod) + goto push; + return; } - /* Adjust our floating fill target if we risked running out of buffers. */ + /* Adjust floating fill target if we risked running out of buffers. */ if ( ((req_prod - sc->rx.sring->rsp_prod) < (sc->rx_target / 4)) && ((sc->rx_target *= 2) > sc->rx_max_target) ) sc->rx_target = sc->rx_max_target; refill: for (nr_flips = i = 0; ; i++) { - if ((m_new = mbufq_dequeue(&sc->xn_rx_batch)) == NULL) - break; + if ((m_new = mbufq_dequeue(&sc->xn_rx_batch)) == NULL) + break; + + m_new->m_ext.ext_args = (vm_paddr_t *)(uintptr_t)( + vtophys(m_new->m_ext.ext_buf) >> PAGE_SHIFT); + + id = xennet_rxidx(req_prod + i); + + KASSERT(sc->xn_cdata.xn_rx_chain[id] == NULL, + ("non-NULL xm_rx_chain")); + sc->xn_cdata.xn_rx_chain[id] = m_new; + + ref = gnttab_claim_grant_reference(&sc->gref_rx_head); + KASSERT((short)ref >= 0, ("negative ref")); + sc->grant_rx_ref[id] = ref; - m_new->m_ext.ext_args = (vm_paddr_t *)(uintptr_t)(vtophys(m_new->m_ext.ext_buf) >> PAGE_SHIFT); - - id = xennet_rxidx(req_prod + i); - - PANIC_IF(sc->xn_cdata.xn_rx_chain[id] != NULL); - sc->xn_cdata.xn_rx_chain[id] = m_new; - - ref = gnttab_claim_grant_reference(&sc->gref_rx_head); - PANIC_IF((signed short)ref < 0); - sc->grant_rx_ref[id] = ref; - - vaddr = mtod(m_new, vm_offset_t); - pfn = vtophys(vaddr) >> PAGE_SHIFT; - req = RING_GET_REQUEST(&sc->rx, req_prod + i); + vaddr = mtod(m_new, vm_offset_t); + pfn = vtophys(vaddr) >> PAGE_SHIFT; + req = RING_GET_REQUEST(&sc->rx, req_prod + i); - if (sc->copying_receiver == 0) { - gnttab_grant_foreign_transfer_ref(ref, - sc->xbdev->otherend_id, - pfn); - sc->rx_pfn_array[nr_flips] = PFNTOMFN(pfn); - if (!xen_feature(XENFEAT_auto_translated_physmap)) { - /* Remove this page before passing - * back to Xen. - */ - set_phys_to_machine(pfn, INVALID_P2M_ENTRY); - MULTI_update_va_mapping(&sc->rx_mcl[i], - vaddr, 0, 0); - } - nr_flips++; - } else { - gnttab_grant_foreign_access_ref(ref, - sc->xbdev->otherend_id, - PFNTOMFN(pfn), - 0); + if (sc->copying_receiver == 0) { + gnttab_grant_foreign_transfer_ref(ref, + sc->xbdev->otherend_id, pfn); + sc->rx_pfn_array[nr_flips] = PFNTOMFN(pfn); + if (!xen_feature(XENFEAT_auto_translated_physmap)) { + /* Remove this page before passing + * back to Xen. + */ + set_phys_to_machine(pfn, INVALID_P2M_ENTRY); + MULTI_update_va_mapping(&sc->rx_mcl[i], + vaddr, 0, 0); } - req->id = id; - req->gref = ref; + nr_flips++; + } else { + gnttab_grant_foreign_access_ref(ref, + sc->xbdev->otherend_id, + PFNTOMFN(pfn), 0); + } + req->id = id; + req->gref = ref; - sc->rx_pfn_array[i] = vtomach(mtod(m_new,vm_offset_t)) >> PAGE_SHIFT; + sc->rx_pfn_array[i] = + vtomach(mtod(m_new,vm_offset_t)) >> PAGE_SHIFT; } - KASSERT(i, ("no mbufs processed")); /* should have returned earlier */ + KASSERT(i, ("no mbufs processed")); /* should have returned earlier */ KASSERT(mbufq_len(&sc->xn_rx_batch) == 0, ("not all mbufs processed")); /* * We may have allocated buffers which have entries outstanding @@ -796,39 +795,40 @@ PT_UPDATES_FLUSH(); if (nr_flips != 0) { #ifdef notyet - /* Tell the ballon driver what is going on. */ - balloon_update_driver_allowance(i); + /* Tell the ballon driver what is going on. */ + balloon_update_driver_allowance(i); #endif - set_xen_guest_handle(reservation.extent_start, sc->rx_pfn_array); - reservation.nr_extents = i; - reservation.extent_order = 0; - reservation.address_bits = 0; - reservation.domid = DOMID_SELF; + set_xen_guest_handle(reservation.extent_start,sc->rx_pfn_array); + reservation.nr_extents = i; + reservation.extent_order = 0; + reservation.address_bits = 0; + reservation.domid = DOMID_SELF; - if (!xen_feature(XENFEAT_auto_translated_physmap)) { + if (!xen_feature(XENFEAT_auto_translated_physmap)) { - /* After all PTEs have been zapped, flush the TLB. */ - sc->rx_mcl[i-1].args[MULTI_UVMFLAGS_INDEX] = - UVMF_TLB_FLUSH|UVMF_ALL; + /* After all PTEs have been zapped, flush the TLB. */ + sc->rx_mcl[i-1].args[MULTI_UVMFLAGS_INDEX] = + UVMF_TLB_FLUSH|UVMF_ALL; - /* Give away a batch of pages. */ - sc->rx_mcl[i].op = __HYPERVISOR_memory_op; - sc->rx_mcl[i].args[0] = XENMEM_decrease_reservation; - sc->rx_mcl[i].args[1] = (unsigned long)&reservation; - /* Zap PTEs and give away pages in one big multicall. */ - (void)HYPERVISOR_multicall(sc->rx_mcl, i+1); - - /* Check return status of HYPERVISOR_dom_mem_op(). */ - if (unlikely(sc->rx_mcl[i].result != i)) - panic("Unable to reduce memory reservation\n"); + /* Give away a batch of pages. */ + sc->rx_mcl[i].op = __HYPERVISOR_memory_op; + sc->rx_mcl[i].args[0] = XENMEM_decrease_reservation; + sc->rx_mcl[i].args[1] = (u_long)&reservation; + /* Zap PTEs and give away pages in one big multicall. */ + (void)HYPERVISOR_multicall(sc->rx_mcl, i+1); + /* Check return status of HYPERVISOR_dom_mem_op(). */ + if (unlikely(sc->rx_mcl[i].result != i)) + panic("Unable to reduce memory reservation\n"); } else { - if (HYPERVISOR_memory_op(XENMEM_decrease_reservation, - &reservation) != i) - panic("Unable to reduce memory reservation\n"); - } + if (HYPERVISOR_memory_op( + XENMEM_decrease_reservation, &reservation) + != i) + panic("Unable to reduce memory " + "reservation\n"); + } } else { - wmb(); + wmb(); } /* Above is a suitable barrier to ensure backend will see requests. */ @@ -836,126 +836,129 @@ push: RING_PUSH_REQUESTS_AND_CHECK_NOTIFY(&sc->rx, notify); if (notify) - notify_remote_via_irq(sc->irq); + notify_remote_via_irq(sc->irq); } static void xn_rxeof(struct netfront_info *np) { - struct ifnet *ifp; - struct netfront_rx_info rinfo; - struct netif_rx_response *rx = &rinfo.rx; - struct netif_extra_info *extras = rinfo.extras; - RING_IDX i, rp; - multicall_entry_t *mcl; - struct mbuf *m; - struct mbuf_head rxq, errq, tmpq; - int err, pages_flipped = 0; + struct ifnet *ifp; + struct netfront_rx_info rinfo; + struct netif_rx_response *rx = &rinfo.rx; + struct netif_extra_info *extras = rinfo.extras; + RING_IDX i, rp; + multicall_entry_t *mcl; + struct mbuf *m; + struct mbuf_head rxq, errq, tmpq; + int err, pages_flipped = 0; + + XN_RX_LOCK_ASSERT(np); + if (!netfront_carrier_ok(np)) + return; - XN_RX_LOCK_ASSERT(np); - if (!netfront_carrier_ok(np)) - return; + mbufq_init(&tmpq); + mbufq_init(&errq); + mbufq_init(&rxq); - mbufq_init(&tmpq); - mbufq_init(&errq); - mbufq_init(&rxq); - - ifp = np->xn_ifp; + ifp = np->xn_ifp; - rp = np->rx.sring->rsp_prod; - rmb(); /* Ensure we see queued responses up to 'rp'. */ + rp = np->rx.sring->rsp_prod; + rmb(); /* Ensure we see queued responses up to 'rp'. */ + + i = np->rx.rsp_cons; + while ((i != rp)) { + memcpy(rx, RING_GET_RESPONSE(&np->rx, i), sizeof(*rx)); + memset(extras, 0, sizeof(rinfo.extras)); + + err = xennet_get_responses(np, &rinfo, rp, &tmpq, + &pages_flipped); - i = np->rx.rsp_cons; - while ((i != rp)) { - memcpy(rx, RING_GET_RESPONSE(&np->rx, i), sizeof(*rx)); - memset(extras, 0, sizeof(rinfo.extras)); + if (unlikely(err)) { + while ((m = mbufq_dequeue(&tmpq))) + mbufq_tail(&errq, m); + np->stats.rx_errors++; + i = np->rx.rsp_cons; + continue; + } - err = xennet_get_responses(np, &rinfo, rp, &tmpq, - &pages_flipped); + m = mbufq_dequeue(&tmpq); - if (unlikely(err)) { - while ((m = mbufq_dequeue(&tmpq))) - mbufq_tail(&errq, m); - np->stats.rx_errors++; - i = np->rx.rsp_cons; - continue; - } + m->m_data += rx->offset;/* (rx->addr & PAGE_MASK); */ + m->m_pkthdr.len = m->m_len = rx->status; + m->m_pkthdr.rcvif = ifp; - m = mbufq_dequeue(&tmpq); - - - m->m_data += rx->offset;/* (rx->addr & PAGE_MASK); */ - m->m_pkthdr.len = m->m_len = rx->status; - m->m_pkthdr.rcvif = ifp; - - if ( rx->flags & NETRXF_data_validated ) { - /* Tell the stack the checksums are okay */ - /* - * XXX this isn't necessarily the case - need to add check - * - */ + if ( rx->flags & NETRXF_data_validated ) { + /* Tell the stack the checksums are okay */ + /* + * XXX this isn't necessarily the case - need to add + * check + */ - m->m_pkthdr.csum_flags |= - (CSUM_IP_CHECKED | CSUM_IP_VALID | CSUM_DATA_VALID | CSUM_PSEUDO_HDR); - m->m_pkthdr.csum_data = 0xffff; - } + m->m_pkthdr.csum_flags |= + (CSUM_IP_CHECKED | CSUM_IP_VALID | CSUM_DATA_VALID + | CSUM_PSEUDO_HDR); + m->m_pkthdr.csum_data = 0xffff; + } - np->stats.rx_packets++; - np->stats.rx_bytes += rx->status; + np->stats.rx_packets++; + np->stats.rx_bytes += rx->status; - mbufq_tail(&rxq, m); - np->rx.rsp_cons = ++i; - } + mbufq_tail(&rxq, m); + np->rx.rsp_cons = ++i; + } - if (pages_flipped) { - /* Some pages are no longer absent... */ + if (pages_flipped) { + /* Some pages are no longer absent... */ #ifdef notyet - balloon_update_driver_allowance(-pages_flipped); + balloon_update_driver_allowance(-pages_flipped); #endif - /* Do all the remapping work, and M->P updates, in one big hypercall. */ - if (!!xen_feature(XENFEAT_auto_translated_physmap)) { - mcl = np->rx_mcl + pages_flipped; - mcl->op = __HYPERVISOR_mmu_update; - mcl->args[0] = (unsigned long)np->rx_mmu; - mcl->args[1] = pages_flipped; - mcl->args[2] = 0; - mcl->args[3] = DOMID_SELF; - (void)HYPERVISOR_multicall(np->rx_mcl, pages_flipped + 1); - } + /* Do all the remapping work, and M->P updates, in one big + * hypercall. + */ + if (!!xen_feature(XENFEAT_auto_translated_physmap)) { + mcl = np->rx_mcl + pages_flipped; + mcl->op = __HYPERVISOR_mmu_update; + mcl->args[0] = (u_long)np->rx_mmu; + mcl->args[1] = pages_flipped; + mcl->args[2] = 0; + mcl->args[3] = DOMID_SELF; + (void)HYPERVISOR_multicall(np->rx_mcl, + pages_flipped + 1); } + } - while ((m = mbufq_dequeue(&errq))) - m_freem(m); + while ((m = mbufq_dequeue(&errq))) + m_freem(m); + /* + * Process all the mbufs after the remapping is complete. + * Break the mbuf chain first though. + */ + while ((m = mbufq_dequeue(&rxq)) != NULL) { + ifp->if_ipackets++; - /* - * Process all the mbufs after the remapping is complete. - * Break the mbuf chain first though. + /* + * Do we really need to drop the rx lock? */ - while ((m = mbufq_dequeue(&rxq)) != NULL) { - ifp->if_ipackets++; - - /* - * Do we really need to drop the rx lock? - */ - XN_RX_UNLOCK(np); - /* Pass it up. */ - (*ifp->if_input)(ifp, m); - XN_RX_LOCK(np); - } + XN_RX_UNLOCK(np); + /* Pass it up. */ + (*ifp->if_input)(ifp, m); + XN_RX_LOCK(np); + } - np->rx.rsp_cons = i; + np->rx.rsp_cons = i; + +#if 0 + /* If we get a callback with very few responses, reduce fill target. */ + /* NB. Note exponential increase, linear decrease. */ + if (((np->rx.req_prod_pvt - np->rx.sring->rsp_prod) > + ((3*np->rx_target) / 4)) && (--np->rx_target < np->rx_min_target)) + np->rx_target = np->rx_min_target; +#endif - /* If we get a callback with very few responses, reduce fill target. */ - /* NB. Note exponential increase, linear decrease. */ - if (((np->rx.req_prod_pvt - np->rx.sring->rsp_prod) > - ((3*np->rx_target) / 4)) && (--np->rx_target < np->rx_min_target)) - np->rx_target = np->rx_min_target; - - network_alloc_rx_buffers(np); + network_alloc_rx_buffers(np); - np->rx.sring->rsp_event = i + 1; - + np->rx.sring->rsp_event = i + 1; } static void @@ -986,10 +989,10 @@ KASSERT(m != NULL, ("mbuf not found in xn_tx_chain")); M_ASSERTVALID(m); if (unlikely(gnttab_query_foreign_access( - np->grant_tx_ref[id]) != 0)) { - printk("network_tx_buf_gc: warning " - "-- grant still in use by backend " - "domain.\n"); + np->grant_tx_ref[id]) != 0)) { + printf("network_tx_buf_gc: warning " + "-- grant still in use by backend " + "domain.\n"); goto out; } gnttab_end_foreign_access_ref( @@ -1005,17 +1008,17 @@ np->tx.rsp_cons = prod; /* - * Set a new event, then check for race with update of tx_cons. Note - * that it is essential to schedule a callback, no matter how few - * buffers are pending. Even if there is space in the transmit ring, - * higher layers may be blocked because too much data is outstanding: - * in such cases notification from Xen is likely to be the only kick + * Set a new event, then check for race with update of + * tx_cons. Note that it is essential to schedule a + * callback, no matter how few buffers are pending. Even if + * there is space in the transmit ring, higher layers may + * be blocked because too much data is outstanding: in such + * cases notification from Xen is likely to be the only kick * that we'll get. */ np->tx.sring->rsp_event = - prod + ((np->tx.sring->req_prod - prod) >> 1) + 1; - - + prod + ((np->tx.sring->req_prod - prod) >> 1) + 1; + mb(); } while (prod != np->tx.sring->rsp_prod); @@ -1038,24 +1041,25 @@ struct netfront_info *np = xsc; struct ifnet *ifp = np->xn_ifp; - +#if 0 if (!(np->rx.rsp_cons != np->rx.sring->rsp_prod && - likely(netfront_carrier_ok(np)) && - ifp->if_drv_flags & IFF_DRV_RUNNING)) - return; + likely(netfront_carrier_ok(np)) && + ifp->if_drv_flags & IFF_DRV_RUNNING)) + return; +#endif if (np->tx.rsp_cons != np->tx.sring->rsp_prod) { - XN_TX_LOCK(np); - xn_txeof(np); - XN_TX_UNLOCK(np); + XN_TX_LOCK(np); + xn_txeof(np); + XN_TX_UNLOCK(np); } - + XN_RX_LOCK(np); xn_rxeof(np); XN_RX_UNLOCK(np); if (ifp->if_drv_flags & IFF_DRV_RUNNING && - !IFQ_DRV_IS_EMPTY(&ifp->if_snd)) - xn_start(ifp); + !IFQ_DRV_IS_EMPTY(&ifp->if_snd)) + xn_start(ifp); } @@ -1063,62 +1067,60 @@ xennet_move_rx_slot(struct netfront_info *np, struct mbuf *m, grant_ref_t ref) { - int new = xennet_rxidx(np->rx.req_prod_pvt); + int new = xennet_rxidx(np->rx.req_prod_pvt); - PANIC_IF(np->rx_mbufs[new] != NULL); - np->rx_mbufs[new] = m; - np->grant_rx_ref[new] = ref; - RING_GET_REQUEST(&np->rx, np->rx.req_prod_pvt)->id = new; - RING_GET_REQUEST(&np->rx, np->rx.req_prod_pvt)->gref = ref; - np->rx.req_prod_pvt++; + KASSERT(np->rx_mbufs[new] == NULL, ("rx_mbufs != NULL")); + np->rx_mbufs[new] = m; + np->grant_rx_ref[new] = ref; + RING_GET_REQUEST(&np->rx, np->rx.req_prod_pvt)->id = new; + RING_GET_REQUEST(&np->rx, np->rx.req_prod_pvt)->gref = ref; + np->rx.req_prod_pvt++; } static int xennet_get_extras(struct netfront_info *np, - struct netif_extra_info *extras, RING_IDX rp) - + struct netif_extra_info *extras, RING_IDX rp) { - struct netif_extra_info *extra; - RING_IDX cons = np->rx.rsp_cons; + struct netif_extra_info *extra; + RING_IDX cons = np->rx.rsp_cons; - int err = 0; + int err = 0; - do { - struct mbuf *m; - grant_ref_t ref; + do { + struct mbuf *m; + grant_ref_t ref; - if (unlikely(cons + 1 == rp)) { + if (unlikely(cons + 1 == rp)) { #if 0 - if (net_ratelimit()) - WPRINTK("Missing extra info\n"); + if (net_ratelimit()) + WPRINTK("Missing extra info\n"); #endif - err = -EINVAL; - break; - } + err = -EINVAL; + break; + } - extra = (struct netif_extra_info *) - RING_GET_RESPONSE(&np->rx, ++cons); + extra = (struct netif_extra_info *) + RING_GET_RESPONSE(&np->rx, ++cons); - if (unlikely(!extra->type || - extra->type >= XEN_NETIF_EXTRA_TYPE_MAX)) { + if (unlikely(!extra->type || + extra->type >= XEN_NETIF_EXTRA_TYPE_MAX)) { #if 0 - if (net_ratelimit()) - WPRINTK("Invalid extra type: %d\n", - extra->type); + if (net_ratelimit()) + WPRINTK("Invalid extra type: %d\n", + extra->type); #endif - err = -EINVAL; - } else { - memcpy(&extras[extra->type - 1], extra, - sizeof(*extra)); - } + err = -EINVAL; + } else { + memcpy(&extras[extra->type - 1], extra, sizeof(*extra)); + } - m = xennet_get_rx_mbuf(np, cons); - ref = xennet_get_rx_ref(np, cons); - xennet_move_rx_slot(np, m, ref); - } while (extra->flags & XEN_NETIF_EXTRA_FLAG_MORE); + m = xennet_get_rx_mbuf(np, cons); + ref = xennet_get_rx_ref(np, cons); + xennet_move_rx_slot(np, m, ref); + } while (extra->flags & XEN_NETIF_EXTRA_FLAG_MORE); - np->rx.rsp_cons = cons; - return err; + np->rx.rsp_cons = cons; + return err; } static int @@ -1127,124 +1129,123 @@ struct mbuf_head *list, int *pages_flipped_p) { - int pages_flipped = *pages_flipped_p; - struct mmu_update *mmu; - struct multicall_entry *mcl; - struct netif_rx_response *rx = &rinfo->rx; - struct netif_extra_info *extras = rinfo->extras; - RING_IDX cons = np->rx.rsp_cons; - struct mbuf *m = xennet_get_rx_mbuf(np, cons); - grant_ref_t ref = xennet_get_rx_ref(np, cons); - int max = 24 /* MAX_SKB_FRAGS + (rx->status <= RX_COPY_THRESHOLD) */; - int frags = 1; - int err = 0; - unsigned long ret; + int pages_flipped = *pages_flipped_p; + struct mmu_update *mmu; + struct multicall_entry *mcl; + struct netif_rx_response *rx = &rinfo->rx; + struct netif_extra_info *extras = rinfo->extras; + RING_IDX cons = np->rx.rsp_cons; + struct mbuf *m = xennet_get_rx_mbuf(np, cons); + grant_ref_t ref = xennet_get_rx_ref(np, cons); + int max = 24 /* MAX_SKB_FRAGS + (rx->status <= RX_COPY_THRESHOLD) */; + int frags = 1; + int err = 0; + u_long ret; - if (rx->flags & NETRXF_extra_info) { - err = xennet_get_extras(np, extras, rp); - cons = np->rx.rsp_cons; - } + if (rx->flags & NETRXF_extra_info) { + err = xennet_get_extras(np, extras, rp); + cons = np->rx.rsp_cons; + } - for (;;) { - unsigned long mfn; + for (;;) { + u_long mfn; - if (unlikely(rx->status < 0 || >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 18 01:29:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E8BB116A46E; Fri, 18 Jan 2008 01:29:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9442016A46B for ; Fri, 18 Jan 2008 01:29:14 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 72CE713C4DD for ; Fri, 18 Jan 2008 01:29:14 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0I1TDP5096366 for ; Fri, 18 Jan 2008 01:29:13 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0I1TChU096363 for perforce@freebsd.org; Fri, 18 Jan 2008 01:29:12 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 18 Jan 2008 01:29:12 GMT Message-Id: <200801180129.m0I1TChU096363@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133516 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 01:29:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=133516 Change 133516 by kmacy@pandemonium:kmacy:xen31 on 2008/01/18 01:28:59 - Be more aggressive about checking the valid bit when looking up ptes. - Release the shadow page directory pages when doing pmap_release. - Workaround the fact that xen loses the managed bit (OS reserved) by checking against the VA being a user address. Affected files ... .. //depot/projects/xen31/sys/i386/xen/pmap.c#22 edit Differences ... ==== //depot/projects/xen31/sys/i386/xen/pmap.c#22 (text+ko) ==== @@ -948,7 +948,7 @@ mtx_lock(&PMAP2mutex); newpf = *pde & PG_FRAME; if ((*PMAP2 & PG_FRAME) != newpf) { - *PMAP2 = newpf | PG_V | PG_A | PG_M; + *PMAP2 = newpf | PG_V | PG_A; pmap_invalidate_page(kernel_pmap, (vm_offset_t)PADDR2); } return (PADDR2 + (i386_btop(va) & (NPTEPG - 1))); @@ -1694,9 +1694,9 @@ vm_paddr_t ma; int i; #ifdef PAE - int npgptd = NPGPTD + 1; + int npgptd = 2*NPGPTD + 1; #else - int npgptd = NPGPTD; + int npgptd = 2*NPGPTD; #endif KASSERT(pmap->pm_stats.resident_count == 0, @@ -1709,19 +1709,17 @@ mtx_unlock_spin(&allpmaps_lock); for (i = 0; i < NPGPTD; i++) - ptdpg[i] = PHYS_TO_VM_PAGE(PT_GET(&pmap->pm_pdir[PTDPTDI + i]) & PG_FRAME); - + ptdpg[i] = PHYS_TO_VM_PAGE(vtophys(pmap->pm_pdir_shadow + (i*NPDEPG)) & PG_FRAME); + for (i = 0; i < NPGPTD; i++) + ptdpg[NPGPTD + i] = PHYS_TO_VM_PAGE(vtophys(pmap->pm_pdir + (i*NPDEPG)) & PG_FRAME); + #ifdef PAE - ptdpg[NPGPTD] = PHYS_TO_VM_PAGE(vtophys(pmap->pm_pdpt)); + ptdpg[2*NPGPTD] = PHYS_TO_VM_PAGE(vtophys(pmap->pm_pdpt)); #endif - for (i = 0; i < nkpt + NPGPTD; i++) - PD_CLEAR_VA(pmap, PTDPTDI + i, FALSE); - - bzero(pmap->pm_pdir + PTDPTDI, (nkpt + NPGPTD) * - sizeof(*pmap->pm_pdir)); - + PT_UPDATES_FLUSH(); pmap_qremove((vm_offset_t)pmap->pm_pdir, NPGPTD); + pmap_qremove((vm_offset_t)pmap->pm_pdir_shadow, NPGPTD); for (i = 0; i < npgptd; i++) { m = ptdpg[i]; @@ -1734,7 +1732,7 @@ #endif m->wire_count--; atomic_subtract_int(&cnt.v_wire_count, 1); - vm_page_free_zero(m); + vm_page_free(m); } PMAP_LOCK_DESTROY(pmap); } @@ -2157,7 +2155,13 @@ if (oldpte & PG_G) pmap_invalidate_page(kernel_pmap, va); pmap->pm_stats.resident_count -= 1; - if (oldpte & PG_MANAGED) { + /* + * XXX This is not strictly correctly, but somewhere along the line + * we are losing the managed bit on some pages. It is unclear to me + * why, but I think the most likely explanation is that xen's writable + * page table implementation doesn't respect the unused bits. + */ + if ((oldpte & PG_MANAGED) || ((oldpte & PG_V) && (va < VM_MAXUSER_ADDRESS))) { m = PHYS_TO_VM_PAGE(xpmap_mtop(oldpte) & PG_FRAME); if (oldpte & PG_M) { KASSERT((oldpte & PG_RW), @@ -2169,6 +2173,10 @@ vm_page_flag_set(m, PG_REFERENCED); pmap_remove_entry(pmap, m, va); } +#ifdef DEBUG + else if (va < VM_MAXUSER_ADDRESS) + printf("va=0x%x is unmanaged :-( \n", va); +#endif return (pmap_unuse_pt(pmap, va, free)); } @@ -2183,7 +2191,7 @@ mtx_assert(&vm_page_queue_mtx, MA_OWNED); KASSERT(curthread->td_pinned > 0, ("curthread not pinned")); PMAP_LOCK_ASSERT(pmap, MA_OWNED); - if ((pte = pmap_pte_quick(pmap, va)) == NULL || *pte == 0) + if ((pte = pmap_pte_quick(pmap, va)) == NULL || (*pte & PG_V) == 0) return; pmap_remove_pte(pmap, pte, va, free); pmap_invalidate_page(pmap, va); @@ -2270,7 +2278,7 @@ for (pte = pmap_pte_quick(pmap, sva); sva != pdnxt; pte++, sva += PAGE_SIZE) { - if (*pte == 0) + if ((*pte & PG_V) == 0) continue; /* @@ -2602,7 +2610,9 @@ if (origpte & PG_MANAGED) { om = PHYS_TO_VM_PAGE(opa); pmap_remove_entry(pmap, om, va); - } + } else if (va < VM_MAXUSER_ADDRESS) + printf("va=0x%x is unmanaged :-( \n", va); + if (mpte != NULL) { mpte->wire_count--; KASSERT(mpte->wire_count > 0, @@ -3278,6 +3288,7 @@ * us a little bit of time as the list * on one of the pages is now corrupt */ + allfree = 0; goto skip; } @@ -3430,7 +3441,6 @@ PMAP_MARK_PRIV(xpmap_mtop(*pte)); pmap_pte_release(pte); } - PT_UPDATES_FLUSH(); } void @@ -3444,7 +3454,6 @@ pte_store(pte, xpmap_mtop(*pte) | (PG_RW|PG_M)); pmap_pte_release(pte); } - PT_UPDATES_FLUSH(); } /* From owner-p4-projects@FreeBSD.ORG Fri Jan 18 01:34:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00C2B16A41B; Fri, 18 Jan 2008 01:34:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BAB9016A46C for ; Fri, 18 Jan 2008 01:34:18 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 80FD413C4FD for ; Fri, 18 Jan 2008 01:34:18 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0I1YIoL097716 for ; Fri, 18 Jan 2008 01:34:18 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0I1YIRQ097713 for perforce@freebsd.org; Fri, 18 Jan 2008 01:34:18 GMT (envelope-from imp@freebsd.org) Date: Fri, 18 Jan 2008 01:34:18 GMT Message-Id: <200801180134.m0I1YIRQ097713@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133517 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 01:34:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=133517 Change 133517 by imp@imp_lighthouse on 2008/01/18 01:33:32 p4 integrate over the mips2 cpu.c Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/cpu-mips2.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jan 18 03:22:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FB3816A41A; Fri, 18 Jan 2008 03:22:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 252EC16A418 for ; Fri, 18 Jan 2008 03:22:10 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EF16C13C457 for ; Fri, 18 Jan 2008 03:22:09 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0I3M9UU016006 for ; Fri, 18 Jan 2008 03:22:09 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0I3M9aw016003 for perforce@freebsd.org; Fri, 18 Jan 2008 03:22:09 GMT (envelope-from imp@freebsd.org) Date: Fri, 18 Jan 2008 03:22:09 GMT Message-Id: <200801180322.m0I3M9aw016003@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133519 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 03:22:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=133519 Change 133519 by imp@imp_lighthouse on 2008/01/18 03:22:01 We need some stuff from in here. There's a bunch of undefines now, but I'll sort that out in the next iteration. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/conf/files.mips#8 edit .. //depot/projects/mips2-jnpr/src/sys/mips/include/locore.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/cpu-mips2.c#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/conf/files.mips#8 (text+ko) ==== @@ -43,6 +43,7 @@ # ---------------------------------------------------------------------- mips/mips/autoconf.c standard mips/mips/cpu.c standard +mips/mips/cpu-mips2.c standard mips/mips/elf_machdep.c standard mips/mips/exception.S standard mips/mips/gdb_machdep.c standard ==== //depot/projects/mips2-jnpr/src/sys/mips/include/locore.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: locore.h,v 1.62 2002/06/01 13:45:45 simonb Exp $ */ +/* $NetBSD: locore.h,v 1.78 2007/10/17 19:55:36 garbled Exp $ */ /* * Copyright 1996 The Board of Trustees of The Leland Stanford @@ -34,24 +34,31 @@ /* * CPU identification, from PRID register. */ +typedef int mips_prid_t; -#define MIPS_PRID_REV(x) (((x) >> 0) & 0x00ff) -#define MIPS_PRID_IMPL(x) (((x) >> 8) & 0x00ff) +#define MIPS_PRID_REV(x) (((x) >> 0) & 0x00ff) +#define MIPS_PRID_IMPL(x) (((x) >> 8) & 0x00ff) /* pre-MIPS32/64 */ -#define MIPS_PRID_RSVD(x) (((x) >> 16) & 0xffff) -#define MIPS_PRID_REV_MIN(x) ((MIPS_PRID_REV(x) >> 0) & 0x0f) -#define MIPS_PRID_REV_MAJ(x) ((MIPS_PRID_REV(x) >> 4) & 0x0f) +#define MIPS_PRID_RSVD(x) (((x) >> 16) & 0xffff) +#define MIPS_PRID_REV_MIN(x) ((MIPS_PRID_REV(x) >> 0) & 0x0f) +#define MIPS_PRID_REV_MAJ(x) ((MIPS_PRID_REV(x) >> 4) & 0x0f) /* MIPS32/64 */ -#define MIPS_PRID_CID(x) (((x) >> 16) & 0x00ff) /* Company ID */ -#define MIPS_PRID_CID_PREHISTORIC 0x00 /* Not MIPS32/64 */ -#define MIPS_PRID_CID_MTI 0x01 /* MIPS Technologies, Inc. */ -#define MIPS_PRID_CID_BROADCOM 0x02 /* Broadcom */ -#define MIPS_PRID_CID_ALCHEMY 0x03 /* Alchemy Semiconductor */ -#define MIPS_PRID_CID_SIBYTE 0x04 /* SiByte */ -#define MIPS_PRID_CID_SANDCRAFT 0x05 /* SandCraft */ -#define MIPS_PRID_COPTS(x) (((x) >> 24) & 0x00ff) /* Company Options */ +#define MIPS_PRID_CID(x) (((x) >> 16) & 0x00ff) /* Company ID */ +#define MIPS_PRID_CID_PREHISTORIC 0x00 /* Not MIPS32/64 */ +#define MIPS_PRID_CID_MTI 0x01 /* MIPS Technologies, Inc. */ +#define MIPS_PRID_CID_BROADCOM 0x02 /* Broadcom */ +#define MIPS_PRID_CID_ALCHEMY 0x03 /* Alchemy Semiconductor */ +#define MIPS_PRID_CID_SIBYTE 0x04 /* SiByte */ +#define MIPS_PRID_CID_SANDCRAFT 0x05 /* SandCraft */ +#define MIPS_PRID_CID_PHILIPS 0x06 /* Philips */ +#define MIPS_PRID_CID_TOSHIBA 0x07 /* Toshiba */ +#define MIPS_PRID_CID_LSI 0x08 /* LSI */ + /* 0x09 unannounced */ + /* 0x0a unannounced */ +#define MIPS_PRID_CID_LEXRA 0x0b /* Lexra */ +#define MIPS_PRID_COPTS(x) (((x) >> 24) & 0x00ff) /* Company Options */ #ifdef _KERNEL #ifdef __HAVE_MIPS_MACHDEP_CACHE_CONFIG ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/cpu-mips2.c#2 (text+ko) ==== @@ -48,12 +48,10 @@ #include /* - * cpu_id and fpu_id are initialized in locore.S. mips_num_tlb_entries is + * mips_num_tlb_entries is * initialized by us in the mips_cpu_init thingo. */ int mips_num_tlb_entries; -int cpu_id; -int fpu_id; void mips_get_identity(struct mips_cpuinfo *cpuinfo); From owner-p4-projects@FreeBSD.ORG Fri Jan 18 05:25:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 548D416A420; Fri, 18 Jan 2008 05:25:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0210216A417 for ; Fri, 18 Jan 2008 05:25:21 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AB5EC13C442 for ; Fri, 18 Jan 2008 05:25:20 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0I5PKLm045798 for ; Fri, 18 Jan 2008 05:25:20 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0I5PKss045795 for perforce@freebsd.org; Fri, 18 Jan 2008 05:25:20 GMT (envelope-from imp@freebsd.org) Date: Fri, 18 Jan 2008 05:25:20 GMT Message-Id: <200801180525.m0I5PKss045795@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133522 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 05:25:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=133522 Change 133522 by imp@imp_paco-paco on 2008/01/18 05:25:09 Prefer ${SHELL} to sh, since I like it. Sadly, I got complaints when I proposed it for -current. Affected files ... .. //depot/projects/mips2/src/Makefile.inc1#8 edit Differences ... ==== //depot/projects/mips2/src/Makefile.inc1#8 (text+ko) ==== @@ -517,7 +517,7 @@ buildenv: @echo Entering world for ${TARGET_ARCH}:${TARGET} - @cd ${.CURDIR} && env ${WMAKEENV} sh || true + @cd ${.CURDIR} && env ${WMAKEENV} ${SHELL} || true TOOLCHAIN_TGTS= ${WMAKE_TGTS:N_depend:Neverything:Nbuild32} toolchain: ${TOOLCHAIN_TGTS} From owner-p4-projects@FreeBSD.ORG Fri Jan 18 05:32:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 233A816A419; Fri, 18 Jan 2008 05:32:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AC49616A418 for ; Fri, 18 Jan 2008 05:32:28 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 77F7013C458 for ; Fri, 18 Jan 2008 05:32:28 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0I5WSl7047080 for ; Fri, 18 Jan 2008 05:32:28 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0I5WSsY047069 for perforce@freebsd.org; Fri, 18 Jan 2008 05:32:28 GMT (envelope-from imp@freebsd.org) Date: Fri, 18 Jan 2008 05:32:28 GMT Message-Id: <200801180532.m0I5WSsY047069@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133523 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 05:32:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=133523 Change 133523 by imp@imp_paco-paco on 2008/01/18 05:31:51 Go ahead and integrate my cross build patches here so that I can build cross compilers. Affected files ... .. //depot/projects/mips2/src/Makefile#6 edit .. //depot/projects/mips2/src/Makefile.inc1#9 edit Differences ... ==== //depot/projects/mips2/src/Makefile#6 (text+ko) ==== @@ -1,5 +1,6 @@ +#OSX hint: bsdmake BSDMKAE=bsdmake MACHINE_ARCH=i386 # -# $FreeBSD: src/Makefile,v 1.344 2007/12/13 00:08:02 imp Exp $ +# $FreeBSD: src/Makefile,v 1.342 2007/10/18 08:41:52 delphij Exp $ # # The user-driven targets are: # @@ -93,6 +94,8 @@ BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/} TGTS+= ${BITGTS} +TGTS+= xdev xdev-build xdev-install + .ORDER: buildworld installworld .ORDER: buildworld distributeworld .ORDER: buildworld buildkernel @@ -163,7 +166,7 @@ # ${TGTS}: - ${_+_}@cd ${.CURDIR}; \ + ${_+_}cd ${.CURDIR}; \ ${_MAKE} ${.TARGET} # Set a reasonable default @@ -239,11 +242,11 @@ # # Upgrade make(1) to the current version using the installed -# headers, libraries and tools. Also, allow the location of -# the system bsdmake-like utility to be overridden. +# headers, libraries and tools. # MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \ DESTDIR= \ + LIBC= \ INSTALL="sh ${.CURDIR}/tools/install.sh" MMAKE= ${MMAKEENV} ${MAKE} \ -D_UPGRADING \ ==== //depot/projects/mips2/src/Makefile.inc1#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.591 2007/12/04 12:55:27 yar Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.589 2007/10/15 13:50:46 emaste Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -113,7 +113,7 @@ TARGET?= ${MACHINE} TARGET_ARCH?= ${MACHINE_ARCH} -KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 mips powerpc sparc64 sparc64/sun4v +KNOWN_ARCHES?= amd64 arm armeb/arm i386 i386/pc98 ia64 powerpc sparc64 sparc64/sun4v .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else @@ -159,14 +159,7 @@ STRICTTMPPATH= ${BPATH}:${XPATH} TMPPATH= ${STRICTTMPPATH}:${PATH} -# -# Avoid running mktemp(1) unless actually needed. -# It may not be functional, e.g., due to new ABI -# when in the middle of installing over this system. -# -.if make(distributeworld) || make(installworld) INSTALLTMP!= /usr/bin/mktemp -d -u -t install -.endif # # Building a world goes through the following stages @@ -214,7 +207,7 @@ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} \ -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \ - -DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \ + -DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE \ -DNO_CPU_CFLAGS -DNO_WARNS # build-tools stage @@ -272,16 +265,14 @@ .endif # install stage -IMAKEENV= ${CROSSENV} -IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 .if empty(.MAKEFLAGS:M-n) -IMAKEENV+= PATH=${STRICTTMPPATH}:${INSTALLTMP} \ - LD_LIBRARY_PATH=${INSTALLTMP} \ - PATH_LOCALE=${INSTALLTMP}/locale -IMAKE+= __MAKE_SHELL=${INSTALLTMP}/sh +IMAKEENV= ${CROSSENV} \ + PATH=${STRICTTMPPATH}:${INSTALLTMP} .else -IMAKEENV+= PATH=${TMPPATH}:${INSTALLTMP} +IMAKEENV= ${CROSSENV} \ + PATH=${TMPPATH}:${INSTALLTMP} .endif +IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 # kernel stage KMAKEENV= ${WMAKEENV} @@ -573,14 +564,6 @@ .endfor # -# Required install tools to be saved in a scratch dir for safety. -# -ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ - date echo egrep find grep install-info \ - ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ - test true uname wc zic - -# # distributeworld # # Distributes everything compiled by a `buildworld'. @@ -591,28 +574,19 @@ # distributeworld installworld: installcheck mkdir -p ${INSTALLTMP} - progs=$$(for prog in ${ITOOLS}; do \ + for prog in [ awk cap_mkdb cat chflags chmod chown \ + date echo egrep find grep install-info \ + ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ + test true uname wc zic; do \ if progpath=`which $$prog`; then \ - echo $$progpath; \ + cp $$progpath ${INSTALLTMP}; \ else \ - echo "Required tool $$prog not found in PATH." >&2; \ + echo "Required install tool $$prog not found" >&2; \ exit 1; \ fi; \ - done); \ - libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \ - while read line; do \ - set -- $$line; \ - if [ "$$2 $$3" != "not found" ]; then \ - echo $$2; \ - else \ - echo "Required library $$1 not found." >&2; \ - exit 1; \ - fi; \ - done); \ - cp $$libs $$progs ${INSTALLTMP} - cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale - ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ - ${IMAKEENV} rm -rf ${INSTALLTMP} + done + ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//} + rm -rf ${INSTALLTMP} # # reinstall @@ -837,11 +811,12 @@ # to attempt to manually finish it. If in doubt, 'make world' again. # +UNAME_SYSTEM!= uname # # legacy: Build compatibility shims for the next three targets # legacy: -.if ${BOOTSTRAPPING} < 503000 +.if ${BOOTSTRAPPING} < 503000 && ${UNAME_SYSTEM} == "FreeBSD" @echo "ERROR: Source upgrades from versions prior to 5.3 not supported."; \ false .endif @@ -900,10 +875,6 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif -.if ${BOOTSTRAPPING} < 600020 -_pwd_mkdb= usr.sbin/pwd_mkdb -.endif - bootstrap-tools: .for _tool in \ ${_strfile} \ @@ -919,9 +890,10 @@ usr.bin/rpcgen \ usr.bin/xinstall \ ${_gensnmptree} \ + usr.bin/file2c \ + lib/libsbuf \ usr.sbin/config \ - ${_crunchgen} \ - ${_pwd_mkdb} + ${_crunchgen} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ @@ -937,7 +909,7 @@ _aicasm= sys/modules/aic7xxx/aicasm .endif -.if !defined(NO_SHARE) +.if !defined(NO_SHARE) && ${UNAME_SYSTEM} == "FreeBSD" _share= share/syscons/scrnmaps .endif @@ -959,8 +931,7 @@ ${_share} \ ${_aicasm} \ usr.bin/awk \ - lib/libmagic \ - usr.sbin/sysinstall + ${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ @@ -1289,3 +1260,88 @@ # showconfig: @${MAKE} -n -f bsd.own.mk -V dummy -dg1 | grep ^MK_ | sort + + +############### + +.if defined(XDEV) && defined(XDEV_ARCH) + +NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \ + -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE + +XDDIR=${XDEV}-freebsd +XDTP=/usr/${XDDIR} +CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \ + TARGET=${XDEV} \ + TARGET_ARCH=${XDEV_ARCH} +CDENV= ${CDBENV} \ + _SHLIBDIRPREFIX=${XDTP} \ + TOOLS_PREFIX=${XDTP} \ + MACHINE=${XDEV} \ + MACHINE_ARCH=${XDEV_ARCH} + +CDTMP= ${MAKEOBJDIRPREFIX}/${XDEV}/${.CURDIR}/tmp +CDMAKE=${CDENV} ${MAKE} ${NOFUN} +CD2MAKE=${CDENV} PATH=${CDTMP}/usr/bin:${XDTP}/usr/bin:${PATH} ${MAKE} ${NOFUN} +XDDESTDIR=${DESTDIR}${XDTP} + +.ORDER: xdev-build xdev-install +xdev: xdev-build xdev-install + +.ORDER: _xb-build-tools _xb-cross-tools +xdev-build: _xb-build-tools _xb-cross-tools + +_xb-build-tools: + ${_+_}cd ${.CURDIR}; \ + ${CDBENV} ${MAKE} -f Makefile.inc1 build-tools + +_xb-cross-tools: +.for _tool in \ + gnu/usr.bin/binutils \ + gnu/usr.bin/cc + ${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,depend,all)"; \ + cd ${.CURDIR}/${_tool}; \ + ${CDMAKE} DIRPRFX=${_tool}/ obj; \ + ${CDMAKE} DIRPRFX=${_tool}/ depend; \ + ${CDMAKE} DIRPRFX=${_tool}/ all +.endfor + + ${_+_}cd ${.CURDIR}; ${TMAKE} build-tools + +_xi-mtree: + ${_+_}@${ECHODIR} "mtree populating ${XDDESTDIR}" + mkdir -p ${XDDESTDIR} + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \ + -p ${XDDESTDIR} >/dev/null + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ + -p ${XDDESTDIR}/usr >/dev/null + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ + -p ${XDDESTDIR}/usr/include >/dev/null + +.ORDER: _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links +xdev-install: _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links + +_xi-cross-tools: +.for _tool in \ + gnu/usr.bin/binutils \ + gnu/usr.bin/cc + ${_+_}@${ECHODIR} "===> xdev ${_tool} (install)"; \ + cd ${.CURDIR}/${_tool}; \ + ${CDMAKE} DIRPRFX=${_tool}/ install DESTDIR=${XDDESTDIR} +.endfor + +_xi-includes: + ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 par-includes \ + DESTDIR=${XDDESTDIR} + +_xi-libraries: + ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 libraries \ + DESTDIR=${XDDESTDIR} + +_xi-links: + ${_+_}cd ${XDDESTDIR}/usr/bin; \ + for i in *; do \ + ln -sf ../../${XDTP}/usr/bin/$$i \ + ../../../../usr/bin/${XDDIR}-$$i; \ + done +.endif From owner-p4-projects@FreeBSD.ORG Fri Jan 18 05:33:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F00516A418; Fri, 18 Jan 2008 05:33:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B004816A41A for ; Fri, 18 Jan 2008 05:33:29 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7C36613C45A for ; Fri, 18 Jan 2008 05:33:29 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0I5XTHe047164 for ; Fri, 18 Jan 2008 05:33:29 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0I5XT0I047161 for perforce@freebsd.org; Fri, 18 Jan 2008 05:33:29 GMT (envelope-from imp@freebsd.org) Date: Fri, 18 Jan 2008 05:33:29 GMT Message-Id: <200801180533.m0I5XT0I047161@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133524 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 05:33:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=133524 Change 133524 by imp@imp_paco-paco on 2008/01/18 05:32:56 Integrate the Makefile changes from mips2 Affected files ... .. //depot/projects/mips2-jnpr/src/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/Makefile.inc1#2 integrate Differences ... ==== //depot/projects/mips2-jnpr/src/Makefile#2 (text+ko) ==== @@ -1,5 +1,6 @@ +#OSX hint: bsdmake BSDMKAE=bsdmake MACHINE_ARCH=i386 # -# $FreeBSD: src/Makefile,v 1.344 2007/12/13 00:08:02 imp Exp $ +# $FreeBSD: src/Makefile,v 1.342 2007/10/18 08:41:52 delphij Exp $ # # The user-driven targets are: # @@ -93,6 +94,8 @@ BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/} TGTS+= ${BITGTS} +TGTS+= xdev xdev-build xdev-install + .ORDER: buildworld installworld .ORDER: buildworld distributeworld .ORDER: buildworld buildkernel @@ -163,7 +166,7 @@ # ${TGTS}: - ${_+_}@cd ${.CURDIR}; \ + ${_+_}cd ${.CURDIR}; \ ${_MAKE} ${.TARGET} # Set a reasonable default @@ -239,11 +242,11 @@ # # Upgrade make(1) to the current version using the installed -# headers, libraries and tools. Also, allow the location of -# the system bsdmake-like utility to be overridden. +# headers, libraries and tools. # MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \ DESTDIR= \ + LIBC= \ INSTALL="sh ${.CURDIR}/tools/install.sh" MMAKE= ${MMAKEENV} ${MAKE} \ -D_UPGRADING \ ==== //depot/projects/mips2-jnpr/src/Makefile.inc1#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.591 2007/12/04 12:55:27 yar Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.589 2007/10/15 13:50:46 emaste Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -113,7 +113,7 @@ TARGET?= ${MACHINE} TARGET_ARCH?= ${MACHINE_ARCH} -KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 mips powerpc sparc64 sparc64/sun4v +KNOWN_ARCHES?= amd64 arm armeb/arm i386 i386/pc98 ia64 powerpc sparc64 sparc64/sun4v .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else @@ -159,14 +159,7 @@ STRICTTMPPATH= ${BPATH}:${XPATH} TMPPATH= ${STRICTTMPPATH}:${PATH} -# -# Avoid running mktemp(1) unless actually needed. -# It may not be functional, e.g., due to new ABI -# when in the middle of installing over this system. -# -.if make(distributeworld) || make(installworld) INSTALLTMP!= /usr/bin/mktemp -d -u -t install -.endif # # Building a world goes through the following stages @@ -214,7 +207,7 @@ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} \ -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \ - -DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \ + -DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE \ -DNO_CPU_CFLAGS -DNO_WARNS # build-tools stage @@ -272,16 +265,14 @@ .endif # install stage -IMAKEENV= ${CROSSENV} -IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 .if empty(.MAKEFLAGS:M-n) -IMAKEENV+= PATH=${STRICTTMPPATH}:${INSTALLTMP} \ - LD_LIBRARY_PATH=${INSTALLTMP} \ - PATH_LOCALE=${INSTALLTMP}/locale -IMAKE+= __MAKE_SHELL=${INSTALLTMP}/sh +IMAKEENV= ${CROSSENV} \ + PATH=${STRICTTMPPATH}:${INSTALLTMP} .else -IMAKEENV+= PATH=${TMPPATH}:${INSTALLTMP} +IMAKEENV= ${CROSSENV} \ + PATH=${TMPPATH}:${INSTALLTMP} .endif +IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 # kernel stage KMAKEENV= ${WMAKEENV} @@ -517,7 +508,7 @@ buildenv: @echo Entering world for ${TARGET_ARCH}:${TARGET} - @cd ${.CURDIR} && env ${WMAKEENV} sh || true + @cd ${.CURDIR} && env ${WMAKEENV} ${SHELL} || true TOOLCHAIN_TGTS= ${WMAKE_TGTS:N_depend:Neverything:Nbuild32} toolchain: ${TOOLCHAIN_TGTS} @@ -573,14 +564,6 @@ .endfor # -# Required install tools to be saved in a scratch dir for safety. -# -ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ - date echo egrep find grep install-info \ - ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ - test true uname wc zic - -# # distributeworld # # Distributes everything compiled by a `buildworld'. @@ -591,28 +574,19 @@ # distributeworld installworld: installcheck mkdir -p ${INSTALLTMP} - progs=$$(for prog in ${ITOOLS}; do \ + for prog in [ awk cap_mkdb cat chflags chmod chown \ + date echo egrep find grep install-info \ + ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ + test true uname wc zic; do \ if progpath=`which $$prog`; then \ - echo $$progpath; \ + cp $$progpath ${INSTALLTMP}; \ else \ - echo "Required tool $$prog not found in PATH." >&2; \ + echo "Required install tool $$prog not found" >&2; \ exit 1; \ fi; \ - done); \ - libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \ - while read line; do \ - set -- $$line; \ - if [ "$$2 $$3" != "not found" ]; then \ - echo $$2; \ - else \ - echo "Required library $$1 not found." >&2; \ - exit 1; \ - fi; \ - done); \ - cp $$libs $$progs ${INSTALLTMP} - cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale - ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ - ${IMAKEENV} rm -rf ${INSTALLTMP} + done + ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//} + rm -rf ${INSTALLTMP} # # reinstall @@ -837,11 +811,12 @@ # to attempt to manually finish it. If in doubt, 'make world' again. # +UNAME_SYSTEM!= uname # # legacy: Build compatibility shims for the next three targets # legacy: -.if ${BOOTSTRAPPING} < 503000 +.if ${BOOTSTRAPPING} < 503000 && ${UNAME_SYSTEM} == "FreeBSD" @echo "ERROR: Source upgrades from versions prior to 5.3 not supported."; \ false .endif @@ -900,10 +875,6 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif -.if ${BOOTSTRAPPING} < 600020 -_pwd_mkdb= usr.sbin/pwd_mkdb -.endif - bootstrap-tools: .for _tool in \ ${_strfile} \ @@ -919,9 +890,10 @@ usr.bin/rpcgen \ usr.bin/xinstall \ ${_gensnmptree} \ + usr.bin/file2c \ + lib/libsbuf \ usr.sbin/config \ - ${_crunchgen} \ - ${_pwd_mkdb} + ${_crunchgen} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ @@ -937,7 +909,7 @@ _aicasm= sys/modules/aic7xxx/aicasm .endif -.if !defined(NO_SHARE) +.if !defined(NO_SHARE) && ${UNAME_SYSTEM} == "FreeBSD" _share= share/syscons/scrnmaps .endif @@ -959,8 +931,7 @@ ${_share} \ ${_aicasm} \ usr.bin/awk \ - lib/libmagic \ - usr.sbin/sysinstall + ${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ @@ -1289,3 +1260,88 @@ # showconfig: @${MAKE} -n -f bsd.own.mk -V dummy -dg1 | grep ^MK_ | sort + + +############### + +.if defined(XDEV) && defined(XDEV_ARCH) + +NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \ + -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE + +XDDIR=${XDEV}-freebsd +XDTP=/usr/${XDDIR} +CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \ + TARGET=${XDEV} \ + TARGET_ARCH=${XDEV_ARCH} +CDENV= ${CDBENV} \ + _SHLIBDIRPREFIX=${XDTP} \ + TOOLS_PREFIX=${XDTP} \ + MACHINE=${XDEV} \ + MACHINE_ARCH=${XDEV_ARCH} + +CDTMP= ${MAKEOBJDIRPREFIX}/${XDEV}/${.CURDIR}/tmp +CDMAKE=${CDENV} ${MAKE} ${NOFUN} +CD2MAKE=${CDENV} PATH=${CDTMP}/usr/bin:${XDTP}/usr/bin:${PATH} ${MAKE} ${NOFUN} +XDDESTDIR=${DESTDIR}${XDTP} + +.ORDER: xdev-build xdev-install +xdev: xdev-build xdev-install + +.ORDER: _xb-build-tools _xb-cross-tools +xdev-build: _xb-build-tools _xb-cross-tools + +_xb-build-tools: + ${_+_}cd ${.CURDIR}; \ + ${CDBENV} ${MAKE} -f Makefile.inc1 build-tools + +_xb-cross-tools: +.for _tool in \ + gnu/usr.bin/binutils \ + gnu/usr.bin/cc + ${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,depend,all)"; \ + cd ${.CURDIR}/${_tool}; \ + ${CDMAKE} DIRPRFX=${_tool}/ obj; \ + ${CDMAKE} DIRPRFX=${_tool}/ depend; \ + ${CDMAKE} DIRPRFX=${_tool}/ all +.endfor + + ${_+_}cd ${.CURDIR}; ${TMAKE} build-tools + +_xi-mtree: + ${_+_}@${ECHODIR} "mtree populating ${XDDESTDIR}" + mkdir -p ${XDDESTDIR} + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \ + -p ${XDDESTDIR} >/dev/null + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ + -p ${XDDESTDIR}/usr >/dev/null + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ + -p ${XDDESTDIR}/usr/include >/dev/null + +.ORDER: _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links +xdev-install: _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links + +_xi-cross-tools: +.for _tool in \ + gnu/usr.bin/binutils \ + gnu/usr.bin/cc + ${_+_}@${ECHODIR} "===> xdev ${_tool} (install)"; \ + cd ${.CURDIR}/${_tool}; \ + ${CDMAKE} DIRPRFX=${_tool}/ install DESTDIR=${XDDESTDIR} +.endfor + +_xi-includes: + ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 par-includes \ + DESTDIR=${XDDESTDIR} + +_xi-libraries: + ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 libraries \ + DESTDIR=${XDDESTDIR} + +_xi-links: + ${_+_}cd ${XDDESTDIR}/usr/bin; \ + for i in *; do \ + ln -sf ../../${XDTP}/usr/bin/$$i \ + ../../../../usr/bin/${XDDIR}-$$i; \ + done +.endif From owner-p4-projects@FreeBSD.ORG Fri Jan 18 05:54:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C98216A468; Fri, 18 Jan 2008 05:54:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C633D16A420 for ; Fri, 18 Jan 2008 05:54:52 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 91EA813C455 for ; Fri, 18 Jan 2008 05:54:52 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0I5squZ050759 for ; Fri, 18 Jan 2008 05:54:52 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0I5sqTP050756 for perforce@freebsd.org; Fri, 18 Jan 2008 05:54:52 GMT (envelope-from imp@freebsd.org) Date: Fri, 18 Jan 2008 05:54:52 GMT Message-Id: <200801180554.m0I5sqTP050756@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133526 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 05:54:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=133526 Change 133526 by imp@imp_paco-paco on 2008/01/18 05:54:14 Don't include pte.h or define machine, since machdep.c defines that. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/cpu-mips2.c#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/cpu-mips2.c#3 (text+ko) ==== @@ -45,7 +45,6 @@ #include #include #include -#include /* * mips_num_tlb_entries is @@ -55,11 +54,6 @@ void mips_get_identity(struct mips_cpuinfo *cpuinfo); -char machine[] = "mips"; - -SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, - machine, 0, "Machine class"); - /* * Exception vector table management. */ From owner-p4-projects@FreeBSD.ORG Fri Jan 18 05:57:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E137C16A41B; Fri, 18 Jan 2008 05:57:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8E53B16A419 for ; Fri, 18 Jan 2008 05:57:56 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 59F2813C47E for ; Fri, 18 Jan 2008 05:57:56 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0I5vu4m050898 for ; Fri, 18 Jan 2008 05:57:56 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0I5vuWc050895 for perforce@freebsd.org; Fri, 18 Jan 2008 05:57:56 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 18 Jan 2008 05:57:56 GMT Message-Id: <200801180557.m0I5vuWc050895@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133527 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 05:57:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=133527 Change 133527 by kmacy@pandemonium:kmacy:xen31 on 2008/01/18 05:57:33 convert console lock to spin mutex as the output routines can be called from interrupt context Affected files ... .. //depot/projects/xen31/sys/dev/xen/console/console.c#7 edit Differences ... ==== //depot/projects/xen31/sys/dev/xen/console/console.c#7 (text+ko) ==== @@ -76,9 +76,10 @@ #define XCUNIT(x) (minor(x)) #define ISTTYOPEN(tp) ((tp) && ((tp)->t_state & TS_ISOPEN)) #define CN_LOCK_INIT(x, _name) \ - mtx_init(&x, _name, NULL, MTX_DEF|MTX_RECURSE) -#define CN_LOCK(l) mtx_lock(&(l)) -#define CN_UNLOCK(l) mtx_unlock(&(l)) + mtx_init(&x, _name, NULL, MTX_SPIN|MTX_RECURSE) + +#define CN_LOCK(l) mtx_lock_spin(&(l)) +#define CN_UNLOCK(l) mtx_unlock_spin(&(l)) #define CN_LOCK_ASSERT(x) mtx_assert(&x, MA_OWNED) #define CN_LOCK_DESTROY(x) mtx_destroy(&x) @@ -162,9 +163,7 @@ static void xccnputc(struct consdev *dev, int c) { - CN_LOCK(cn_mtx); xcons_putc(c); - CN_UNLOCK(cn_mtx); } static void @@ -288,20 +287,20 @@ int i; struct tty *tp = xccons; - CN_LOCK(cn_mtx); for (i = 0; i < len; i++) { - if (xen_console_up) + if (xen_console_up) (*linesw[tp->t_line]->l_rint)(buf[i], tp); else rbuf[RBUF_MASK(rp++)] = buf[i]; } - CN_UNLOCK(cn_mtx); } static void __xencons_tx_flush(void) { int sz, work_done = 0; + + CN_LOCK(cn_mtx); while (wc != wp) { int sent; sz = wp - wc; @@ -318,7 +317,8 @@ } work_done = 1; } - + CN_UNLOCK(cn_mtx); + if (work_done && xen_console_up) ttwakeup(xccons); } @@ -326,9 +326,7 @@ void xencons_tx(void) { - CN_LOCK(cn_mtx); __xencons_tx_flush(); - CN_UNLOCK(cn_mtx); } static void @@ -432,31 +430,33 @@ static void xcstart(struct tty *tp) { - int s; boolean_t cons_full = FALSE; - s = spltty(); CN_LOCK(cn_mtx); if (tp->t_state & (TS_TIMEOUT | TS_TTSTOP)) { + CN_UNLOCK(cn_mtx); + ttwwakeup(tp); - CN_UNLOCK(cn_mtx); return; } tp->t_state |= TS_BUSY; + CN_UNLOCK(cn_mtx); + while (tp->t_outq.c_cc != 0 && !cons_full) cons_full = xcons_putc(getc(&tp->t_outq)); /* if the console is close to full leave our state as busy */ if (!cons_full) { - tp->t_state &= ~TS_BUSY; - ttwwakeup(tp); + CN_LOCK(cn_mtx); + tp->t_state &= ~TS_BUSY; + CN_UNLOCK(cn_mtx); + ttwwakeup(tp); } else { /* let the timeout kick us in a bit */ xc_start_needed = TRUE; } - CN_UNLOCK(cn_mtx); - splx(s); + } static void From owner-p4-projects@FreeBSD.ORG Fri Jan 18 06:32:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9ABF316A46C; Fri, 18 Jan 2008 06:32:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5EE4816A41B for ; Fri, 18 Jan 2008 06:32:33 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1039313C4CE for ; Fri, 18 Jan 2008 06:32:33 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0I6WXTr057557 for ; Fri, 18 Jan 2008 06:32:33 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0I6WXAT057551 for perforce@freebsd.org; Fri, 18 Jan 2008 06:32:33 GMT (envelope-from marcel@freebsd.org) Date: Fri, 18 Jan 2008 06:32:33 GMT Message-Id: <200801180632.m0I6WXAT057551@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 133528 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 06:32:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=133528 Change 133528 by marcel@marcel_xcllnt on 2008/01/18 06:31:44 Diff reduction. Affected files ... .. //depot/projects/powerpc/sys/powerpc/conf/GENERIC#13 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/conf/GENERIC#13 (text+ko) ==== @@ -104,7 +104,6 @@ device miibus # MII bus support device bge # Broadcom BCM570xx Gigabit Ethernet device gem # Sun GEM/Sun ERI/Apple GMAC -device bge device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) From owner-p4-projects@FreeBSD.ORG Fri Jan 18 06:32:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FF1F16A517; Fri, 18 Jan 2008 06:32:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94DBC16A469 for ; Fri, 18 Jan 2008 06:32:33 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5E34D13C4DB for ; Fri, 18 Jan 2008 06:32:33 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0I6WX0o057563 for ; Fri, 18 Jan 2008 06:32:33 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0I6WXIl057560 for perforce@freebsd.org; Fri, 18 Jan 2008 06:32:33 GMT (envelope-from imp@freebsd.org) Date: Fri, 18 Jan 2008 06:32:33 GMT Message-Id: <200801180632.m0I6WXIl057560@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133529 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 06:32:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=133529 Change 133529 by imp@imp_paco-paco on 2008/01/18 06:32:25 rearrange things a little to eliminate all the redundant decls and missing decls. We now link. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/md_var.h#9 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/cpu-mips2.c#4 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#15 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/md_var.h#9 (text+ko) ==== @@ -61,6 +61,7 @@ #define MIPS_DEBUG_PRINT(fmt, args...) #endif +void mips_vector_init(void); void cpu_identify(void); void mips_cpu_init(void); void mips_proc0_init(void); ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/cpu-mips2.c#4 (text+ko) ==== @@ -46,67 +46,9 @@ #include #include -/* - * mips_num_tlb_entries is - * initialized by us in the mips_cpu_init thingo. - */ -int mips_num_tlb_entries; - -void mips_get_identity(struct mips_cpuinfo *cpuinfo); +static struct mips_cpuinfo cpuinfo; /* - * Exception vector table management. - */ -#define MIPS_DECLARE_VECTOR(class) \ - extern char class ## Vector[], class ## VectorEnd[] -#define MIPS_INSTALL_VECTOR(vector, class) \ - mips_vector_do_install(MIPS_VEC_ ## vector, \ - class ## Vector, \ - class ## VectorEnd) - -MIPS_DECLARE_VECTOR(TLBMiss); -MIPS_DECLARE_VECTOR(XTLBMiss); -MIPS_DECLARE_VECTOR(Cache); -MIPS_DECLARE_VECTOR(Exception); - -static void -mips_vector_do_install(vm_offset_t addr, char *begin, char *end) -{ - size_t len, max; - - max = 0x80; - if(bootverbose) - printf("Installing exception vector:\n\t[%p..%p] <- [%p..%p]\n", - (void *)addr, (void *)(addr+max), begin, end); - len = end - begin; - if (len > max) - panic("exception code too big for vector %jx", (intmax_t) addr); - if (len == max) - printf("Exception vector at %jx out of space\n", (intmax_t) addr); - else if (len + 8 >= max) - printf("Exception vector at %jx almost out of space\n", - (intmax_t) addr); - memcpy((void *)addr, begin, len); -} - -static void -mips_vector_init(void) -{ - - MIPS_INSTALL_VECTOR(TLB, TLBMiss); - MIPS_INSTALL_VECTOR(XTLB, XTLBMiss); - MIPS_INSTALL_VECTOR(CACHE, Cache); - MIPS_INSTALL_VECTOR(INTERRUPT, Exception); /* XXX */ - MIPS_INSTALL_VECTOR(GENERIC, Exception); - mips_icache_sync_all(); - - mips_wr_status(mips_rd_status() & ~MIPS_SR_BEV); -} - -#undef MIPS_INSTALL_VECTOR -#undef MIPS_DECLARE_VECTOR - -/* * Attempt to identify the MIPS CPU as much as possible. * * XXX: Assumes the CPU is MIPS32 compliant. @@ -114,7 +56,7 @@ * as we don't currently use L2/L3 cache or additional * MIPS32 processor features. */ -void +static void mips_get_identity(struct mips_cpuinfo *cpuinfo) { u_int32_t prid; @@ -168,10 +110,11 @@ void mips_cpu_init(void) { - struct mips_cpuinfo cpuinfo; - mips_get_identity(&cpuinfo); - mips_num_tlb_entries = cpuinfo.tlb_nentries; + num_tlbentries = cpuinfo.tlb_nentries; + Mips_SetWIRED(0); + Mips_TLBFlush(num_tlbentries); + Mips_SetWIRED(VMWIRED_ENTRIES); mips_config_cache(&cpuinfo); mips_vector_init(); @@ -182,10 +125,6 @@ void cpu_identify(void) { - struct mips_cpuinfo cpuinfo; - - mips_get_identity(&cpuinfo); - printf("cpu%d: ", 0); /* XXX per-cpu */ switch (cpuinfo.cpu_vendor) { case MIPS_PRID_CID_MTI: ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#15 (text+ko) ==== @@ -104,15 +104,9 @@ static char cpu_model[30]; SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, cpu_model, 0, "Machine model"); -void mips_init(int, int, u_int32_t, struct bootinfo *); -void mips_vector_init(void); -void hardware_basic_init(void); #if 0 /* see comment below */ static void getmemsize(void); #endif -#ifdef DEBUG_UART_POLLED -void init_bootstrap_console(void); -#endif int cold = 1; int Maxmem; @@ -422,21 +416,6 @@ CpuOnboardCacheOn = 1; /* - * FREEBSD_DEVELOPERS_FIXME: - * Set up number of TLB entries, # of Wired TLB - * entries needed and Invoke Cache Config routines - * here, based on CPU-type. - */ -#ifdef UNIMPLEMENTED - /* XXX this is done in mips_cpu_init() now, I think*/ - cpucfg = Mips_ConfigCache(); -#endif - num_tlbentries = 64; - Mips_SetWIRED(0); - Mips_TLBFlush(num_tlbentries); - Mips_SetWIRED(VMWIRED_ENTRIES); - - /* * Copy down exception vector code. */ if (MipsTLBMissEnd - MipsTLBMiss > 0x80) From owner-p4-projects@FreeBSD.ORG Fri Jan 18 06:38:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C61416A420; Fri, 18 Jan 2008 06:38:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 21ED316A419 for ; Fri, 18 Jan 2008 06:38:40 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DEE9F13C46B for ; Fri, 18 Jan 2008 06:38:39 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0I6cdgF058127 for ; Fri, 18 Jan 2008 06:38:39 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0I6cdMv058124 for perforce@freebsd.org; Fri, 18 Jan 2008 06:38:39 GMT (envelope-from imp@freebsd.org) Date: Fri, 18 Jan 2008 06:38:39 GMT Message-Id: <200801180638.m0I6cdMv058124@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133530 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 06:38:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=133530 Change 133530 by imp@imp_paco-paco on 2008/01/18 06:38:24 Juniper cpu.c isn't quite as good as the mips2 one, in terms of info it provides and integration into the system. eliminate it. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/conf/files.mips#9 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/cpu-mips2.c#5 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/cpu.c#5 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#16 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/conf/files.mips#9 (text+ko) ==== @@ -42,7 +42,6 @@ # Phase 3 # ---------------------------------------------------------------------- mips/mips/autoconf.c standard -mips/mips/cpu.c standard mips/mips/cpu-mips2.c standard mips/mips/elf_machdep.c standard mips/mips/exception.S standard ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/cpu-mips2.c#5 (text+ko) ==== @@ -48,6 +48,9 @@ static struct mips_cpuinfo cpuinfo; +union cpuprid cpu_id; +union cpuprid fpu_id; + /* * Attempt to identify the MIPS CPU as much as possible. * ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/cpu.c#5 (text+ko) ==== @@ -40,31 +40,6 @@ #include #include -union cpuprid cpu_id; -union cpuprid fpu_id; - -u_int CpuPrimaryInstCacheSize; -u_int CpuPrimaryInstCacheLSize; -u_int CpuPrimaryInstSetSize; -u_int CpuPrimaryInstCacheNsets; -u_int CpuPrimaryInstCacheAsso; - -u_int CpuPrimaryDataCacheSize; -u_int CpuPrimaryDataCacheLSize; -u_int CpuPrimaryDataSetSize; -u_int CpuPrimaryDataCacheNsets; -u_int CpuPrimaryDataCacheAsso; - -u_int CpuCacheAliasMask; -u_int CpuSecondaryCacheSize; -u_int CpuTertiaryCacheSize; -u_int CpuNWayCache; -u_int CpuCacheType; -u_int CpuConfigRegister; -u_int CpuStatusRegister; -u_int CpuExternalCacheOn; -u_int CpuOnboardCacheOn; - static void cpu_identify(driver_t *driver, device_t parent); static int cpu_probe(device_t dev); static int cpu_attach(device_t dev); @@ -117,87 +92,6 @@ static int cpu_attach(device_t dev) { - printf(": "); - - switch (mips_proc_type()) { - - /* - * FREEBSD_DELVELOPERS_FIXME: - * Read the CPU-ID register and based on the - * id, print a string describing the CPU-Vendor, - * Series etc. - */ - default: - printf("Unknown CPU type (0x%x)",cpu_id.cpu.cp_imp); - break; - } - printf(" Rev. %d.%d with ", cpu_id.cpu.cp_majrev, cpu_id.cpu.cp_minrev); - - switch(fpu_id.cpu.cp_imp) { - /* - * FREEBSD_DELVELOPERS_FIXME: - * Read the FPU-ID register and based on the - * id, print a string describing the CPU-Vendor, - * Series for the FPU unit. - */ - case MIPS_SOFT: - /* No FPU Present */ - break; - - case MIPS_UNKF1: - default: - printf("Unknown FPU type (0x%x)", fpu_id.cpu.cp_imp); - break; - } - - printf(" L1 Cache: I size %dkb(%d line),", - CpuPrimaryInstCacheSize / 1024, CpuPrimaryInstCacheLSize); - printf(" D size %dkb(%d line), ", - CpuPrimaryDataCacheSize / 1024, CpuPrimaryDataCacheLSize); - - switch(CpuNWayCache) { - case 2: - printf("two way.\n"); - break; - case 4: - printf("four way.\n"); - break; - case 8: - printf("eight way.\n"); - break; - default: - printf("direct mapped.\n"); - break; - } - - if(CpuSecondaryCacheSize != 0) { - /* - * FREEBSD_DELVELOPERS_FIXME: - * Extract the L2 cache size and associativity - * for the CPU either from the registers or based - * on CPU type hard-code it here. - */ - switch(mips_proc_type()) { - default: - printf(" L2 Cache: Size %dkb, direct mapped\n", - CpuSecondaryCacheSize / 1024); - break; - } - - } - if(CpuTertiaryCacheSize != 0) { - printf(" L3 Cache: Size %dkb, direct mapped\n", - CpuTertiaryCacheSize / 1024); - } - -#ifdef DEBUG - printf("\tSetsize %d:%d\n", CpuPrimaryInstSetSize, - CpuPrimaryDataSetSize); - printf("\tAlias mask 0x%x\n", CpuCacheAliasMask); - printf("\tConfig Register %x\n",CpuConfigRegister); - printf("\tCache type %x\n", CpuCacheType); - printf("\tStatus Register %x\n",CpuStatusRegister); -#endif return 0; } ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#16 (text+ko) ==== @@ -410,11 +410,6 @@ void mips_vector_init(void) { - CpuTertiaryCacheSize = 0; - CpuExternalCacheOn = 0; /* No L3 detected */ - - CpuOnboardCacheOn = 1; - /* * Copy down exception vector code. */ From owner-p4-projects@FreeBSD.ORG Fri Jan 18 06:39:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9EF0A16A41A; Fri, 18 Jan 2008 06:39:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6492616A418 for ; Fri, 18 Jan 2008 06:39:41 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 15D3413C457 for ; Fri, 18 Jan 2008 06:39:41 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0I6dfsg058230 for ; Fri, 18 Jan 2008 06:39:41 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0I6dfG6058227 for perforce@freebsd.org; Fri, 18 Jan 2008 06:39:41 GMT (envelope-from imp@freebsd.org) Date: Fri, 18 Jan 2008 06:39:41 GMT Message-Id: <200801180639.m0I6dfG6058227@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133531 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 06:39:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=133531 Change 133531 by imp@imp_paco-paco on 2008/01/18 06:38:58 dead code. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/cpu.c#6 delete Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jan 18 06:40:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE90516A419; Fri, 18 Jan 2008 06:40:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9B80216A417 for ; Fri, 18 Jan 2008 06:40:42 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 63DE613C447 for ; Fri, 18 Jan 2008 06:40:42 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0I6egW6058591 for ; Fri, 18 Jan 2008 06:40:42 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0I6egmB058573 for perforce@freebsd.org; Fri, 18 Jan 2008 06:40:42 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Fri, 18 Jan 2008 06:40:42 GMT Message-Id: <200801180640.m0I6egmB058573@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 133532 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 06:40:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=133532 Change 133532 by zhouzhouyi@zhouzhouyi_mactest on 2008/01/18 06:39:46 Style Modification Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/symlink/00.t#3 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/symlink/00.t#3 (text+ko) ==== @@ -1,109 +1,108 @@ #!/bin/sh -# $FreeBSD: src/tools/regression/mactest/tests/symlink/00.t,v 1.2 2007/01/25 20:50:02 zhouzhouyi Exp $ +# $FreeBSD$ -desc="symlink creates symbolic links" +desc="check MAC Framework hooks for symbolic link" dir=`dirname $0` . ${dir}/../misc.sh -echo "1..12" +case "${os}" in +FreeBSD) -n0=`namegen` -n1=`namegen` -n2=`namegen` -n3=`namegen` + mac_mls_support=`sysctl -n security.mac.mls.enabled 2>/dev/null` + mac_biba_support=`sysctl -n security.mac.biba.enabled 2>/dev/null` + mac_test_support=`sysctl -n security.mac.test.pseudoinit 2>/dev/null` + if [ "${mac_mls_support}" != "" ] && [ "${mac_biba_support}" != "" ] && + [ "${mac_test_support}" != "" ]; then #turn off all the switches -for i in `sysctl security.mac | grep "\.enabled"| - sed 's/\([a-z\.]*\.enabled\)\(:\ \)\([01]\)/\1/`; do -sysctl ${i}=0 -done + for i in `sysctl security.mac | grep "\.enabled"| + sed 's/\([a-z\.]*\.enabled\)\(:\ \)\([01]\)/\1/`; do + sysctl ${i}=0 >/dev/null + done + + + if [ -f ${mactest_conf} ]; then + rm ${mactest_conf} + fi + touch ${mactest_conf} + setfmac "mls/equal,biba/equal" ${mactest_conf} + + echo "1..12" -mac_mls_support=`sysctl -n security.mac.mls.enabled 2>/dev/null` -mac_biba_support=`sysctl -n security.mac.biba.enabled 2>/dev/null` + n0=`namegen` + n1=`namegen` + n2=`namegen` + n3=`namegen` -if [ "${mac_mls_support}" != "" ] && [ "${mac_biba_support}" != "" ] ; then - dvplabel=`getfmac ".."| sed 's/\(\.\.:\ \)\([a-z\,\/]*\)/\2/`; + dvplabel=`getfmac ".."| sed 's/\(\.\.:\ \)\([a-z\,\/]*\)/\2/`; -############################################################# -#first make working dir, the hook checks are already done in open: - if [ -f ${mactest_conf} ]; then - rm ${mactest_conf} - fi - touch ${mactest_conf} + sysctl security.mac.mls.enabled=1 > /dev/null + sysctl security.mac.biba.enabled=1 > /dev/null + sysctl security.mac.mls.revocation_enabled=1 > /dev/null -############################################################# - t=`sysctl security.mac.mls.enabled=1` - echo "enforcing mac/mls!" - t=`sysctl security.mac.mls.revocation_enabled=1` - echo "enabling revoking" #case 1: mkdir - mactestexpect "" 0 -m "mls/low(low-high)" -f ${mactest_conf} mkdir ${n3} 0755 + mactestexpect "" 0 -m "mls/low(low-high)" -f ${mactest_conf} mkdir ${n3} 0755 -############################################################# #case 2: setfmac - mactestexpect "" "" -m "mls/low(low-high)" -f ${mactest_conf} system setfmac "mls/6" ${n3} + mactestexpect "" "" -m "mls/low(low-high)" -f ${mactest_conf} system setfmac "mls/6" ${n3} -############################################################# #case 3: create - mactestexpect "" 0 -m "mls/6(low-high)" -f ${mactest_conf} create ${n3}/${n2} 0644 + mactestexpect "" 0 -m "mls/6(low-high)" -f ${mactest_conf} create ${n3}/${n2} 0644 -############################################################# #case 4: setfmac - mactestexpect "" "" -m "mls/6(low-high)" -f ${mactest_conf} system setfmac "mls/5" ${n3}/${n2} + mactestexpect "" "" -m "mls/6(low-high)" -f ${mactest_conf} system setfmac "mls/5" ${n3}/${n2} -############################################################# #case 5: symlink fail because no write down - echo -n "pid = -1 mac_test_check_vnode_create:" > ${mactest_conf} - echo "biba/high(low-high),mls/6(low-high) biba/high,mls/low" >> ${mactest_conf} - mactestexpect "" EACCES -m "mls/6(low-high)" -f ${mactest_conf} symlink ${n3}/${n2} ${n1} + echo -n "pid = -1 vnode_check_create:" > ${mactest_conf} + echo "biba/high(low-high),mls/6(low-high) biba/high,mls/low" >> ${mactest_conf} + mactestexpect "" EACCES -m "mls/6(low-high)" -f ${mactest_conf} symlink ${n3}/${n2} ${n1} -############################################################# #case 6: symbolic link do not check the blp rule of source file - rm ${mactest_conf} - touch ${mactest_conf} - mactestexpect "" 0 -m "mls/low(low-high)" -f ${mactest_conf} symlink ${n3}/${n2} ${n1} + truncate -s 0 ${mactest_conf} + mactestexpect "" 0 -m "mls/low(low-high)" -f ${mactest_conf} symlink ${n3}/${n2} ${n1} -############################################################# #case 7: lookup the symbolic file, blp no read up - mactestexpect "*Permission.denied" "" -m "mls/low(low-high)" -f ${mactest_conf} system cat ${n1} + mactestexpect "*Permission.denied" "" -m "mls/low(low-high)" -f ${mactest_conf} system cat ${n1} -############################################################# #case 8: truncate the symbolic file, stopped by vnode lookup - echo -n "pid = -1 mac_test_check_vnode_lookup:" > ${mactest_conf} - echo "biba/high(low-high),mls/5(low-high) biba/high,mls/6" >> ${mactest_conf} - mactestexpect "" EACCES -m "mls/5(low-high)" -f ${mactest_conf} truncate ${n1} 1234567 + echo -n "pid = -1 vnode_check_lookup:" > ${mactest_conf} + echo "biba/high(low-high),mls/5(low-high) biba/high,mls/6" >> ${mactest_conf} + mactestexpect "" EACCES -m "mls/5(low-high)" -f ${mactest_conf} truncate ${n1} 1234567 -############################################################# #case 9: truncate the symbolic file, stopped by check vnode write - echo -n "pid = -1 mac_test_check_vnode_write:" > ${mactest_conf} - echo "biba/high(low-high),mls/6(low-high) NULL biba/high,mls/5" >> ${mactest_conf} - mactestexpect "" EACCES -m "mls/6(low-high)" -f ${mactest_conf} truncate ${n1} 1234567 + echo -n "pid = -1 vnode_check_write:" > ${mactest_conf} + echo "biba/high(low-high),mls/6(low-high) biba/high,mls/5" >> ${mactest_conf} + mactestexpect "" EACCES -m "mls/6(low-high)" -f ${mactest_conf} truncate ${n1} 1234567 -############################################################# #case 10: unlink - truncate -s 0 ${mactest_conf} - mactestexpect "" 0 -m "mls/low(low-high)" -f ${mactest_conf} unlink ${n1} + truncate -s 0 ${mactest_conf} + mactestexpect "" 0 -m "mls/low(low-high)" -f ${mactest_conf} unlink ${n1} + -############################################################# #case 11: symbolic link a directory - echo -n "pid = -1 mac_test_check_vnode_create:" > ${mactest_conf} - echo "biba/high(low-high),mls/low(low-high) biba/high,mls/low" >> ${mactest_conf} - mactestexpect "" 0 -m "mls/low(low-high)" -f ${mactest_conf} symlink ${n3} ${n1} + echo -n "pid = -1 vnode_check_create:" > ${mactest_conf} + echo "biba/high(low-high),mls/low(low-high) biba/high,mls/low" >> ${mactest_conf} + mactestexpect "" 0 -m "mls/low(low-high)" -f ${mactest_conf} symlink ${n3} ${n1} + -############################################################# #case 12: rm symbolic link - echo -n "pid = -2 mac_test_check_vnode_delete:" > ${mactest_conf} - echo "biba/high(low-high),mls/low(low-high) biba/high,mls/low biba/high,mls/low" >> ${mactest_conf} - mactestexpect "" "" -m "mls/low(low-high)" -f ${mactest_conf} system rm ${n1} + echo -n "pid = -2 vnode_check_unlink:" > ${mactest_conf} + echo "biba/high(low-high),mls/low(low-high) biba/high,mls/low biba/high,mls/low" >>${mactest_conf} + mactestexpect "" "" -m "mls/low(low-high)" -f ${mactest_conf} system rm ${n1} #cleanup: - t=`sysctl security.mac.mls.enabled=0` - echo "disabling mac/mls!" - rm -fr ${n3} - - rm ${mactest_conf} -fi + sysctl security.mac.mls.enabled=0 >/dev/null + sysctl security.mac.biba.enabled=0 > /dev/null + rm -fr ${n3} + rm ${mactest_conf} +#mac_mls mac_biba and mac_test support + fi + ;; +*) + quick_exit + ;; +esac From owner-p4-projects@FreeBSD.ORG Fri Jan 18 06:43:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9AB0F16A46C; Fri, 18 Jan 2008 06:43:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 332F016A419 for ; Fri, 18 Jan 2008 06:43:46 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EF8B813C448 for ; Fri, 18 Jan 2008 06:43:45 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0I6hjao059734 for ; Fri, 18 Jan 2008 06:43:45 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0I6hjnF059731 for perforce@freebsd.org; Fri, 18 Jan 2008 06:43:45 GMT (envelope-from imp@freebsd.org) Date: Fri, 18 Jan 2008 06:43:45 GMT Message-Id: <200801180643.m0I6hjnF059731@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133534 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 06:43:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=133534 Change 133534 by imp@imp_paco-paco on 2008/01/18 06:43:38 cpu-mips32.c is dead. long live cpu.c Affected files ... .. //depot/projects/mips2-jnpr/src/sys/conf/files.mips#10 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/cpu.c#7 branch Differences ... ==== //depot/projects/mips2-jnpr/src/sys/conf/files.mips#10 (text+ko) ==== @@ -42,7 +42,7 @@ # Phase 3 # ---------------------------------------------------------------------- mips/mips/autoconf.c standard -mips/mips/cpu-mips2.c standard +mips/mips/cpu.c standard mips/mips/elf_machdep.c standard mips/mips/exception.S standard mips/mips/gdb_machdep.c standard From owner-p4-projects@FreeBSD.ORG Fri Jan 18 06:44:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA94016A468; Fri, 18 Jan 2008 06:44:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8042A16A41B for ; Fri, 18 Jan 2008 06:44:47 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2D3C513C459 for ; Fri, 18 Jan 2008 06:44:47 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0I6iliZ059997 for ; Fri, 18 Jan 2008 06:44:47 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0I6ilHs059994 for perforce@freebsd.org; Fri, 18 Jan 2008 06:44:47 GMT (envelope-from imp@freebsd.org) Date: Fri, 18 Jan 2008 06:44:47 GMT Message-Id: <200801180644.m0I6ilHs059994@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133535 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 06:44:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=133535 Change 133535 by imp@imp_paco-paco on 2008/01/18 06:44:00 No, really. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/cpu-mips2.c#6 delete Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jan 18 06:48:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1A9E16A46B; Fri, 18 Jan 2008 06:48:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5E40816A419 for ; Fri, 18 Jan 2008 06:48:52 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F072313C469 for ; Fri, 18 Jan 2008 06:48:51 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0I6mp9Q060346 for ; Fri, 18 Jan 2008 06:48:51 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0I6mpb6060343 for perforce@freebsd.org; Fri, 18 Jan 2008 06:48:51 GMT (envelope-from imp@freebsd.org) Date: Fri, 18 Jan 2008 06:48:51 GMT Message-Id: <200801180648.m0I6mpb6060343@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133536 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 06:48:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=133536 Change 133536 by imp@imp_paco-paco on 2008/01/18 06:48:38 These defines are now all OBE Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/cpu.h#8 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/cpu.h#8 (text+ko) ==== @@ -439,28 +439,6 @@ #if defined(_KERNEL) && !defined(_LOCORE) extern union cpuprid fpu_id; -extern u_int CpuPrimaryInstCacheSize; -extern u_int CpuPrimaryInstCacheLSize; -extern u_int CpuPrimaryInstSetSize; -extern u_int CpuPrimaryInstCacheNsets; -extern u_int CpuPrimaryInstCacheAsso; - -extern u_int CpuPrimaryDataCacheSize; -extern u_int CpuPrimaryDataCacheLSize; -extern u_int CpuPrimaryDataSetSize; -extern u_int CpuPrimaryDataCacheNsets; -extern u_int CpuPrimaryDataCacheAsso; - -extern u_int CpuCacheAliasMask; -extern u_int CpuSecondaryCacheSize; -extern u_int CpuTertiaryCacheSize; -extern u_int CpuNWayCache; -extern u_int CpuCacheType; -extern u_int CpuConfigRegister; -extern u_int CpuStatusRegister; -extern u_int CpuExternalCacheOn; -extern u_int CpuOnboardCacheOn; - struct tlb; struct user; From owner-p4-projects@FreeBSD.ORG Fri Jan 18 09:56:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF79216A469; Fri, 18 Jan 2008 09:56:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9C2AB16A420 for ; Fri, 18 Jan 2008 09:56:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7837713C4D9 for ; Fri, 18 Jan 2008 09:56:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0I9uAlv000617 for ; Fri, 18 Jan 2008 09:56:10 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0I9uAgj000614 for perforce@freebsd.org; Fri, 18 Jan 2008 09:56:10 GMT (envelope-from jb@freebsd.org) Date: Fri, 18 Jan 2008 09:56:10 GMT Message-Id: <200801180956.m0I9uAgj000614@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133541 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 09:56:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=133541 Change 133541 by jb@jb_freebsd1 on 2008/01/18 09:55:34 Add a hash table for DIEs for future use. Add a default name and use this when allocating every DIE. When an attribute value is found with DW_AT_name, get the pointer to the real name and use that. The use of __anon__ as the default name causes like DIEs to be matched when merging CTF data. The "die%d" name I was using caused an enormous number of type entries to be created and merged. The fact that the %d used a different number each time made it look like they were all different when in fact they weren't. We're down to the same order of magnitude of types in a GENERIC kernel as Solaris has in their 'genunix' kernel. This solves the performance problem I was seeing when running ctfmerge on the kernel object files. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#14 edit .. //depot/projects/dtrace/src/lib/libdwarf/_libdwarf.h#2 edit .. //depot/projects/dtrace/src/lib/libdwarf/dwarf_attrval.c#4 edit .. //depot/projects/dtrace/src/lib/libdwarf/dwarf_die.c#2 edit .. //depot/projects/dtrace/src/lib/libdwarf/dwarf_init.c#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#14 (text) ==== @@ -1370,13 +1370,8 @@ */ (void) die_unsigned(dw, base, DW_AT_byte_size, &sz, DW_ATTR_REQ); - if (tdp->t_name == NULL) { - /* terminate("die %llu: base type without name\n", off); */ - char dummy_name[64]; - snprintf(dummy_name, sizeof(dummy_name), "die%lx", (u_long) off); - debug(1, "die %llu: has no name. Using a dummy one: '%s'\n", off, dummy_name); - tdp->t_name = xstrdup(dummy_name); - } + if (tdp->t_name == NULL) + terminate("die %llu: base type without name\n", off); /* XXX make a name parser for float too */ if ((intr = die_base_name_parse(tdp->t_name, &new)) != NULL) { @@ -1684,14 +1679,8 @@ tdesc_add(dw, tdp); } - if (tdp != NULL) { + if (tdp != NULL) tdp->t_name = die_name(dw, die); - if (tdp->t_name == NULL) { - char dummy_name[64]; - snprintf(dummy_name, sizeof(dummy_name), "die%lx", (u_long) off); - tdp->t_name = xstrdup(dummy_name); - } - } dc->dc_create(dw, die, off, tdp); } ==== //depot/projects/dtrace/src/lib/libdwarf/_libdwarf.h#2 (text+ko) ==== @@ -56,6 +56,8 @@ #define DWARF_strtab 17 #define DWARF_DEBUG_SNAMES 18 +#define DWARF_DIE_HASH_SIZE 8191 + #define DWARF_SET_ERROR(_e, _err) do { \ _e->err_error = _err; \ _e->elf_error = 0; \ @@ -91,10 +93,13 @@ uint64_t die_abnum; /* Abbrev number. */ Dwarf_Abbrev die_a; /* Abbrev pointer. */ Dwarf_CU die_cu; /* Compilation unit pointer. */ + const char *die_name; /* Ptr to the name string. */ STAILQ_HEAD(, _Dwarf_AttrValue) die_attrval; /* List of attribute values. */ STAILQ_ENTRY(_Dwarf_Die) - die_next; /* Next die. */ + die_next; /* Next die in list. */ + STAILQ_ENTRY(_Dwarf_Die) + die_hash; /* Next die in hash table. */ }; struct _Dwarf_Attribute { @@ -130,6 +135,9 @@ cu_abbrev; /* List of abbrevs. */ STAILQ_HEAD(, _Dwarf_Die) cu_die; /* List of dies. */ + STAILQ_HEAD(, _Dwarf_Die) + cu_die_hash[DWARF_DIE_HASH_SIZE]; + /* Hash of dies. */ STAILQ_ENTRY(_Dwarf_CU) cu_next; /* Next compilation unit. */ }; ==== //depot/projects/dtrace/src/lib/libdwarf/dwarf_attrval.c#4 (text+ko) ==== @@ -60,6 +60,19 @@ /* Add the attribute value to the list in the die. */ STAILQ_INSERT_TAIL(&die->die_attrval, av, av_next); + /* Save a pointer to the attribute name if this is one. */ + if (av->av_attrib == DW_AT_name) + switch (av->av_form) { + case DW_FORM_strp: + die->die_name = av->u[1].s; + break; + case DW_FORM_string: + die->die_name = av->u[0].s; + break; + default: + break; + } + if (avp != NULL) *avp = av; @@ -118,7 +131,9 @@ *strp = NULL; - if ((av = dwarf_attrval_find(die, attr)) == NULL) { + if (attr == DW_AT_name) + *strp = die->die_name; + else if ((av = dwarf_attrval_find(die, attr)) == NULL) { DWARF_SET_ERROR(err, DWARF_E_NO_ENTRY); ret = DWARF_E_NO_ENTRY; } else { ==== //depot/projects/dtrace/src/lib/libdwarf/dwarf_die.c#2 (text+ko) ==== @@ -29,10 +29,13 @@ #include #include "_libdwarf.h" +static const char *anon_name = "__anon__"; + int dwarf_die_add(Dwarf_CU cu, int level, uint64_t offset, uint64_t abnum, Dwarf_Abbrev a, Dwarf_Die *diep, Dwarf_Error *err) { Dwarf_Die die; + uint64_t key; int ret = DWARF_E_NONE; if (err == NULL) @@ -54,6 +57,7 @@ die->die_abnum = abnum; die->die_a = a; die->die_cu = cu; + die->die_name = anon_name; /* Initialise the list of attribute values. */ STAILQ_INIT(&die->die_attrval); @@ -61,6 +65,10 @@ /* Add the die to the list in the compilation unit. */ STAILQ_INSERT_TAIL(&cu->cu_die, die, die_next); + /* Add the die to the hash table in the compilation unit. */ + key = offset % DWARF_DIE_HASH_SIZE; + STAILQ_INSERT_TAIL(&cu->cu_die_hash[key], die, die_hash); + if (diep != NULL) *diep = die; @@ -68,7 +76,7 @@ } int -dwarf_dieoffset(Dwarf_Die die __unused, Dwarf_Off *ret_offset, Dwarf_Error *err __unused) +dwarf_dieoffset(Dwarf_Die die, Dwarf_Off *ret_offset, Dwarf_Error *err __unused) { *ret_offset = die->die_offset; ==== //depot/projects/dtrace/src/lib/libdwarf/dwarf_init.c#2 (text+ko) ==== @@ -459,6 +459,7 @@ Dwarf_CU cu; Elf_Data *d = NULL; Elf_Scn *scn; + int i; int level = 0; int relocated = 0; int ret = DWARF_E_NONE; @@ -522,6 +523,10 @@ /* Initialise the list of dies. */ STAILQ_INIT(&cu->cu_die); + /* Initialise the hash table of dies. */ + for (i = 0; i < DWARF_DIE_HASH_SIZE; i++) + STAILQ_INIT(&cu->cu_die_hash[i]); + /* Add the compilation unit to the list. */ STAILQ_INSERT_TAIL(&dbg->dbg_cu, cu, cu_next); From owner-p4-projects@FreeBSD.ORG Fri Jan 18 10:39:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA9EB16A46B; Fri, 18 Jan 2008 10:39:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7FE0C16A417 for ; Fri, 18 Jan 2008 10:39:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5B4F313C4CC for ; Fri, 18 Jan 2008 10:39:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0IAdvMB008315 for ; Fri, 18 Jan 2008 10:39:57 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IAdviq008312 for perforce@freebsd.org; Fri, 18 Jan 2008 10:39:57 GMT (envelope-from jb@freebsd.org) Date: Fri, 18 Jan 2008 10:39:57 GMT Message-Id: <200801181039.m0IAdviq008312@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133544 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 10:39:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=133544 Change 133544 by jb@jb_freebsd1 on 2008/01/18 10:39:39 Implement SDT argument definitions. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/sdt/sdt.c#9 edit .. //depot/projects/dtrace/src/sys/kern/kern_proc.c#18 edit .. //depot/projects/dtrace/src/sys/kern/kern_sdt.c#6 edit .. //depot/projects/dtrace/src/sys/sys/sdt.h#11 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/sdt/sdt.c#9 (text+ko) ==== @@ -46,6 +46,7 @@ static d_open_t sdt_open; static int sdt_unload(void); +static void sdt_getargdesc(void *, dtrace_id_t, void *, dtrace_argdesc_t *); static void sdt_provide_probes(void *, dtrace_probedesc_t *); static void sdt_destroy(void *, dtrace_id_t, void *); static void sdt_enable(void *, dtrace_id_t, void *); @@ -73,15 +74,43 @@ sdt_disable, NULL, NULL, + sdt_getargdesc, NULL, NULL, - NULL, sdt_destroy }; static struct cdev *sdt_cdev; static int +sdt_argtype_callback(struct sdt_argtype *argtype, void *arg) +{ + dtrace_argdesc_t *desc = arg; + + if (desc->dtargd_ndx == argtype->ndx) { + desc->dtargd_mapping = desc->dtargd_ndx; /* XXX */ + strlcpy(desc->dtargd_native, argtype->type, + sizeof(desc->dtargd_native)); + desc->dtargd_xlate[0] = '\0'; /* XXX */ + } + + return (0); +} + +static void +sdt_getargdesc(void *arg, dtrace_id_t id, void *parg, dtrace_argdesc_t *desc) +{ + struct sdt_probe *probe = parg; + + if (desc->dtargd_ndx < probe->n_args) + (void) (sdt_argtype_listall(probe, sdt_argtype_callback, desc)); + else + desc->dtargd_ndx = DTRACE_ARGNONE; + + return; +} + +static int sdt_probe_callback(struct sdt_probe *probe, void *arg __unused) { struct sdt_provider *prov = probe->prov; ==== //depot/projects/dtrace/src/sys/kern/kern_proc.c#18 (text+ko) ==== @@ -147,8 +147,16 @@ p = (struct proc *)mem; SDT_PROBE(proc, kernel, ctor , entry, p, size, arg, flags, 0); + SDT_PROBE_ARGTYPE(proc, kernel, ctor , entry, 0, "struct proc *"); + SDT_PROBE_ARGTYPE(proc, kernel, ctor , entry, 1, "int"); + SDT_PROBE_ARGTYPE(proc, kernel, ctor , entry, 2, "void *"); + SDT_PROBE_ARGTYPE(proc, kernel, ctor , entry, 3, "int"); EVENTHANDLER_INVOKE(process_ctor, p); SDT_PROBE(proc, kernel, ctor , return, p, size, arg, flags, 0); + SDT_PROBE_ARGTYPE(proc, kernel, ctor , return, 0, "struct proc *"); + SDT_PROBE_ARGTYPE(proc, kernel, ctor , return, 1, "int"); + SDT_PROBE_ARGTYPE(proc, kernel, ctor , return, 2, "void *"); + SDT_PROBE_ARGTYPE(proc, kernel, ctor , return, 3, "int"); return (0); } @@ -165,6 +173,10 @@ p = (struct proc *)mem; td = FIRST_THREAD_IN_PROC(p); SDT_PROBE(proc, kernel, dtor , entry, p, size, arg, td, 0); + SDT_PROBE_ARGTYPE(proc, kernel, dtor , entry, 0, "struct proc *"); + SDT_PROBE_ARGTYPE(proc, kernel, dtor , entry, 1, "int"); + SDT_PROBE_ARGTYPE(proc, kernel, dtor , entry, 2, "void *"); + SDT_PROBE_ARGTYPE(proc, kernel, dtor , entry, 3, "struct thread *"); if (td != NULL) { #ifdef INVARIANTS KASSERT((p->p_numthreads == 1), @@ -183,6 +195,9 @@ if (p->p_ksi != NULL) KASSERT(! KSI_ONQ(p->p_ksi), ("SIGCHLD queue")); SDT_PROBE(proc, kernel, dtor , return, p, size, arg, 0, 0); + SDT_PROBE_ARGTYPE(proc, kernel, dtor , return, 0, "struct proc *"); + SDT_PROBE_ARGTYPE(proc, kernel, dtor , return, 1, "int"); + SDT_PROBE_ARGTYPE(proc, kernel, dtor , return, 2, "void *"); } /* @@ -195,6 +210,9 @@ p = (struct proc *)mem; SDT_PROBE(proc, kernel, init , entry, p, size, flags, 0, 0); + SDT_PROBE_ARGTYPE(proc, kernel, init , entry, 0, "struct proc *"); + SDT_PROBE_ARGTYPE(proc, kernel, init , entry, 1, "int"); + SDT_PROBE_ARGTYPE(proc, kernel, init , entry, 2, "int"); p->p_sched = (struct p_sched *)&p[1]; bzero(&p->p_mtx, sizeof(struct mtx)); mtx_init(&p->p_mtx, "process lock", NULL, MTX_DEF | MTX_DUPOK); @@ -203,6 +221,9 @@ EVENTHANDLER_INVOKE(process_init, p); p->p_stats = pstats_alloc(); SDT_PROBE(proc, kernel, init , return, p, size, flags, 0, 0); + SDT_PROBE_ARGTYPE(proc, kernel, init , return, 0, "struct proc *"); + SDT_PROBE_ARGTYPE(proc, kernel, init , return, 1, "int"); + SDT_PROBE_ARGTYPE(proc, kernel, init , return, 2, "int"); return (0); } ==== //depot/projects/dtrace/src/sys/kern/kern_sdt.c#6 (text+ko) ==== @@ -123,6 +123,9 @@ sx_xlock(&sdt_sx); TAILQ_INSERT_TAIL(&probe->prov->probe_list, probe, probe_entry); + + TAILQ_INIT(&probe->argtype_list); + probe->state = SDT_INIT; sx_xunlock(&sdt_sx); @@ -146,6 +149,38 @@ sx_xunlock(&sdt_sx); } +/* + * Called from SYSINIT to register a statically defined trace probe argument. + */ +void +sdt_argtype_register(void *arg) +{ + struct sdt_argtype *argtype = arg; + + sx_xlock(&sdt_sx); + + TAILQ_INSERT_TAIL(&argtype->probe->argtype_list, argtype, argtype_entry); + + argtype->probe->n_args++; + + sx_xunlock(&sdt_sx); +} + +/* + * Called from SYSUNINIT to de-register a statically defined trace probe argument. + */ +void +sdt_argtype_deregister(void *arg) +{ + struct sdt_argtype *argtype = arg; + + sx_xlock(&sdt_sx); + + TAILQ_REMOVE(&argtype->probe->argtype_list, argtype, argtype_entry); + + sx_xunlock(&sdt_sx); +} + static void sdt_init(void *arg) { @@ -210,3 +245,29 @@ return (error); } + +/* + * List statically defined tracing probe arguments. + */ +int +sdt_argtype_listall(struct sdt_probe *probe, + sdt_argtype_listall_func_t callback_func,void *arg) +{ + int error = 0; + int locked; + struct sdt_argtype *argtype; + + locked = sx_xlocked(&sdt_sx); + if (!locked) + sx_xlock(&sdt_sx); + + TAILQ_FOREACH(argtype, &probe->argtype_list, argtype_entry) { + if ((error = callback_func(argtype, arg)) != 0) + break; + } + + if (!locked) + sx_xunlock(&sdt_sx); + + return (error); +} ==== //depot/projects/dtrace/src/sys/sys/sdt.h#11 (text+ko) ==== @@ -39,7 +39,8 @@ #define DTRACE_PROBE4(name, type1, arg1, type2, arg2, type3, arg3, type4, arg4) #ifndef _KERNEL -#error "no user-servicable parts inside (yet)" + +/* The promise of things to come. Worlds to explore. People to meet. Things to do. */ #else @@ -48,6 +49,7 @@ #define SDT_PROVIDER_DEFINE(prov) #define SDT_PROVIDER_DECLARE(prov) #define SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4) +#define SDT_PROBE_ARGTYPE(prov, mod, func, name, num, type) #else @@ -70,8 +72,18 @@ SDT_INIT, } sdt_state_t; +struct sdt_probe; struct sdt_provider; +struct sdt_argtype { + int ndx; /* Argument index. */ + const char *type; /* Argument type string. */ + TAILQ_ENTRY(sdt_argtype) + argtype_entry; /* Argument type list entry. */ + struct sdt_probe + *probe; /* Ptr to the probe structure. */ +}; + struct sdt_probe { int version; /* Set to sizeof(struct sdt_ref). */ sdt_state_t state; @@ -79,10 +91,12 @@ *prov; /* Ptr to the provider structure. */ TAILQ_ENTRY(sdt_probe) probe_entry; /* SDT probe list entry. */ + TAILQ_HEAD(argtype_list_head, sdt_argtype) argtype_list; const char *mod; const char *func; const char *name; id_t id; /* DTrace probe ID. */ + int n_args; /* Number of arguments. */ }; struct sdt_provider { @@ -110,30 +124,46 @@ #define SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4) \ static struct sdt_probe sdt_##prov##_##mod##_##func##_##name[1] = { \ { sizeof(struct sdt_probe), 0, sdt_provider_##prov, \ - { NULL, NULL }, #mod, #func, #name, 0 } \ + { NULL, NULL }, { NULL, NULL }, #mod, #func, #name, 0, 0 } \ }; \ SYSINIT(sdt_##prov##_##mod##_##func##_##name##_init, SI_SUB_KDTRACE, \ - SI_ORDER_ANY, sdt_probe_register, \ + SI_ORDER_SECOND + 1, sdt_probe_register, \ sdt_##prov##_##mod##_##func##_##name ); \ SYSUNINIT(sdt_##prov##_##mod##_##func##_##name##_uninit, \ - SI_SUB_KDTRACE, SI_ORDER_ANY, sdt_probe_deregister, \ + SI_SUB_KDTRACE, SI_ORDER_SECOND + 1, sdt_probe_deregister, \ sdt_##prov##_##mod##_##func##_##name ); \ if (sdt_##prov##_##mod##_##func##_##name->id) \ (*sdt_probe_func)(sdt_##prov##_##mod##_##func##_##name->id, \ (uintptr_t) arg0, (uintptr_t) arg1, (uintptr_t) arg2, \ (uintptr_t) arg3, (uintptr_t) arg4) +#define SDT_PROBE_ARGTYPE(prov, mod, func, name, num, type) \ + static struct sdt_argtype sdt_##prov##_##mod##_##func##_##name##num[1] \ + = { { num, type, { NULL, NULL }, \ + sdt_##prov##_##mod##_##func##_##name } \ + }; \ + SYSINIT(sdt_##prov##_##mod##_##func##_##name##num##_init, \ + SI_SUB_KDTRACE, SI_ORDER_SECOND + 2, sdt_argtype_register, \ + sdt_##prov##_##mod##_##func##_##name##num ); \ + SYSUNINIT(sdt_##prov##_##mod##_##func##_##name##num##_uninit, \ + SI_SUB_KDTRACE, SI_ORDER_SECOND + 2, sdt_argtype_deregister, \ + sdt_##prov##_##mod##_##func##_##name##num ) + +typedef int (*sdt_argtype_listall_func_t)(struct sdt_argtype *, void *); +typedef int (*sdt_probe_listall_func_t)(struct sdt_probe *, void *); typedef int (*sdt_provider_listall_func_t)(struct sdt_provider *, void *); -typedef int (*sdt_probe_listall_func_t)(struct sdt_probe *, void *); +void sdt_argtype_deregister(void *); +void sdt_argtype_register(void *); +void sdt_probe_deregister(void *); +void sdt_probe_register(void *); void sdt_provider_deregister(void *); void sdt_provider_register(void *); -void sdt_probe_deregister(void *); -void sdt_probe_register(void *); void sdt_probe_stub(u_int32_t, uintptr_t arg0, uintptr_t arg1, uintptr_t arg2, uintptr_t arg3, uintptr_t arg4); +int sdt_argtype_listall(struct sdt_probe *, sdt_argtype_listall_func_t, void *); +int sdt_probe_listall(struct sdt_provider *, sdt_probe_listall_func_t, void *); int sdt_provider_listall(sdt_provider_listall_func_t,void *); -int sdt_probe_listall(struct sdt_provider *, sdt_probe_listall_func_t, void *); #endif /* KDTRACE_HOOKS */ From owner-p4-projects@FreeBSD.ORG Fri Jan 18 11:09:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D430F16A4FF; Fri, 18 Jan 2008 11:09:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 983BE16A47A for ; Fri, 18 Jan 2008 11:09:28 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5A63513C448 for ; Fri, 18 Jan 2008 11:09:28 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0IB9SgH014378 for ; Fri, 18 Jan 2008 11:09:28 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IB9SlG014375 for perforce@freebsd.org; Fri, 18 Jan 2008 11:09:28 GMT (envelope-from imp@freebsd.org) Date: Fri, 18 Jan 2008 11:09:28 GMT Message-Id: <200801181109.m0IB9SlG014375@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133545 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 11:09:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=133545 Change 133545 by imp@imp_paco-paco on 2008/01/18 11:09:11 Mips seems to have disappeared. put it back. Affected files ... .. //depot/projects/mips2-jnpr/src/Makefile.inc1#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/Makefile.inc1#3 (text+ko) ==== @@ -113,7 +113,7 @@ TARGET?= ${MACHINE} TARGET_ARCH?= ${MACHINE_ARCH} -KNOWN_ARCHES?= amd64 arm armeb/arm i386 i386/pc98 ia64 powerpc sparc64 sparc64/sun4v +KNOWN_ARCHES?= amd64 arm armeb/arm i386 i386/pc98 ia64 mips powerpc sparc64 sparc64/sun4v .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else From owner-p4-projects@FreeBSD.ORG Fri Jan 18 14:18:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53FB216A473; Fri, 18 Jan 2008 14:18:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 10EFC16A418; Fri, 18 Jan 2008 14:18:04 +0000 (UTC) (envelope-from bms@FreeBSD.org) Received: from out3.smtp.messagingengine.com (out3.smtp.messagingengine.com [66.111.4.27]) by mx1.freebsd.org (Postfix) with ESMTP id 87FCC13C469; Fri, 18 Jan 2008 14:18:03 +0000 (UTC) (envelope-from bms@FreeBSD.org) Received: from compute1.internal (compute1.internal [10.202.2.41]) by out1.messagingengine.com (Postfix) with ESMTP id 8FCFD8A2B5; Fri, 18 Jan 2008 09:08:16 -0500 (EST) Received: from heartbeat2.messagingengine.com ([10.202.2.161]) by compute1.internal (MEProxy); Fri, 18 Jan 2008 09:08:16 -0500 X-Sasl-enc: pxz/Kyu6r1sLfahkmf0OrFE48NejwEy8p9AWp12OIMoD 1200665296 Received: from empiric.lon.incunabulum.net (82-35-112-254.cable.ubr07.dals.blueyonder.co.uk [82.35.112.254]) by mail.messagingengine.com (Postfix) with ESMTP id 132771ADBB; Fri, 18 Jan 2008 09:08:15 -0500 (EST) Message-ID: <4790B2CE.3000707@FreeBSD.org> Date: Fri, 18 Jan 2008 14:08:14 +0000 From: "Bruce M. Simpson" User-Agent: Thunderbird 2.0.0.6 (X11/20070928) MIME-Version: 1.0 To: Warner Losh References: <200801180532.m0I5WSsY047069@repoman.freebsd.org> In-Reply-To: <200801180532.m0I5WSsY047069@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 133523 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 14:18:04 -0000 Warner Losh wrote: > http://perforce.freebsd.org/chv.cgi?CH=133523 > > Change 133523 by imp@imp_paco-paco on 2008/01/18 05:31:51 > > Go ahead and integrate my cross build patches here so that > I can build cross compilers. > > What's LIBC= for? It looks like you added install targets for xdev, does this mean we can build cross compilers and install them w/o having to run them from the top level src makefile targets? It would be great if there were something to simplify the means of building cross toolchains similar to Gentoo's crossdev. There are many devices out there which FreeBSD could potentially run on -- however the vendors ship them with Linux, and being able to get e.g. cross builds of mtd-utils to run on them would be very helpful for opening them up. cheers BMS From owner-p4-projects@FreeBSD.ORG Fri Jan 18 14:23:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DC9116A46E; Fri, 18 Jan 2008 14:23:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF44B16A469; Fri, 18 Jan 2008 14:23:02 +0000 (UTC) (envelope-from bms@FreeBSD.org) Received: from out3.smtp.messagingengine.com (out3.smtp.messagingengine.com [66.111.4.27]) by mx1.freebsd.org (Postfix) with ESMTP id 8B85E13C458; Fri, 18 Jan 2008 14:23:02 +0000 (UTC) (envelope-from bms@FreeBSD.org) Received: from compute1.internal (compute1.internal [10.202.2.41]) by out1.messagingengine.com (Postfix) with ESMTP id 472C28AFD9; Fri, 18 Jan 2008 09:05:17 -0500 (EST) Received: from heartbeat1.messagingengine.com ([10.202.2.160]) by compute1.internal (MEProxy); Fri, 18 Jan 2008 09:05:17 -0500 X-Sasl-enc: YDl15dGfkG1t7pvCQMS8/73u/SJCkIMsHm5mBxUDWHQV 1200665117 Received: from empiric.lon.incunabulum.net (82-35-112-254.cable.ubr07.dals.blueyonder.co.uk [82.35.112.254]) by mail.messagingengine.com (Postfix) with ESMTP id C8398EB57; Fri, 18 Jan 2008 09:05:16 -0500 (EST) Message-ID: <4790B21B.3000102@FreeBSD.org> Date: Fri, 18 Jan 2008 14:05:15 +0000 From: "Bruce M. Simpson" User-Agent: Thunderbird 2.0.0.6 (X11/20070928) MIME-Version: 1.0 To: Warner Losh References: <200801180525.m0I5PKss045795@repoman.freebsd.org> In-Reply-To: <200801180525.m0I5PKss045795@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 133522 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 14:23:03 -0000 Warner Losh wrote: > http://perforce.freebsd.org/chv.cgi?CH=133522 > > Change 133522 by imp@imp_paco-paco on 2008/01/18 05:25:09 > > Prefer ${SHELL} to sh, since I like it. Sadly, I got complaints > when I proposed it for -current. > The source of the objection might be that GNU make is known to prefer bash -- and I've torn my hair out on more than one occasion because of this behaviour. However, buildenv is a target which explicitly forks an interactive shell, so the use of SHELL seems reasonable in this instance. cheers BMS From owner-p4-projects@FreeBSD.ORG Fri Jan 18 15:01:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4A0016A420; Fri, 18 Jan 2008 15:01:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 79F7B16A41B for ; Fri, 18 Jan 2008 15:01:36 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3790813C46E for ; Fri, 18 Jan 2008 15:01:36 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0IF1asG064140 for ; Fri, 18 Jan 2008 15:01:36 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IF1Zlf064137 for perforce@freebsd.org; Fri, 18 Jan 2008 15:01:35 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 18 Jan 2008 15:01:35 GMT Message-Id: <200801181501.m0IF1Zlf064137@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 133552 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 15:01:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=133552 Change 133552 by gonzo@gonzo_wooster on 2008/01/18 15:00:41 o Add mips to list of known architectures Affected files ... .. //depot/projects/mips2/src/Makefile.inc1#10 edit Differences ... ==== //depot/projects/mips2/src/Makefile.inc1#10 (text+ko) ==== @@ -113,7 +113,7 @@ TARGET?= ${MACHINE} TARGET_ARCH?= ${MACHINE_ARCH} -KNOWN_ARCHES?= amd64 arm armeb/arm i386 i386/pc98 ia64 powerpc sparc64 sparc64/sun4v +KNOWN_ARCHES?= amd64 arm armeb/arm i386 i386/pc98 ia64 mips powerpc sparc64 sparc64/sun4v .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else From owner-p4-projects@FreeBSD.ORG Fri Jan 18 15:08:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37DD616A468; Fri, 18 Jan 2008 15:08:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F0B2916A418 for ; Fri, 18 Jan 2008 15:08:43 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C603E13C459 for ; Fri, 18 Jan 2008 15:08:43 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0IF8hoq066157 for ; Fri, 18 Jan 2008 15:08:43 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IF8hiq066154 for perforce@freebsd.org; Fri, 18 Jan 2008 15:08:43 GMT (envelope-from scottl@freebsd.org) Date: Fri, 18 Jan 2008 15:08:43 GMT Message-Id: <200801181508.m0IF8hiq066154@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 133553 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 15:08:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=133553 Change 133553 by scottl@scottl-ix on 2008/01/18 15:08:34 Sync with fixed pmap and console Affected files ... .. //depot/projects/xen31-xenbus/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/include/pmap.h#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/include/xen/xenpmap.h#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/xen/pmap.c#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/xen31-xenbus/sys/xen/xenbus/xenbus_probe.c#2 edit Differences ... ==== //depot/projects/xen31-xenbus/sys/dev/xen/console/console.c#2 (text+ko) ==== @@ -76,9 +76,10 @@ #define XCUNIT(x) (minor(x)) #define ISTTYOPEN(tp) ((tp) && ((tp)->t_state & TS_ISOPEN)) #define CN_LOCK_INIT(x, _name) \ - mtx_init(&x, _name, NULL, MTX_DEF|MTX_RECURSE) -#define CN_LOCK(l) mtx_lock(&(l)) -#define CN_UNLOCK(l) mtx_unlock(&(l)) + mtx_init(&x, _name, NULL, MTX_SPIN|MTX_RECURSE) + +#define CN_LOCK(l) mtx_lock_spin(&(l)) +#define CN_UNLOCK(l) mtx_unlock_spin(&(l)) #define CN_LOCK_ASSERT(x) mtx_assert(&x, MA_OWNED) #define CN_LOCK_DESTROY(x) mtx_destroy(&x) @@ -162,9 +163,7 @@ static void xccnputc(struct consdev *dev, int c) { - CN_LOCK(cn_mtx); xcons_putc(c); - CN_UNLOCK(cn_mtx); } static void @@ -288,20 +287,20 @@ int i; struct tty *tp = xccons; - CN_LOCK(cn_mtx); for (i = 0; i < len; i++) { - if (xen_console_up) + if (xen_console_up) (*linesw[tp->t_line]->l_rint)(buf[i], tp); else rbuf[RBUF_MASK(rp++)] = buf[i]; } - CN_UNLOCK(cn_mtx); } static void __xencons_tx_flush(void) { int sz, work_done = 0; + + CN_LOCK(cn_mtx); while (wc != wp) { int sent; sz = wp - wc; @@ -318,7 +317,8 @@ } work_done = 1; } - + CN_UNLOCK(cn_mtx); + if (work_done && xen_console_up) ttwakeup(xccons); } @@ -326,9 +326,7 @@ void xencons_tx(void) { - CN_LOCK(cn_mtx); __xencons_tx_flush(); - CN_UNLOCK(cn_mtx); } static void @@ -432,31 +430,33 @@ static void xcstart(struct tty *tp) { - int s; boolean_t cons_full = FALSE; - s = spltty(); CN_LOCK(cn_mtx); if (tp->t_state & (TS_TIMEOUT | TS_TTSTOP)) { + CN_UNLOCK(cn_mtx); + ttwwakeup(tp); - CN_UNLOCK(cn_mtx); return; } tp->t_state |= TS_BUSY; + CN_UNLOCK(cn_mtx); + while (tp->t_outq.c_cc != 0 && !cons_full) cons_full = xcons_putc(getc(&tp->t_outq)); /* if the console is close to full leave our state as busy */ if (!cons_full) { - tp->t_state &= ~TS_BUSY; - ttwwakeup(tp); + CN_LOCK(cn_mtx); + tp->t_state &= ~TS_BUSY; + CN_UNLOCK(cn_mtx); + ttwwakeup(tp); } else { /* let the timeout kick us in a bit */ xc_start_needed = TRUE; } - CN_UNLOCK(cn_mtx); - splx(s); + } static void ==== //depot/projects/xen31-xenbus/sys/i386/i386/intr_machdep.c#2 (text+ko) ==== @@ -395,7 +395,8 @@ /* Schedule the ithread if needed. */ if (thread) { error = intr_event_schedule_thread(ie); - KASSERT(error == 0, ("bad stray interrupt")); + if (error != 0) + log(LOG_CRIT, "bad stray interrupt %d", vector); } critical_exit(); td->td_intr_nesting_level--; ==== //depot/projects/xen31-xenbus/sys/i386/i386/vm_machdep.c#2 (text+ko) ==== @@ -779,7 +779,7 @@ ptep = vtopte(sf->kva); opte = *ptep; #ifdef XEN - PT_SET_MA(sf->kva, xpmap_ptom(VM_PAGE_TO_PHYS(m)) | pgeflag | PG_RW | PG_V); + *ptep = xpmap_ptom(VM_PAGE_TO_PHYS(m)) | pgeflag | PG_RW | PG_V; #else *ptep = VM_PAGE_TO_PHYS(m) | pgeflag | PG_RW | PG_V; #endif ==== //depot/projects/xen31-xenbus/sys/i386/include/pmap.h#2 (text+ko) ==== @@ -232,32 +232,58 @@ void pmap_map_readonly(struct pmap *pmap, vm_offset_t va, int len); void pmap_map_readwrite(struct pmap *pmap, vm_offset_t va, int len); + +static __inline pt_entry_t +pte_load_store(pt_entry_t *ptep, pt_entry_t v) +{ + pt_entry_t r; + + v = xpmap_ptom(v); + r = *ptep; + __asm __volatile( + "1:\n" + "\tlock; cmpxchg8b %1\n" + "\tjnz 1b" + : "+A" (r) + : "m" (*ptep), "b" ((uint32_t)v), "c" ((uint32_t)(v >> 32))); + return (r); +} + static __inline pt_entry_t -pte_load_clear(pt_entry_t *ptep) +pte_load_store_ma(pt_entry_t *ptep, pt_entry_t v) { pt_entry_t r; - r = PT_GET(ptep); - PT_CLEAR_VA(ptep, TRUE); + r = *ptep; + __asm __volatile( + "1:\n" + "\tlock; cmpxchg8b %1\n" + "\tjnz 1b" + : "+A" (r) + : "m" (*ptep), "b" ((uint32_t)v), "c" ((uint32_t)(v >> 32))); return (r); } + + +#else + + static __inline pt_entry_t pte_load_store(pt_entry_t *ptep, pt_entry_t v) { pt_entry_t r; - r = PT_GET(ptep); - PT_SET_VA(ptep, v, TRUE); + + r = *ptep; + __asm __volatile( + "1:\n" + "\tlock; cmpxchg8b %1\n" + "\tjnz 1b" + : "+A" (r) + : "m" (*ptep), "b" ((uint32_t)v), "c" ((uint32_t)(v >> 32))); return (r); } -#define pte_store(ptep, pte) pte_load_store((ptep), (pt_entry_t)pte) -#define pte_clear(ptep) pte_load_store((ptep), (pt_entry_t)0ULL) - -#ifdef PAE -extern pt_entry_t pg_nx; -#endif -#else /* * Routine: pmap_kextract * Function: @@ -278,6 +304,8 @@ return pa; } +#endif + #ifdef PAE static __inline pt_entry_t @@ -292,21 +320,6 @@ return (r); } -static __inline pt_entry_t -pte_load_store(pt_entry_t *ptep, pt_entry_t v) -{ - pt_entry_t r; - - r = *ptep; - __asm __volatile( - "1:\n" - "\tlock; cmpxchg8b %1\n" - "\tjnz 1b" - : "+A" (r) - : "m" (*ptep), "b" ((uint32_t)v), "c" ((uint32_t)(v >> 32))); - return (r); -} - /* XXXRU move to atomic.h? */ static __inline int atomic_cmpset_64(volatile uint64_t *dst, uint64_t exp, uint64_t src) @@ -332,6 +345,8 @@ #define pte_store(ptep, pte) pte_load_store((ptep), (pt_entry_t)pte) +#define pte_store_ma(ptep, pte) pte_load_store_ma((ptep), (pt_entry_t)pte) + extern pt_entry_t pg_nx; #else /* PAE */ @@ -373,8 +388,6 @@ #define pte_clear(ptep) pte_store((ptep), (pt_entry_t)0ULL) #define pde_store(pdep, pde) pte_store((pdep), (pde)) -#endif /* !XEN */ - #endif /* _KERNEL */ /* ==== //depot/projects/xen31-xenbus/sys/i386/include/xen/xenpmap.h#2 (text+ko) ==== @@ -75,7 +75,7 @@ #define INVALID_P2M_ENTRY (~0UL) -#define pmap_valid_entry(E) ((E) > PAGE_SIZE) /* is PDE or PTE valid? */ +#define pmap_valid_entry(E) ((E) & PG_V) /* is PDE or PTE valid? */ #define SH_PD_SET_VA 1 #define SH_PD_SET_VA_MA 2 @@ -102,7 +102,7 @@ } #endif #define PT_GET(_ptp) \ - (pmap_valid_entry(*(_ptp)) ? xpmap_mtop(*(_ptp)) : *(_ptp)) + (pmap_valid_entry(*(_ptp)) ? xpmap_mtop(*(_ptp)) : (0)) #ifdef WRITABLE_PAGETABLES ==== //depot/projects/xen31-xenbus/sys/i386/xen/pmap.c#2 (text+ko) ==== @@ -193,12 +193,8 @@ #define pmap_pte_u(pte) ((*(int *)pte & PG_A) != 0) #define pmap_pte_v(pte) ((*(int *)pte & PG_V) != 0) -#define pmap_pte_set_w(pte, v) { \ - if (v) \ - PT_SET_VA_MA(pte, *pte | PG_W, TRUE); \ - else \ - PT_SET_VA_MA(pte, *pte & ~PG_W, TRUE); \ -} +#define pmap_pte_set_w(pte, v) ((v) ? atomic_set_int((u_int *)(pte), PG_W) : \ + atomic_clear_int((u_int *)(pte), PG_W)) #define pmap_pte_set_prot(pte, v) ((*(int *)pte &= ~PG_PROT), (*(int *)pte |= (v))) struct pmap kernel_pmap_store; @@ -252,12 +248,8 @@ */ static caddr_t crashdumpmap; -#ifdef SMP -extern pt_entry_t *SMPpt; -#endif static pt_entry_t *PMAP1 = 0, *PMAP2; static pt_entry_t *PADDR1 = 0, *PADDR2; -static int PMAP1_inuse = 0, PMAP2_inuse = 0; #ifdef SMP static int PMAP1cpu; static int PMAP1changedcpu; @@ -305,6 +297,32 @@ CTASSERT(1 << PDESHIFT == sizeof(pd_entry_t)); CTASSERT(1 << PTESHIFT == sizeof(pt_entry_t)); +/* + * If you get an error here, then you set KVA_PAGES wrong! See the + * description of KVA_PAGES in sys/i386/include/pmap.h. It must be + * multiple of 4 for a normal kernel, or a multiple of 8 for a PAE. + */ +CTASSERT(KERNBASE % (1 << 24) == 0); + + + + +static __inline void +pagezero(void *page) +{ +#if defined(I686_CPU) + if (cpu_class == CPUCLASS_686) { +#if defined(CPU_ENABLE_SSE) + if (cpu_feature & CPUID_SSE2) + sse2_pagezero(page); + else +#endif + i686_pagezero(page); + } else +#endif + bzero(page, PAGE_SIZE); +} + void pd_set(struct pmap *pmap, int ptepindex, vm_paddr_t val, int type) { @@ -419,7 +437,7 @@ } SYSMAP(caddr_t, CMAP1, CADDR1, 1) SYSMAP(caddr_t, CMAP3, CADDR3, 1) - PT_CLEAR_VA(CMAP3, TRUE); + *CMAP3 = 0; /* * Crashdump maps. @@ -445,8 +463,9 @@ mtx_init(&PMAP2mutex, "PMAP2", NULL, MTX_DEF); virtual_avail = va; - PT_CLEAR_VA(CMAP1, TRUE); - + + *CMAP1 = 0; + /* * Leave in place an identity mapping (virt == phys) for the low 1 MB * physical memory region that is used by the ACPI wakeup code. This @@ -546,7 +565,7 @@ va = (vm_offset_t)btext; while (va < endva) { pte = vtopte(va); - if (*pte) + if (*pte & PG_V) *pte |= pgeflag; invltlb(); /* Play it safe, invltlb() every time */ va += PAGE_SIZE; @@ -602,28 +621,19 @@ *head = *pte; if (*head & PG_V) panic("pmap_ptelist_alloc: va with PG_V set!"); -#ifdef XEN - PT_SET_MA(va, (vm_paddr_t)0); -#else *pte = 0; -#endif return (va); } static void pmap_ptelist_free(vm_offset_t *head, vm_offset_t va) { -#ifndef XEN pt_entry_t *pte; if (va & PG_V) panic("pmap_ptelist_free: freeing va with PG_V set!"); - pte = vtopte(va); *pte = *head; /* virtual! PG_V is 0 though */ -#else - PT_SET_MA(va, (vm_paddr_t)*head); -#endif *head = va; } @@ -938,7 +948,7 @@ mtx_lock(&PMAP2mutex); newpf = *pde & PG_FRAME; if ((*PMAP2 & PG_FRAME) != newpf) { - PT_SET_VA_MA(PMAP2, newpf | PG_V | PG_A | PG_M, TRUE); + *PMAP2 = newpf | PG_V | PG_A; pmap_invalidate_page(kernel_pmap, (vm_offset_t)PADDR2); } return (PADDR2 + (i386_btop(va) & (NPTEPG - 1))); @@ -954,8 +964,10 @@ pmap_pte_release(pt_entry_t *pte) { - if ((pt_entry_t *)((vm_offset_t)pte & ~PAGE_MASK) == PADDR2) + if ((pt_entry_t *)((vm_offset_t)pte & ~PAGE_MASK) == PADDR2) { + *PMAP2 = 0; mtx_unlock(&PMAP2mutex); + } } static __inline void @@ -992,8 +1004,8 @@ mtx_assert(&vm_page_queue_mtx, MA_OWNED); KASSERT(curthread->td_pinned > 0, ("curthread not pinned")); newpf = *pde & PG_FRAME; - if ((PT_GET(PMAP1) & PG_FRAME) != newpf) { - PT_SET_VA_MA(PMAP1, newpf | PG_V | PG_A, TRUE); + if ((*PMAP1 & PG_FRAME) != newpf) { + *PMAP1 = newpf | PG_V | PG_A; #ifdef SMP PMAP1cpu = PCPU_GET(cpuid); #endif @@ -1038,10 +1050,6 @@ pte = pmap_pte(pmap, va); rtval = (PT_GET(pte) & PG_FRAME) | (va & PAGE_MASK); pmap_pte_release(pte); - if (PMAP2_inuse) { - PT_CLEAR_VA(PMAP2, TRUE); - PMAP2_inuse = 0; - } } PMAP_UNLOCK(pmap); return (rtval); @@ -1071,12 +1079,6 @@ pte = pmap_pte(pmap, va); rtval = (*pte & PG_FRAME) | (va & PAGE_MASK); pmap_pte_release(pte); -#ifdef XEN - if (PMAP2_inuse) { - PT_CLEAR_VA(PMAP2, TRUE); - PMAP2_inuse = 0; - } -#endif } PMAP_UNLOCK(pmap); return (rtval); @@ -1110,11 +1112,9 @@ } else { sched_pin(); pte = PT_GET(pmap_pte_quick(pmap, va)); - if (PMAP1_inuse) { - PT_CLEAR_VA(PMAP1, TRUE); - PMAP1_inuse = 0; - } - if (pte != 0 && + if (*PMAP1) + *PMAP1 = 0; + if ((pte & PG_V) && ((pte & PG_RW) || (prot & VM_PROT_WRITE) == 0)) { m = PHYS_TO_VM_PAGE(pte & PG_FRAME); vm_page_hold(m); @@ -1150,7 +1150,7 @@ pt_entry_t *pte; pte = vtopte(va); - PT_SET_VA_MA(pte, ma | PG_RW | PG_V | pgeflag, TRUE); + pte_store_ma(pte, ma | PG_RW | PG_V | pgeflag); } @@ -1459,7 +1459,7 @@ for (i = KPTDI; i < KPTDI + nkpt; i++) pmap->pm_pdir_shadow[i] = PTD[i] & ~(PG_RW|PG_M|PG_A); for (i = 0; i < NPGPTD; i++) { - vm_paddr_t *pd; + pt_entry_t *pd; pd = pmap->pm_pdir + (i * NPDEPG); PT_SET_MA(pd, *vtopte((vm_offset_t)pd) & ~(PG_M|PG_A|PG_U|PG_RW)); @@ -1569,7 +1569,7 @@ * If the page table page is mapped, we just increment the * hold count, and activate it. */ - if (ptema) { + if (ptema & PG_V) { m = PHYS_TO_VM_PAGE(xpmap_mtop(ptema) & PG_FRAME); m->wire_count++; } else { @@ -1692,7 +1692,12 @@ { vm_page_t m, ptdpg[NPGPTD+1]; vm_paddr_t ma; - int i, npgptd = NPGPTD + 1; + int i; +#ifdef PAE + int npgptd = 2*NPGPTD + 1; +#else + int npgptd = 2*NPGPTD; +#endif KASSERT(pmap->pm_stats.resident_count == 0, ("pmap_release: pmap resident count %ld != 0", @@ -1704,17 +1709,17 @@ mtx_unlock_spin(&allpmaps_lock); for (i = 0; i < NPGPTD; i++) - ptdpg[i] = PHYS_TO_VM_PAGE(PT_GET(&pmap->pm_pdir[PTDPTDI + i]) & PG_FRAME); + ptdpg[i] = PHYS_TO_VM_PAGE(vtophys(pmap->pm_pdir_shadow + (i*NPDEPG)) & PG_FRAME); + for (i = 0; i < NPGPTD; i++) + ptdpg[NPGPTD + i] = PHYS_TO_VM_PAGE(vtophys(pmap->pm_pdir + (i*NPDEPG)) & PG_FRAME); - ptdpg[NPGPTD] = PHYS_TO_VM_PAGE(vtophys(pmap->pm_pdir)); - for (i = 0; i < nkpt + NPGPTD; i++) - PD_CLEAR_VA(pmap, PTDPTDI + i, FALSE); +#ifdef PAE + ptdpg[2*NPGPTD] = PHYS_TO_VM_PAGE(vtophys(pmap->pm_pdpt)); +#endif - - bzero(pmap->pm_pdir + PTDPTDI, (nkpt + NPGPTD) * - sizeof(*pmap->pm_pdir)); - + PT_UPDATES_FLUSH(); pmap_qremove((vm_offset_t)pmap->pm_pdir, NPGPTD); + pmap_qremove((vm_offset_t)pmap->pm_pdir_shadow, NPGPTD); for (i = 0; i < npgptd; i++) { m = ptdpg[i]; @@ -1727,7 +1732,7 @@ #endif m->wire_count--; atomic_subtract_int(&cnt.v_wire_count, 1); - vm_page_free_zero(m); + vm_page_free(m); } PMAP_LOCK_DESTROY(pmap); } @@ -2065,7 +2070,7 @@ pc = (struct pv_chunk *)pmap_ptelist_alloc(&pv_vafree); pmap_qenter((vm_offset_t)pc, &m, 1); if ((m->flags & PG_ZERO) == 0) - bzero(pc, PG_ZERO); + pagezero(pc); pc->pc_pmap = pmap; pc->pc_map[0] = pc_freemask[0] & ~1ul; /* preallocated bit 0 */ for (field = 1; field < _NPCM; field++) @@ -2150,8 +2155,14 @@ if (oldpte & PG_G) pmap_invalidate_page(kernel_pmap, va); pmap->pm_stats.resident_count -= 1; - if (oldpte & PG_MANAGED) { - m = PHYS_TO_VM_PAGE(oldpte & PG_FRAME); + /* + * XXX This is not strictly correctly, but somewhere along the line + * we are losing the managed bit on some pages. It is unclear to me + * why, but I think the most likely explanation is that xen's writable + * page table implementation doesn't respect the unused bits. + */ + if ((oldpte & PG_MANAGED) || ((oldpte & PG_V) && (va < VM_MAXUSER_ADDRESS))) { + m = PHYS_TO_VM_PAGE(xpmap_mtop(oldpte) & PG_FRAME); if (oldpte & PG_M) { KASSERT((oldpte & PG_RW), ("pmap_remove_pte: modified page not writable: va: %#x, pte: %#jx", @@ -2162,6 +2173,10 @@ vm_page_flag_set(m, PG_REFERENCED); pmap_remove_entry(pmap, m, va); } +#ifdef DEBUG + else if (va < VM_MAXUSER_ADDRESS) + printf("va=0x%x is unmanaged :-( \n", va); +#endif return (pmap_unuse_pt(pmap, va, free)); } @@ -2176,14 +2191,13 @@ mtx_assert(&vm_page_queue_mtx, MA_OWNED); KASSERT(curthread->td_pinned > 0, ("curthread not pinned")); PMAP_LOCK_ASSERT(pmap, MA_OWNED); - if ((pte = pmap_pte_quick(pmap, va)) == NULL || *pte == 0) + if ((pte = pmap_pte_quick(pmap, va)) == NULL || (*pte & PG_V) == 0) return; pmap_remove_pte(pmap, pte, va, free); pmap_invalidate_page(pmap, va); - if (PMAP1_inuse) { - PT_CLEAR_VA(PMAP1, TRUE); - PMAP1_inuse = 0; - } + if (*PMAP1) + *PMAP1 = 0; + } /* @@ -2264,7 +2278,7 @@ for (pte = pmap_pte_quick(pmap, sva); sva != pdnxt; pte++, sva += PAGE_SIZE) { - if (*pte == 0) + if ((*pte & PG_V) == 0) continue; /* @@ -2277,10 +2291,8 @@ break; } } - if (PMAP1_inuse) { - PT_CLEAR_VA(PMAP1, TRUE); - PMAP1_inuse = 0; - } + if (*PMAP1) + *PMAP1 = 0; out: sched_unpin(); if (anyvalid) @@ -2351,10 +2363,8 @@ PMAP_UNLOCK(pmap); } vm_page_flag_clear(m, PG_WRITEABLE); - if (PMAP1_inuse) { - PT_CLEAR_VA(PMAP1, TRUE); - PMAP1_inuse = 0; - } + if (*PMAP1) + *PMAP1 = 0; sched_unpin(); } @@ -2426,27 +2436,25 @@ sva += PAGE_SIZE) { vm_page_t m; -#ifndef XEN retry: -#endif /* * Regardless of whether a pte is 32 or 64 bits in * size, PG_RW, PG_A, and PG_M are among the least * significant 32 bits. */ - obits = pbits = PT_GET(pte); + obits = pbits = *pte; if ((pbits & PG_V) == 0) continue; if (pbits & PG_MANAGED) { m = NULL; if (pbits & PG_A) { - m = PHYS_TO_VM_PAGE(pbits & PG_FRAME); + m = PHYS_TO_VM_PAGE(xpmap_mtop(pbits) & PG_FRAME); vm_page_flag_set(m, PG_REFERENCED); pbits &= ~PG_A; } if ((pbits & PG_M) != 0) { if (m == NULL) - m = PHYS_TO_VM_PAGE(pbits & PG_FRAME); + m = PHYS_TO_VM_PAGE(xpmap_mtop(pbits) & PG_FRAME); vm_page_dirty(m); } } @@ -2459,7 +2467,6 @@ #endif if (pbits != obits) { -#ifndef XEN #ifdef PAE if (!atomic_cmpset_64(pte, obits, pbits)) goto retry; @@ -2468,9 +2475,6 @@ pbits)) goto retry; #endif -#else - PT_SET_VA(pte, pbits, FALSE); -#endif if (obits & PG_G) pmap_invalidate_page(pmap, sva); else @@ -2478,10 +2482,8 @@ } } } - if (PMAP1_inuse) { - PT_CLEAR_VA(PMAP1, TRUE); - PMAP1_inuse = 0; - } + if (*PMAP1) + *PMAP1 = 0; sched_unpin(); if (anychanged) pmap_invalidate_all(pmap); @@ -2544,10 +2546,12 @@ } } #endif + pde = pmap_pde(pmap, va); if ((*pde & PG_PS) != 0) panic("pmap_enter: attempted pmap_enter on 4MB page"); pte = pmap_pte_quick(pmap, va); + /* * Page Directory table entry not valid, we need a new PT page */ @@ -2606,7 +2610,9 @@ if (origpte & PG_MANAGED) { om = PHYS_TO_VM_PAGE(opa); pmap_remove_entry(pmap, om, va); - } + } else if (va < VM_MAXUSER_ADDRESS) + printf("va=0x%x is unmanaged :-( \n", va); + if (mpte != NULL) { mpte->wire_count--; KASSERT(mpte->wire_count > 0, @@ -2685,10 +2691,8 @@ } else pte_store(pte, newpte | PG_A); } - if (PMAP1_inuse) { - PT_CLEAR_VA(PMAP1, TRUE); - PMAP1_inuse = 0; - } + if (*PMAP1) + *PMAP1 = 0; sched_unpin(); vm_page_unlock_queues(); PMAP_UNLOCK(pmap); @@ -2782,7 +2786,7 @@ * If the page table page is mapped, we just increment * the hold count, and activate it. */ - if (ptema) { + if (ptema & PG_V) { if (ptema & PG_PS) panic("pmap_enter_quick: unexpected mapping into 4MB page"); mpte = PHYS_TO_VM_PAGE(xpmap_mtop(ptema) & PG_FRAME); @@ -2964,10 +2968,6 @@ */ pmap_pte_set_w(pte, wired); pmap_pte_release(pte); - if (PMAP2_inuse) { - PT_CLEAR_VA(PMAP2, TRUE); - PMAP2_inuse = 0; - } PMAP_UNLOCK(pmap); } @@ -3040,7 +3040,7 @@ src_pte = vtopte(addr); while (addr < pdnxt) { pt_entry_t ptetemp; - ptetemp = PT_GET(src_pte); + ptetemp = *src_pte; /* * we only virtual copy managed pages */ @@ -3052,14 +3052,14 @@ dst_pte = pmap_pte_quick(dst_pmap, addr); if (*dst_pte == 0 && pmap_try_insert_pv_entry(dst_pmap, addr, - PHYS_TO_VM_PAGE(ptetemp & PG_FRAME))) { + PHYS_TO_VM_PAGE(xpmap_mtop(ptetemp) & PG_FRAME))) { /* * Clear the wired, modified, and * accessed (referenced) bits * during the copy. */ - PT_SET_VA(dst_pte, ptetemp & ~(PG_W | PG_M | PG_A), FALSE); - + *dst_pte = ptetemp & ~(PG_W | PG_M | + PG_A); dst_pmap->pm_stats.resident_count++; } else { free = NULL; @@ -3077,33 +3077,14 @@ src_pte++; } } - if (PMAP1_inuse) { - PT_CLEAR_VA(PMAP1, FALSE); - PMAP1_inuse = 0; - } + if (*PMAP1) + *PMAP1 = 0; sched_unpin(); vm_page_unlock_queues(); - PT_UPDATES_FLUSH(); PMAP_UNLOCK(src_pmap); PMAP_UNLOCK(dst_pmap); } -static __inline void -pagezero(void *page) -{ -#if defined(I686_CPU) - if (cpu_class == CPUCLASS_686) { -#if defined(CPU_ENABLE_SSE) - if (cpu_feature & CPUID_SSE2) - sse2_pagezero(page); - else -#endif - i686_pagezero(page); - } else -#endif - bzero(page, PAGE_SIZE); -} - /* * pmap_zero_page zeros the specified hardware page by mapping * the page into KVM and using bzero to clear its contents. @@ -3118,17 +3099,10 @@ if (*sysmaps->CMAP2) panic("pmap_zero_page: CMAP2 busy"); sched_pin(); -#ifdef XEN - PT_SET_VA(sysmaps->CMAP2, PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M, TRUE); -#else - *sysmaps->CMAP2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M; -#endif - KASSERT(*sysmaps->CMAP2 == (PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(m)) | PG_A | PG_M), - ("CMAP2 did not get set is %llx", *sysmaps->CMAP2)); - + *sysmaps->CMAP2 = PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(m)) | PG_A | PG_M; invlcaddr(sysmaps->CADDR2); pagezero(sysmaps->CADDR2); - PT_CLEAR_VA(sysmaps->CMAP2, TRUE); + *sysmaps->CMAP2 = 0; sched_unpin(); mtx_unlock(&sysmaps->lock); } @@ -3149,15 +3123,14 @@ if (*sysmaps->CMAP2) panic("pmap_zero_page: CMAP2 busy"); sched_pin(); - PT_SET_VA(sysmaps->CMAP2, PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M, TRUE); + *sysmaps->CMAP2 = PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(m)) | PG_A | PG_M; invlcaddr(sysmaps->CADDR2); if (off == 0 && size == PAGE_SIZE) pagezero(sysmaps->CADDR2); else bzero((char *)sysmaps->CADDR2 + off, size); - - PT_CLEAR_VA(sysmaps->CMAP2, TRUE); + *sysmaps->CMAP2 = 0; sched_unpin(); mtx_unlock(&sysmaps->lock); } @@ -3175,10 +3148,10 @@ if (*CMAP3) panic("pmap_zero_page: CMAP3 busy"); sched_pin(); - PT_SET_VA(CMAP3, PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M, TRUE); + *CMAP3 = PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(m)) | PG_A | PG_M; invlcaddr(CADDR3); pagezero(CADDR3); - PT_CLEAR_VA(CMAP3, TRUE); + *CMAP3 = 0; sched_unpin(); } @@ -3196,25 +3169,17 @@ sysmaps = &sysmaps_pcpu[PCPU_GET(cpuid)]; mtx_lock(&sysmaps->lock); if (*sysmaps->CMAP1) - panic("pmap_copy_page: CMAP1 busy, CMAP1=%llx", *sysmaps->CMAP1); + panic("pmap_copy_page: CMAP1 busy"); if (*sysmaps->CMAP2) panic("pmap_copy_page: CMAP2 busy"); sched_pin(); invlpg((u_int)sysmaps->CADDR1); invlpg((u_int)sysmaps->CADDR2); - PT_SET_VA(sysmaps->CMAP1, PG_V | VM_PAGE_TO_PHYS(src) | PG_A, TRUE); - PT_SET_VA(sysmaps->CMAP2, PG_V | PG_RW | VM_PAGE_TO_PHYS(dst) | PG_A | PG_M, TRUE); - KASSERT(*sysmaps->CMAP1 == (PG_V | xpmap_ptom(VM_PAGE_TO_PHYS(src)) | PG_A ), - ("CMAP1 did not get set is %llx", *sysmaps->CMAP1)); - KASSERT(*sysmaps->CMAP2 == (PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(dst)) | PG_A | PG_M), - ("CMAP2 did not get set is %llx", *sysmaps->CMAP2)); + *sysmaps->CMAP1 = PG_V | xpmap_ptom(VM_PAGE_TO_PHYS(src)) | PG_A; + *sysmaps->CMAP2 = PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(dst)) | PG_A | PG_M; bcopy(sysmaps->CADDR1, sysmaps->CADDR2, PAGE_SIZE); - PT_CLEAR_VA(sysmaps->CMAP1, FALSE); - PT_CLEAR_VA(sysmaps->CMAP2, TRUE); - if (*sysmaps->CMAP1) - panic("pmap_copy_page: CMAP1 busy, CMAP1=%llx", *sysmaps->CMAP1); - if (*sysmaps->CMAP2) - panic("pmap_copy_page: CMAP2 busy"); + *sysmaps->CMAP1 = 0; + *sysmaps->CMAP2 = 0; sched_unpin(); mtx_unlock(&sysmaps->lock); } @@ -3318,7 +3283,13 @@ if (pmap->pm_pdir_shadow[pv->pv_va >> PDRSHIFT] == 0) { printf("PDIR IS ZERO @ VA %08x\n", pv->pv_va); - panic("bad pte"); + /* workaround insufficient wired count + * on page directory - this only buys + * us a little bit of time as the list + * on one of the pages is now corrupt + */ + allfree = 0; + goto skip; } pte = vtopte(pv->pv_va); @@ -3328,8 +3299,9 @@ printf( "TPTE at %p IS ZERO @ VA %08x\n", pte, pv->pv_va); - panic("bad pte tpte"); + panic("bad pte"); } + /* * We cannot remove wired pages from a process' mapping at this time */ @@ -3348,7 +3320,6 @@ ("pmap_remove_pages: bad tpte %#jx", (uintmax_t)tpte)); - pmap->pm_stats.resident_count--; pte_clear(pte); @@ -3358,16 +3329,19 @@ if (tpte & PG_M) vm_page_dirty(m); + TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); + if (TAILQ_EMPTY(&m->md.pv_list)) + vm_page_flag_clear(m, PG_WRITEABLE); + + pmap_unuse_pt(pmap, pv->pv_va, &free); + skip: + /* Mark free */ PV_STAT(pv_entry_frees++); PV_STAT(pv_entry_spare++); pv_entry_count--; pc->pc_map[field] |= bitmask; - TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - if (TAILQ_EMPTY(&m->md.pv_list)) - vm_page_flag_clear(m, PG_WRITEABLE); - - pmap_unuse_pt(pmap, pv->pv_va, &free); + pmap->pm_stats.resident_count--; } } if (allfree) { @@ -3382,10 +3356,8 @@ pmap_ptelist_free(&pv_vafree, (vm_offset_t)pc); } } - if (PMAP1_inuse) { - PT_CLEAR_VA(PMAP1, TRUE); - PMAP1_inuse = 0; - } + if (*PMAP1) + *PMAP1 = 0; sched_unpin(); pmap_invalidate_all(pmap); vm_page_unlock_queues(); @@ -3422,10 +3394,8 @@ if (rv) break; } - if (PMAP1_inuse) { - PT_CLEAR_VA(PMAP1, TRUE); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 18 16:06:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DBEF816A41B; Fri, 18 Jan 2008 16:06:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A142916A417 for ; Fri, 18 Jan 2008 16:06:44 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 78F5713C44B for ; Fri, 18 Jan 2008 16:06:44 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0IG6iWC077263 for ; Fri, 18 Jan 2008 16:06:44 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IG6ixE077260 for perforce@freebsd.org; Fri, 18 Jan 2008 16:06:44 GMT (envelope-from scottl@freebsd.org) Date: Fri, 18 Jan 2008 16:06:44 GMT Message-Id: <200801181606.m0IG6ixE077260@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 133554 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 16:06:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=133554 Change 133554 by scottl@scottl-ix on 2008/01/18 16:05:48 Apply an even bigger hammer to get xenstore messages to work during early boot. Also note that the previous checkin added basic xenhub and xenbus newbus devices. Affected files ... .. //depot/projects/xen31-xenbus/sys/xen/xenbus/xenbus_probe.c#3 edit .. //depot/projects/xen31-xenbus/sys/xen/xenbus/xenbus_xs.c#2 edit Differences ... ==== //depot/projects/xen31-xenbus/sys/xen/xenbus/xenbus_probe.c#3 (text+ko) ==== ==== //depot/projects/xen31-xenbus/sys/xen/xenbus/xenbus_xs.c#2 (text+ko) ==== @@ -146,22 +146,22 @@ char *body; int i; - if (scheduler_running == 0) { + + spin_lock(&xs_state.reply_lock); + + while (list_empty(&xs_state.reply_list)) { + spin_unlock(&xs_state.reply_lock); + if (scheduler_running == 0) { /* * Give other domain time to run :-/ */ - for (i = 0; i < 10000; i++) - HYPERVISOR_yield(); + for (i = 0; i < 1000000; i++) + HYPERVISOR_yield(); xs_process_msg(); - } - - spin_lock(&xs_state.reply_lock); - - while (list_empty(&xs_state.reply_list)) { - spin_unlock(&xs_state.reply_lock); - wait_event_interruptible(&xs_state.reply_waitq, - !list_empty(&xs_state.reply_list)); - spin_lock(&xs_state.reply_lock); + } + wait_event_interruptible(&xs_state.reply_waitq, + !list_empty(&xs_state.reply_list)); + spin_lock(&xs_state.reply_lock); } msg = TAILQ_FIRST(&xs_state.reply_list); From owner-p4-projects@FreeBSD.ORG Fri Jan 18 16:51:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCAF216A46B; Fri, 18 Jan 2008 16:51:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 79C3416A420 for ; Fri, 18 Jan 2008 16:51:31 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3AF5313C4D3 for ; Fri, 18 Jan 2008 16:51:31 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0IGpV6c093014 for ; Fri, 18 Jan 2008 16:51:31 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IGpVu9093010 for perforce@freebsd.org; Fri, 18 Jan 2008 16:51:31 GMT (envelope-from imp@freebsd.org) Date: Fri, 18 Jan 2008 16:51:31 GMT Message-Id: <200801181651.m0IGpVu9093010@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133556 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 16:51:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=133556 Change 133556 by imp@imp_paco-paco on 2008/01/18 16:51:15 Mips needed here too. Affected files ... .. //depot/projects/mips2/src/Makefile.inc1#11 edit Differences ... ==== //depot/projects/mips2/src/Makefile.inc1#11 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Jan 18 16:58:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4FE416A468; Fri, 18 Jan 2008 16:58:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 622FF16A41A for ; Fri, 18 Jan 2008 16:58:39 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 289F613C4EF for ; Fri, 18 Jan 2008 16:58:39 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0IGwcAF093765 for ; Fri, 18 Jan 2008 16:58:38 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IGwc2K093762 for perforce@freebsd.org; Fri, 18 Jan 2008 16:58:38 GMT (envelope-from imp@freebsd.org) Date: Fri, 18 Jan 2008 16:58:38 GMT Message-Id: <200801181658.m0IGwc2K093762@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133557 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 16:58:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=133557 Change 133557 by imp@imp_paco-paco on 2008/01/18 16:58:22 Add a nop to prevent macro expanding into delay slot of blt. The target of the blt also loads the per cpu stuff (into t0), so there's no need to put it in the delay slot. One might be able to tweak the code a little to load it always and have the leaf code cope, but I'm not sure if the leaf that's called is called only from here so I'm just doing the correct thing and noting the posbilty that more analysis could yield more optimal results. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/support.S#6 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/support.S#6 (text+ko) ==== @@ -1466,6 +1466,7 @@ li t0, VM_MAXUSER_ADDRESS /* verify address validity */ blt a0, t0, fusufault /* trap faults */ + nop GET_CPU_PCPU(t1) lw t1, PC_CURTHREAD(t1) From owner-p4-projects@FreeBSD.ORG Fri Jan 18 17:03:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4B5216A421; Fri, 18 Jan 2008 17:03:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 99EA816A46C for ; Fri, 18 Jan 2008 17:03:44 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 73CCD13C4E5 for ; Fri, 18 Jan 2008 17:03:44 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0IH3ica096319 for ; Fri, 18 Jan 2008 17:03:44 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IH3iPS096316 for perforce@freebsd.org; Fri, 18 Jan 2008 17:03:44 GMT (envelope-from imp@freebsd.org) Date: Fri, 18 Jan 2008 17:03:44 GMT Message-Id: <200801181703.m0IH3iPS096316@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133558 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 17:03:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=133558 Change 133558 by imp@imp_paco-paco on 2008/01/18 17:03:31 Add a needed nop before an 'la' instruction. Also, allow AT to be stored in the pcb by telling the compiler that we're not using AT at that point in the code. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#4 (text+ko) ==== @@ -453,7 +453,10 @@ mtlo t0 mthi t1 RESTORE_U_PCB_REG(a0, PC, a1) + .set push + .set noat RESTORE_U_PCB_REG(AT, AST, a1) + .set pop RESTORE_U_PCB_REG(v0, V0, a1) dmtc0 a0, COP_0_EXC_PC # set return address @@ -658,6 +661,7 @@ jalr s0 nop beq s2, zero, 4f + nop la s0, _C_LABEL(ast) jalr s0 addu a0, s3, U_PCB_REGS # only arg is frame From owner-p4-projects@FreeBSD.ORG Fri Jan 18 18:11:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7586416A421; Fri, 18 Jan 2008 18:11:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3773616A418 for ; Fri, 18 Jan 2008 18:11:59 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8639F13C4EE for ; Fri, 18 Jan 2008 18:11:58 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0IIBwIx010232 for ; Fri, 18 Jan 2008 18:11:58 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IIBwjF010229 for perforce@freebsd.org; Fri, 18 Jan 2008 18:11:58 GMT (envelope-from brueffer@freebsd.org) Date: Fri, 18 Jan 2008 18:11:58 GMT Message-Id: <200801181811.m0IIBwjF010229@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 133565 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 18:11:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=133565 Change 133565 by brueffer@brueffer_haakonia on 2008/01/18 18:11:00 Correct a function argument. Submitted by: Diego Giagio Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#13 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#13 (text+ko) ==== @@ -27,9 +27,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#12 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#13 $ .\" -.Dd May 29, 2006 +.Dd January 18, 2007 .Dt audit_submit 3 .Os .Sh NAME @@ -53,7 +53,7 @@ The header will contain the event class specified by .Fa au_event . The subject token will be generated based on -.Fa au_ctx . +.Fa auid . The return token is dependent on the .Fa status and From owner-p4-projects@FreeBSD.ORG Fri Jan 18 18:16:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07B6A16A420; Fri, 18 Jan 2008 18:16:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A94EA16A41A for ; Fri, 18 Jan 2008 18:16:03 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8567F13C44B for ; Fri, 18 Jan 2008 18:16:03 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0IIG3Gl010599 for ; Fri, 18 Jan 2008 18:16:03 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IIG3xu010586 for perforce@freebsd.org; Fri, 18 Jan 2008 18:16:03 GMT (envelope-from brueffer@freebsd.org) Date: Fri, 18 Jan 2008 18:16:03 GMT Message-Id: <200801181816.m0IIG3xu010586@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 133566 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 18:16:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=133566 Change 133566 by brueffer@brueffer_haakonia on 2008/01/18 18:15:08 It's 2008 already? Sheesh... Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#14 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#14 (text+ko) ==== @@ -27,9 +27,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#13 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#14 $ .\" -.Dd January 18, 2007 +.Dd January 18, 2008 .Dt audit_submit 3 .Os .Sh NAME From owner-p4-projects@FreeBSD.ORG Fri Jan 18 18:18:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C11A16A418; Fri, 18 Jan 2008 18:18:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 28CF216A468 for ; Fri, 18 Jan 2008 18:18:06 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 034A213C4D9 for ; Fri, 18 Jan 2008 18:18:06 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0III5Pt010677 for ; Fri, 18 Jan 2008 18:18:05 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0III5UH010674 for perforce@freebsd.org; Fri, 18 Jan 2008 18:18:05 GMT (envelope-from scottl@freebsd.org) Date: Fri, 18 Jan 2008 18:18:05 GMT Message-Id: <200801181818.m0III5UH010674@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 133567 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 18:18:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=133567 Change 133567 by scottl@scottl-ix on 2008/01/18 18:17:17 Reduce the size of the hammer used in the message passer, and fix some nearby style. Affected files ... .. //depot/projects/xen31-xenbus/sys/xen/xenbus/xenbus_xs.c#3 edit Differences ... ==== //depot/projects/xen31-xenbus/sys/xen/xenbus/xenbus_xs.c#3 (text+ko) ==== @@ -142,41 +142,40 @@ static void *read_reply(enum xsd_sockmsg_type *type, unsigned int *len) { - struct xs_stored_msg *msg; - char *body; - int i; - - - spin_lock(&xs_state.reply_lock); + struct xs_stored_msg *msg; + char *body; + int i; + + spin_lock(&xs_state.reply_lock); - while (list_empty(&xs_state.reply_list)) { - spin_unlock(&xs_state.reply_lock); - if (scheduler_running == 0) { - /* - * Give other domain time to run :-/ - */ - for (i = 0; i < 1000000; i++) - HYPERVISOR_yield(); - xs_process_msg(); - } - wait_event_interruptible(&xs_state.reply_waitq, - !list_empty(&xs_state.reply_list)); - spin_lock(&xs_state.reply_lock); + while (list_empty(&xs_state.reply_list)) { + spin_unlock(&xs_state.reply_lock); + if (scheduler_running == 0) { + /* + * Give other domain time to run :-/ + */ + for (i = 0; i < 1000; i++) + HYPERVISOR_yield(); + xs_process_msg(); } + wait_event_interruptible(&xs_state.reply_waitq, + !list_empty(&xs_state.reply_list)); + spin_lock(&xs_state.reply_lock); + } - msg = TAILQ_FIRST(&xs_state.reply_list); - list_del(&xs_state.reply_list, msg); + msg = TAILQ_FIRST(&xs_state.reply_list); + list_del(&xs_state.reply_list, msg); - spin_unlock(&xs_state.reply_lock); + spin_unlock(&xs_state.reply_lock); - *type = msg->hdr.type; - if (len) - *len = msg->hdr.len; - body = msg->u.reply.body; + *type = msg->hdr.type; + if (len) + *len = msg->hdr.len; + body = msg->u.reply.body; - kfree(msg); + kfree(msg); - return body; + return body; } #if 0 From owner-p4-projects@FreeBSD.ORG Fri Jan 18 19:22:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1FA916A468; Fri, 18 Jan 2008 19:22:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9F45716A418 for ; Fri, 18 Jan 2008 19:22:50 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7E6C313C442 for ; Fri, 18 Jan 2008 19:22:50 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0IJMoeg049201 for ; Fri, 18 Jan 2008 19:22:50 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IJMnmC049167 for perforce@freebsd.org; Fri, 18 Jan 2008 19:22:49 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 18 Jan 2008 19:22:49 GMT Message-Id: <200801181922.m0IJMnmC049167@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 133572 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 19:22:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=133572 Change 133572 by hselasky@hselasky_laptop001 on 2008/01/18 19:20:19 Compile fix for uchcom. It appears I had forgotten this file when running my scripts some time back. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#21 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#21 (text+ko) ==== @@ -239,7 +239,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = UCHCOM_BULK_BUF_SIZE, + .mh.bufsize = UCHCOM_BULK_BUF_SIZE, .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .mh.callback = &uchcom_write_callback, }, @@ -248,7 +248,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = UCHCOM_BULK_BUF_SIZE, + .mh.bufsize = UCHCOM_BULK_BUF_SIZE, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &uchcom_read_callback, }, @@ -257,20 +257,20 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.callback = &uchcom_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.callback = &uchcom_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [4] = { @@ -278,7 +278,7 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, - .bufsize = 0, /* use wMaxPacketSize */ + .mh.bufsize = 0, /* use wMaxPacketSize */ .mh.callback = &uchcom_intr_callback, }, @@ -286,10 +286,10 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.callback = &uchcom_intr_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; @@ -434,7 +434,7 @@ goto done; } err = usbd_do_request_flags(sc->sc_udev, &Giant, req, - data, USBD_SHORT_XFER_OK, &actlen, 1000); + data, USBD_ERR_SHORT_XFER_OK, &actlen, 1000); if (err) { DPRINTFN(-1, "device request failed, err=%s " @@ -914,7 +914,7 @@ break; default: /* Error */ - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { sc->sc_flag |= UCHCOM_FLAG_INTR_STALL; usbd_transfer_start(sc->sc_xfer[5]); } @@ -961,7 +961,7 @@ return; default: /* Error */ - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { sc->sc_flag |= UCHCOM_FLAG_WRITE_STALL; usbd_transfer_start(sc->sc_xfer[2]); } @@ -1003,7 +1003,7 @@ return; default: /* Error */ - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { sc->sc_flag |= UCHCOM_FLAG_READ_STALL; usbd_transfer_start(sc->sc_xfer[3]); } From owner-p4-projects@FreeBSD.ORG Fri Jan 18 19:23:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 351A716A421; Fri, 18 Jan 2008 19:23:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E9E1316A419 for ; Fri, 18 Jan 2008 19:23:28 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C64D713C469 for ; Fri, 18 Jan 2008 19:23:28 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0IJNSkK049321 for ; Fri, 18 Jan 2008 19:23:28 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IJMono049204 for perforce@freebsd.org; Fri, 18 Jan 2008 19:22:50 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 18 Jan 2008 19:22:50 GMT Message-Id: <200801181922.m0IJMono049204@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 133573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 19:23:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=133573 Change 133573 by rdivacky@rdivacky_witten on 2008/01/18 19:22:48 IFC Affected files ... .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/cpu_switch.S#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/mp_watchdog.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/prof_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/uma_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/_types.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/asm.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/clock.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/float.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/ieeefp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/legacyvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/pc/bios.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/smp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/stack.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_proto.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_syscall.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_sysent.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/syscalls.master#4 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/cpufunc_asm_xscale_c3.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/intr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/locore.S#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/nexus_io.c#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/nexus_io_asm.S#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/stack_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/support.S#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/trap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_mci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/std.at91#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/conf/AVILA#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/conf/BWCT#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/conf/CRB#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/conf/EP80219#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/conf/HL200#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/conf/KB920X#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/armreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/asm.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/asmacros.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/atomic.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/endian.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/pmap.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/pte.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/stack.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/sa11x0/files.sa11x0#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/i80321.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/i80321_wdog.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/i80321var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/obio.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i8134x/crb_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i8134x/files.crb#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i8134x/files.i81342#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i8134x/i81342.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i8134x/i81342_mcu.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i8134x/i81342_pci.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i8134x/i81342_space.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i8134x/i81342reg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i8134x/i81342var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i8134x/iq81342_7seg.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i8134x/iq81342reg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i8134x/iq81342var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i8134x/obio.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i8134x/obio_space.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i8134x/obiovar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i8134x/std.crb#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i8134x/std.i81342#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i8134x/uart_bus_i81342.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i8134x/uart_cpu_i81342.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixp425_npevar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixp425_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/boot2/boot2.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/boot2/bwct_board.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/Makefile#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/emac.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/emac_init.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/spi_flash.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/loader.8#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/module.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/forth/support.4th#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/cdboot/cdboot.s#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/libpc98/bioscd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/powerpc/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/powerpc/loader/Makefile#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/powerpc/loader/conf.c#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/powerpc/loader/help.ofw#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/powerpc/loader/ldscript.powerpc#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/powerpc/loader/metadata.c#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/powerpc/loader/start.c#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/powerpc/loader/version#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/powerpc/ofw/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/powerpc/ofw/conf.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/powerpc/ofw/help.ofw#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/powerpc/ofw/ldscript.powerpc#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/powerpc/ofw/metadata.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/powerpc/ofw/start.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/powerpc/ofw/version#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/bsm/audit.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/bsm/audit_record.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_low.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/rpc/xdr.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/atomic.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/kcondvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/proc.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/types.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/svr4/imgact_svr4.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/Makefile.arm#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/NOTES#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/files#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/files.amd64#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/files.arm#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/files.i386#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/files.ia64#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/files.pc98#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/files.powerpc#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/files.sparc64#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/files.sun4v#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/kmod.mk#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/newvers.sh#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/options#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/options.amd64#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/options.arm#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/options.i386#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/options.ia64#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/options.powerpc#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/dev/npe/LICENSE#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/dev/wpi/LICENSE#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/common/avl/avl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/sys/procset.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/sys/vfs.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/opensolaris/uts/common/sys/vmem.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/crypto/rijndael/rijndael-api.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/crypto/rijndael/test00.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ddb/db_capture.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ddb/db_command.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ddb/db_command.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ddb/db_examine.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ddb/db_input.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ddb/db_lex.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ddb/db_lex.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ddb/db_main.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ddb/db_output.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ddb/db_ps.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ddb/db_script.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ddb/db_textdump.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ddb/ddb.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/aac/aac.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/acpica/acpi_hpet.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/adlink/adlink.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/agp/agp.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/agp/agp_ali.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/agp/agp_amd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/agp/agp_amd64.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/agp/agp_ati.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/agp/agp_i810.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/agp/agp_if.m#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/agp/agp_intel.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/agp/agp_nvidia.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/agp/agp_sis.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/agp/agp_via.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/agp/agppriv.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/agp/agpreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/agp/agpvar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/aic7xxx/aic7xxx.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/amr/amr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/amr/amr_cam.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/an/if_an.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/asmc/asmc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/asmc/asmcvar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/atkbdc/atkbd_atkbdc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/awi/awi.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/bktr/msp34xx.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ce/if_ce.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/coretemp/coretemp.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/common/cxgb_ctl_defs.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/common/cxgb_sge_defs.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/common/cxgb_vsc7323.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/cxgb_config.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/cxgb_ioctl.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/cxgb_l2t.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/cxgb_l2t.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/cxgb_multiq.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/cxgb_offload.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/cxgb_offload.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/cxgb_osdep.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/sys/cxgb_support.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/sys/mbufq.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/sys/mvec.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/t3cdev.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/t3fw-4.5.0.bin.gz.uu#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/ulp/toecore/toedev.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/ulp/toecore/toedev.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/ulp/tom/cxgb_defs.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/ulp/tom/cxgb_listen.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/ulp/tom/cxgb_tcp.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/ulp/tom/cxgb_tcp_subr.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/ulp/tom/cxgb_tcp_usrreq.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/ulp/tom/cxgb_tom.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/ulp/tom/cxgb_tom.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/drm/i915_dma.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ed/if_ed_rtl80x9.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_80003es2lan.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_80003es2lan.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_82540.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_82541.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_82541.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_82542.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_82543.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_82543.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_82571.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_82571.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_82575.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_82575.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_api.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_api.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_defines.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_hw.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_ich8lan.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_ich8lan.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_mac.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_mac.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_manage.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_manage.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_nvm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_nvm.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_osdep.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_phy.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_phy.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/e1000_regs.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/if_em.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/em/if_em.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/fb/creator.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/fb/fb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/fb/machfb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/fb/splash_bmp.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/fb/splash_pcx.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/fb/vga.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/flash/at45d.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/gem/if_gemreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hptrr/array.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hptrr/him.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hptrr/himfuncs.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hptrr/hptintf.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hptrr/hptrr_config.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hptrr/hptrr_config.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hptrr/hptrr_os_bsd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hptrr/hptrr_osm_bsd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hptrr/ldm.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hptrr/list.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hptrr/os_bsd.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hptrr/osm.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hwpmc/hwpmc_arm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hwpmc/hwpmc_ia64.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hwpmc/hwpmc_powerpc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hwpmc/hwpmc_sparc64.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/idt/idt_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/iir/iir.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ipmi/ipmi_smic.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ipmi/ipmi_ssif.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ipw/if_ipwreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/iscsi/initiator/isc_cam.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/iscsi/initiator/isc_sm.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/iscsi/initiator/isc_soc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/iscsi/initiator/isc_subr.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/iscsi/initiator/iscsi.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/iscsi/initiator/iscsi.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/iscsi/initiator/iscsi_subr.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/iscsi/initiator/iscsivar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ixgbe/ixgbe.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ixgbe/ixgbe_82598.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ixgbe/ixgbe_api.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ixgbe/ixgbe_api.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ixgbe/ixgbe_common.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ixgbe/ixgbe_common.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ixgbe/ixgbe_osdep.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ixgbe/ixgbe_phy.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ixgbe/ixgbe_phy.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ixgbe/ixgbe_type.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/kbd/kbdreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/le/am7990.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/le/am79900.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/md/md.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mfi/mfi_cam.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mfi/mfi_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mfi/mfivar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mii/gentbi.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mii/miidevs#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mii/rgephyreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mii/rlphy.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mii/ukphy_subr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/msk/if_msk.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mxge/mxge_lro.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mxge/mxge_mcp.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mxge/mxge_rss_eth_z8e.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mxge/mxge_rss_ethp_z8e.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mxge/rss_eth_z8e.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mxge/rss_ethp_z8e.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/my/if_my.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nvram/nvram.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/if_nxge.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/if_nxge.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/include/build-version.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/include/version.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/include/xge-debug.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/include/xge-defs.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/include/xge-list.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/include/xge-os-pal.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/include/xge-os-template.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/include/xge-queue.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/include/xgehal-channel.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/include/xgehal-config.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/include/xgehal-device.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/include/xgehal-driver.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/include/xgehal-event.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/include/xgehal-fifo.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/include/xgehal-mgmt.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/include/xgehal-mgmtaux.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/include/xgehal-mm.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/include/xgehal-regs.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/include/xgehal-ring.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/include/xgehal-stats.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/include/xgehal-types.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/include/xgehal.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/xge-osdep.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/xgehal/xge-queue.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/xgehal/xgehal-channel-fp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/xgehal/xgehal-channel.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/xgehal/xgehal-config.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/xgehal/xgehal-device-fp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/xgehal/xgehal-device.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/xgehal/xgehal-driver.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/xgehal/xgehal-fifo-fp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/xgehal/xgehal-fifo.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/xgehal/xgehal-mgmt.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/xgehal/xgehal-mgmtaux.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/xgehal/xgehal-mm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/xgehal/xgehal-ring-fp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/xgehal/xgehal-ring.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/xgehal/xgehal-stats.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/xgell-version.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ofw/ofw_disk.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ofw/openpromio.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/pccard/pccarddevs#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/pci/pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/powermac_nvram/powermac_nvram.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ppbus/ppbconf.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/random/harvest.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ray/if_ray.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/re/if_re.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/safe/safe.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/si/si_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sio/sio.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sio/sio_isa.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sio/sio_puc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/snp/snp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sound/isa/ad1816.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sound/pci/emu10kx-midi.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sound/pci/envy24ht.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sound/pci/ich.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sound/sbus/cs4231.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/stge/if_stgereg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/streams/streams.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/syscons/blank/blank_saver.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/syscons/daemon/daemon_saver.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/syscons/dragon/dragon_saver.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/syscons/fade/fade_saver.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/syscons/fire/fire_saver.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/syscons/green/green_saver.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/syscons/logo/logo_saver.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/syscons/rain/rain_saver.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/syscons/scgfbrndr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/syscons/scvgarndr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/syscons/snake/snake_saver.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/syscons/star/star_saver.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/syscons/warp/warp_saver.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/twa/tw_cl_init.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/twa/tw_cl_intr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/twa/tw_cl_misc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/twa/tw_osl.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/twa/tw_osl_cam.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/twa/tw_osl_share.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/if_rum.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/if_ural.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/if_zyd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/if_zydfw.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/if_zydreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/uchcom.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/ufoma.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/uipaq.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/umass.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/umodem.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/ums.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/usb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/usb_port.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/usb_quirks.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/utopia/utopia.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/vx/if_vx_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/wi/if_wi.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/wpi/if_wpi.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/wpi/if_wpireg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/wpi/if_wpivar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/cd9660/cd9660_lookup.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/hpfs/hpfs_subr.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/msdosfs/denode.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/msdosfs/direntry.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/msdosfs/msdosfs_fat.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/msdosfs/msdosfs_fileno.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/msdosfs/msdosfs_iconv.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/ntfs/ntfs_ihash.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/ntfs/ntfs_subr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/procfs/procfs.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/procfs/procfs_map.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/tmpfs/tmpfs.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/bde/g_bde.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/eli/g_eli_crypto.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/geom_bsd_enc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/geom_dev.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/geom_event.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/geom_io.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/label/g_label_reiserfs.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/multipath/g_multipath.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/part/g_part.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/part/g_part.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/part/g_part_bsd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/vinum/geom_vinum_init.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/virstor/binstream.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/virstor/binstream.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/virstor/g_virstor.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/virstor/g_virstor.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/virstor/g_virstor_md.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/geom/virstor/g_virstor_md.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/gnu/fs/ext2fs/ext2_lookup.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/gnu/fs/ext2fs/fs.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/gnu/fs/reiserfs/reiserfs_inode.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/gnu/fs/reiserfs/reiserfs_namei.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/bios/apm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/conf/GENERIC.hints#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/conf/NOTES#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/conf/PAE#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/conf/XBOX#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/i386/exception.s#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/i386/genassym.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/i386/geode.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/i386/in_cksum.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/i386/locore.s#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/i386/mp_watchdog.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/i386/msi.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/i386/stack_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/i386/support.s#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/i386/swtch.s#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/i386/trap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/include/asm.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/include/asmacros.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/include/bootinfo.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/include/clock.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/include/cpufunc.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/include/ieeefp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/include/in_cksum.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/include/legacyvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/include/pc/bios.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/include/pmap.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/include/pmc_mdep.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/include/smp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/include/stack.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/isa/clock.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/isa/isa.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/isa/prof_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/imgact_linux.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux_machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux_proto.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux_ptrace.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux_syscall.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux_sysent.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/syscalls.master#4 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/pci/pci_bus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/pci/pci_pir.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i4b/layer1/isic/i4b_avm_a1.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i4b/layer1/isic/i4b_isic.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i4b/layer1/isic/i4b_itk_ix1.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i4b/layer1/isic/i4b_tel_s016.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i4b/layer1/isic/i4b_tel_s0163.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i4b/layer1/isic/i4b_tel_s08.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/disasm/disasm.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/ia64/clock.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/ia64/exception.S#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/ia64/sapic.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/ia64/stack_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/ia64/support.S#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/ia64/uma_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/ia64/vm_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/include/atomic.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/include/ia64_cpu.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/include/intr.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/include/pmc_mdep.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 18 19:24:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 58F3716A47B; Fri, 18 Jan 2008 19:24:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E108E16A478 for ; Fri, 18 Jan 2008 19:24:30 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 87B3E13C457 for ; Fri, 18 Jan 2008 19:24:30 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0IJOUhT049660 for ; Fri, 18 Jan 2008 19:24:30 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IJOU0b049656 for perforce@freebsd.org; Fri, 18 Jan 2008 19:24:30 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 18 Jan 2008 19:24:30 GMT Message-Id: <200801181924.m0IJOU0b049656@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 133576 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 19:24:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=133576 Change 133576 by hselasky@hselasky_laptop001 on 2008/01/18 19:24:05 Improvements to the USS820 DCI driver. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uss820_dci.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/uss820_dci.h#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uss820_dci.c#7 (text+ko) ==== @@ -88,6 +88,7 @@ static void uss820_dci_root_ctrl_poll(struct uss820_dci_softc *sc); static void uss820_dci_standard_done(struct usbd_xfer *xfer); static void uss820_dci_intr_set(struct usbd_xfer *xfer, uint8_t set); +static void uss820_dci_update_shared_1(struct uss820_dci_softc *sc, uint8_t reg, uint8_t keep_mask, uint8_t set_mask); static usbd_std_root_transfer_func_t uss820_dci_root_intr_done; static usbd_std_root_transfer_func_t uss820_dci_root_ctrl_done; @@ -135,6 +136,21 @@ }; static void +uss820_dci_update_shared_1(struct uss820_dci_softc *sc, uint8_t reg, + uint8_t keep_mask, uint8_t set_mask) +{ + uint8_t temp; + + USS820_WRITE_1(sc, USS820_PEND, 1); + temp = USS820_READ_1(sc, reg); + temp &= (keep_mask); + temp |= (set_mask); + USS820_WRITE_1(sc, reg, temp); + USS820_WRITE_1(sc, USS820_PEND, 0); + return; +} + +static void uss820_dci_get_hw_ep_profile(struct usbd_device *udev, const struct usbd_hw_ep_profile **ppf, uint8_t ep_addr) { @@ -266,30 +282,23 @@ /* set stall */ - temp = USS820_READ_1(sc, USS820_EPCON); - - temp |= (USS820_EPCON_TXSTL | - USS820_EPCON_RXSTL); - - USS820_WRITE_SHARED_1(sc, USS820_EPCON, temp); + uss820_dci_update_shared_1(sc, USS820_EPCON, 0xFF, + (USS820_EPCON_TXSTL | USS820_EPCON_RXSTL)); td->did_stall = 1; } goto not_complete; } /* clear stall and all I/O */ - temp = USS820_READ_1(sc, USS820_EPCON); - - temp &= ~(USS820_EPCON_TXSTL | + uss820_dci_update_shared_1(sc, USS820_EPCON, + 0xFF ^ (USS820_EPCON_TXSTL | USS820_EPCON_RXSTL | USS820_EPCON_RXIE | - USS820_EPCON_TXOE); + USS820_EPCON_TXOE), 0); - USS820_WRITE_SHARED_1(sc, USS820_EPCON, temp); - /* clear end overwrite flag */ - rx_stat &= ~USS820_RXSTAT_EDOVW; - USS820_WRITE_SHARED_1(sc, USS820_RXSTAT, rx_stat); + uss820_dci_update_shared_1(sc, USS820_RXSTAT, + 0xFF ^ USS820_RXSTAT_EDOVW, 0); /* get the packet byte count */ count = bus_space_read_1(td->io_tag, td->io_hdl, @@ -323,10 +332,10 @@ return (1); /* not complete */ } /* clear receive setup bit */ - rx_stat &= ~(USS820_RXSTAT_RXSETUP | + uss820_dci_update_shared_1(sc, USS820_RXSTAT, + 0xFF ^ (USS820_RXSTAT_RXSETUP | USS820_RXSTAT_EDOVW | - USS820_RXSTAT_STOVW); - USS820_WRITE_SHARED_1(sc, USS820_RXSTAT, rx_stat); + USS820_RXSTAT_STOVW), 0); /* set RXFFRC bit */ temp = bus_space_read_1(td->io_tag, td->io_hdl, @@ -353,25 +362,15 @@ not_complete: /* clear end overwrite flag, if any */ if (rx_stat & USS820_RXSTAT_RXSETUP) { - rx_stat &= ~(USS820_RXSTAT_EDOVW | + uss820_dci_update_shared_1(sc, USS820_RXSTAT, + 0xFF ^ (USS820_RXSTAT_EDOVW | USS820_RXSTAT_STOVW | - USS820_RXSTAT_RXSETUP); - USS820_WRITE_SHARED_1(sc, USS820_RXSTAT, rx_stat); + USS820_RXSTAT_RXSETUP), 0); } return (1); /* not complete */ } -static void -uss820_dci_shared_write(struct uss820_dci_td *td, uint8_t reg, - uint8_t val) -{ - bus_space_write_1(td->io_tag, td->io_hdl, td->pend_reg, 1); - bus_space_write_1(td->io_tag, td->io_hdl, reg, val); - bus_space_write_1(td->io_tag, td->io_hdl, td->pend_reg, 0); - return; -} - static uint8_t uss820_dci_data_rx(struct uss820_dci_td *td) { @@ -380,7 +379,6 @@ uint8_t rx_flag; uint8_t rx_stat; uint8_t rx_cntl; - uint8_t ep_con; uint8_t to; uint8_t got_short; @@ -431,12 +429,11 @@ USS820_RXFLG_RXFIF1))) { /* read out EPCON register */ - ep_con = bus_space_read_1(td->io_tag, - td->io_hdl, td->ep_con_reg); /* enable RX input */ - if (!(ep_con & USS820_EPCON_RXIE)) { - ep_con |= USS820_EPCON_RXIE; - uss820_dci_shared_write(td, td->ep_con_reg, ep_con); + if (!td->did_stall) { + uss820_dci_update_shared_1(td->pc->xfer->usb_sc, + USS820_EPCON, 0xFF, USS820_EPCON_RXIE); + td->did_stall = 1; } return (1); /* not complete */ } @@ -512,7 +509,6 @@ uint16_t count_copy; uint8_t rx_stat; uint8_t tx_flag; - uint8_t ep_con; uint8_t to; /* select the correct endpoint */ @@ -591,16 +587,14 @@ bus_space_write_1(td->io_tag, td->io_hdl, td->tx_count_low_reg, count_copy); - /* read out EPCON register */ - ep_con = bus_space_read_1(td->io_tag, td->io_hdl, - td->ep_con_reg); /* * Enable TX output, which must happen after that we have written * data into the FIFO. This is undocumented. */ - if (!(ep_con & USS820_EPCON_TXOE)) { - ep_con |= USS820_EPCON_TXOE; - uss820_dci_shared_write(td, td->ep_con_reg, ep_con); + if (!td->did_stall) { + uss820_dci_update_shared_1(td->pc->xfer->usb_sc, + USS820_EPCON, 0xFF, USS820_EPCON_TXOE); + td->did_stall = 1; } /* check remainder */ if (td->remainder == 0) { @@ -759,7 +753,7 @@ /* acknowledge all interrupts */ - USS820_WRITE_SHARED_1(sc, USS820_SSR, 0); + uss820_dci_update_shared_1(sc, USS820_SSR, 0, 0); /* check for any bus state change interrupts */ @@ -812,10 +806,10 @@ } } /* acknowledge all SBI interrupts */ - USS820_WRITE_SHARED_1(sc, USS820_SBI, 0); + uss820_dci_update_shared_1(sc, USS820_SBI, 0, 0); /* acknowledge all SBI1 interrupts */ - USS820_WRITE_SHARED_1(sc, USS820_SBI1, 0); + uss820_dci_update_shared_1(sc, USS820_SBI1, 0, 0); /* poll all active transfers */ uss820_dci_interrupt_poll(sc); @@ -1277,14 +1271,12 @@ } USS820_WRITE_1(sc, USS820_EPINDEX, ep_no); - temp = USS820_READ_1(sc, USS820_EPCON); - if (ep_dir == UE_DIR_IN) { - temp |= USS820_EPCON_TXSTL; + temp = USS820_EPCON_TXSTL; } else { - temp |= USS820_EPCON_RXSTL; + temp = USS820_EPCON_RXSTL; } - USS820_WRITE_SHARED_1(sc, USS820_EPCON, temp); + uss820_dci_update_shared_1(sc, USS820_EPCON, 0xFF, temp); return; } @@ -1316,15 +1308,14 @@ USS820_WRITE_1(sc, USS820_EPINDEX, ep_no); /* clear stall and disable I/O transfers */ - temp = USS820_READ_1(sc, USS820_EPCON); if (ep_dir == UE_DIR_IN) { - temp &= ~(USS820_EPCON_TXOE | + temp = 0xFF ^ (USS820_EPCON_TXOE | USS820_EPCON_TXSTL); } else { - temp &= ~(USS820_EPCON_RXIE | + temp = 0xFF ^ (USS820_EPCON_RXIE | USS820_EPCON_RXSTL); } - USS820_WRITE_SHARED_1(sc, USS820_EPCON, temp); + uss820_dci_update_shared_1(sc, USS820_EPCON, temp, 0); if (ep_dir == UE_DIR_IN) { /* reset data toggle */ @@ -1340,8 +1331,8 @@ } else { /* reset data toggle */ - USS820_WRITE_SHARED_1(sc, USS820_RXSTAT, - USS820_RXSTAT_RXSOVW); + uss820_dci_update_shared_1(sc, USS820_RXSTAT, + 0, USS820_RXSTAT_RXSOVW); /* reset FIFO */ temp = USS820_READ_1(sc, USS820_RXCON); @@ -1388,7 +1379,7 @@ USS820_WRITE_1(sc, USS820_EPINDEX, n); /* disable endpoint - both directions */ - USS820_WRITE_SHARED_1(sc, USS820_EPCON, 0x00); + uss820_dci_update_shared_1(sc, USS820_EPCON, 0, 0); } if (cd == NULL) { @@ -1464,22 +1455,20 @@ USS820_WRITE_1(sc, USS820_RXCON, temp); } /* enable endpoint */ - temp = USS820_READ_1(sc, USS820_EPCON); - if (ep_type == UE_CONTROL) { - temp |= (USS820_EPCON_CTLEP | + temp = (USS820_EPCON_CTLEP | USS820_EPCON_RXSPM | USS820_EPCON_RXEPEN | USS820_EPCON_TXEPEN); } else { if (ep_dir == UE_DIR_IN) { - temp |= USS820_EPCON_TXEPEN; + temp = USS820_EPCON_TXEPEN; } else { - temp |= USS820_EPCON_RXEPEN; + temp = USS820_EPCON_RXEPEN; } } - USS820_WRITE_SHARED_1(sc, USS820_EPCON, temp); + uss820_dci_update_shared_1(sc, USS820_EPCON, 0xFF, temp); } return; } @@ -1567,7 +1556,7 @@ USS820_WRITE_1(sc, USS820_EPINDEX, n); /* disable endpoint */ - USS820_WRITE_SHARED_1(sc, USS820_EPCON, 0); + uss820_dci_update_shared_1(sc, USS820_EPCON, 0, 0); } mtx_unlock(&(sc->sc_bus.mtx)); @@ -2384,7 +2373,7 @@ USS820_WRITE_1(sc, USS820_RXCON, temp); /* enable control endpoint */ - USS820_WRITE_SHARED_1(sc, USS820_EPCON, + uss820_dci_update_shared_1(sc, USS820_EPCON, 0, (USS820_EPCON_CTLEP | USS820_EPCON_RXSPM | USS820_EPCON_RXIE | @@ -2590,7 +2579,6 @@ td->tx_count_high_reg = USS820_GET_REG(sc, USS820_TXCNTH); td->rx_cntl_reg = USS820_GET_REG(sc, USS820_RXCON); td->tx_cntl_reg = USS820_GET_REG(sc, USS820_TXCON); - td->ep_con_reg = USS820_GET_REG(sc, USS820_EPCON); td->pend_reg = USS820_GET_REG(sc, USS820_PEND); td->ep_reg = USS820_GET_REG(sc, USS820_EPINDEX); td->ep_index = ep_no; ==== //depot/projects/usb/src/sys/dev/usb/uss820_dci.h#6 (text+ko) ==== @@ -255,12 +255,6 @@ #define USS820_GET_REG(sc,reg) \ ((reg) << (sc)->sc_reg_shift) -#define USS820_WRITE_SHARED_1(sc, reg, data) do { \ - USS820_WRITE_1(sc, USS820_PEND, 1); \ - USS820_WRITE_1(sc, reg, data); \ - USS820_WRITE_1(sc, USS820_PEND, 0); \ -} while (0) - #define USS820_READ_1(sc, reg) \ bus_space_read_1((sc)->sc_io_tag, (sc)->sc_io_hdl, \ USS820_GET_REG(sc,reg)) @@ -294,7 +288,6 @@ uint8_t tx_count_high_reg; uint8_t rx_cntl_reg; uint8_t tx_cntl_reg; - uint8_t ep_con_reg; uint8_t ep_reg; uint8_t pend_reg; uint8_t ep_index; From owner-p4-projects@FreeBSD.ORG Fri Jan 18 19:27:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0FDF16A41B; Fri, 18 Jan 2008 19:27:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A507516A418 for ; Fri, 18 Jan 2008 19:27:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 821F013C467 for ; Fri, 18 Jan 2008 19:27:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0IJRhSq049893 for ; Fri, 18 Jan 2008 19:27:43 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IJRYBr049889 for perforce@freebsd.org; Fri, 18 Jan 2008 19:27:34 GMT (envelope-from jb@freebsd.org) Date: Fri, 18 Jan 2008 19:27:34 GMT Message-Id: <200801181927.m0IJRYBr049889@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133578 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 19:27:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=133578 Change 133578 by jb@jb_freebsd1 on 2008/01/18 19:27:19 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#14 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/firewalls/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/share/mk/doc.xml.mk#7 integrate .. //depot/projects/dtrace/doc/share/sgml/freebsd.ent#14 integrate .. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#23 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml#15 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml#6 integrate .. //depot/projects/dtrace/src/Makefile.inc1#36 integrate .. //depot/projects/dtrace/src/contrib/gdb/FREEBSD-diffs#1 branch .. //depot/projects/dtrace/src/contrib/top/display.c#4 integrate .. //depot/projects/dtrace/src/contrib/top/layout.h#4 integrate .. //depot/projects/dtrace/src/contrib/top/machine.h#5 integrate .. //depot/projects/dtrace/src/contrib/top/top.c#7 integrate .. //depot/projects/dtrace/src/contrib/top/top.h#5 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/cvs/Makefile#5 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/cvs/contrib/Makefile#5 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kgdb.h#6 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/main.c#4 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt.c#5 integrate .. //depot/projects/dtrace/src/include/unistd.h#9 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_extract.c#10 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_cpio.c#9 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_zip.c#11 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_disk.c#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/Makefile#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_write_disk.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_write_disk_hardlink.c#1 branch .. //depot/projects/dtrace/src/lib/libc/amd64/_fpmath.h#4 integrate .. //depot/projects/dtrace/src/lib/libc/gen/getttyent.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/i386/_fpmath.h#4 integrate .. //depot/projects/dtrace/src/lib/libc/ia64/_fpmath.h#4 integrate .. //depot/projects/dtrace/src/lib/libc/inet/inet_network.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/grantpt.c#6 integrate .. //depot/projects/dtrace/src/lib/libc/sys/access.2#6 integrate .. //depot/projects/dtrace/src/lib/libthr/Makefile#14 integrate .. //depot/projects/dtrace/src/lib/libutil/pty.3#4 integrate .. //depot/projects/dtrace/src/lib/libutil/pty.c#7 integrate .. //depot/projects/dtrace/src/lib/msun/src/math_private.h#5 integrate .. //depot/projects/dtrace/src/lib/msun/src/s_rintl.c#2 integrate .. //depot/projects/dtrace/src/sbin/quotacheck/quotacheck.c#7 integrate .. //depot/projects/dtrace/src/share/man/man4/mfi.4#5 integrate .. //depot/projects/dtrace/src/share/man/man4/pcib.4#3 integrate .. //depot/projects/dtrace/src/share/man/man5/src.conf.5#13 integrate .. //depot/projects/dtrace/src/share/man/man7/clocks.7#4 integrate .. //depot/projects/dtrace/src/share/misc/pci_vendors#6 integrate .. //depot/projects/dtrace/src/share/mk/bsd.own.mk#19 integrate .. //depot/projects/dtrace/src/share/zoneinfo/leapseconds#6 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#33 integrate .. //depot/projects/dtrace/src/sys/amd64/include/_types.h#4 integrate .. //depot/projects/dtrace/src/sys/amd64/include/float.h#4 integrate .. //depot/projects/dtrace/src/sys/amd64/isa/clock.c#8 integrate .. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#27 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/if_npe.c#5 integrate .. //depot/projects/dtrace/src/sys/boot/forth/loader.conf.5#4 integrate .. //depot/projects/dtrace/src/sys/conf/files#65 integrate .. //depot/projects/dtrace/src/sys/crypto/rijndael/rijndael-api.c#4 integrate .. //depot/projects/dtrace/src/sys/crypto/rijndael/test00.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/acpi_hpet.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/acpi_hpet.h#1 branch .. //depot/projects/dtrace/src/sys/dev/an/if_an.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/an/if_an_pci.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/an/if_anreg.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/ath/if_ath.c#17 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_adapter.h#7 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_main.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_multiq.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_osdep.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/sys/cxgb_support.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/sys/mvec.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/sys/uipc_mvec.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_drv.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/gem/if_gem.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndis.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/mxge/if_mxge.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/mxge/if_mxge_var.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/mxge/mxge_lro.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/mxge/mxge_mcp.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/mxge/mxge_rss_eth_z8e.c#1 branch .. //depot/projects/dtrace/src/sys/dev/mxge/mxge_rss_ethp_z8e.c#1 branch .. //depot/projects/dtrace/src/sys/dev/mxge/rss_eth_z8e.h#1 branch .. //depot/projects/dtrace/src/sys/dev/mxge/rss_ethp_z8e.h#1 branch .. //depot/projects/dtrace/src/sys/dev/nfe/if_nfe.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pci_user.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/re/if_re.c#15 integrate .. //depot/projects/dtrace/src/sys/dev/stge/if_stge.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/wpi/if_wpi.c#5 integrate .. //depot/projects/dtrace/src/sys/fs/udf/udf_vfsops.c#13 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#29 integrate .. //depot/projects/dtrace/src/sys/i386/isa/clock.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/genassym.sh#4 integrate .. //depot/projects/dtrace/src/sys/kern/kern_cpu.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/kern_mib.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/kern_rwlock.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/kern_time.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/sched_ule.c#25 integrate .. //depot/projects/dtrace/src/sys/kern/tty_pty.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_mbuf.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_shm.c#2 integrate .. //depot/projects/dtrace/src/sys/modules/mxge/Makefile#3 integrate .. //depot/projects/dtrace/src/sys/modules/mxge/mxge_rss_eth_z8e/Makefile#1 branch .. //depot/projects/dtrace/src/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile#1 branch .. //depot/projects/dtrace/src/sys/net/if_bridge.c#28 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_usrreq.c#13 integrate .. //depot/projects/dtrace/src/sys/nfsserver/nfs_srvsubs.c#11 integrate .. //depot/projects/dtrace/src/sys/pci/if_rlreg.h#11 integrate .. //depot/projects/dtrace/src/sys/sys/mbuf.h#13 integrate .. //depot/projects/dtrace/src/sys/sys/time.h#14 integrate .. //depot/projects/dtrace/src/tools/build/options/WITHOUT_FORTRAN#3 delete .. //depot/projects/dtrace/src/tools/regression/posixshm/Makefile#1 branch .. //depot/projects/dtrace/src/tools/regression/posixshm/posixshm.c#1 branch .. //depot/projects/dtrace/src/tools/regression/posixshm/posixshm.t#1 branch .. //depot/projects/dtrace/src/tools/regression/posixshm/test.c#1 branch .. //depot/projects/dtrace/src/tools/regression/posixshm/test.h#1 branch .. //depot/projects/dtrace/src/tools/tools/aac/aac_checkq.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/systat/cmds.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/systat/convtbl.c#6 integrate .. //depot/projects/dtrace/src/usr.bin/systat/devs.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/systat/fetch.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/systat/icmp.c#5 integrate .. //depot/projects/dtrace/src/usr.bin/systat/icmp6.c#5 integrate .. //depot/projects/dtrace/src/usr.bin/systat/iostat.c#6 integrate .. //depot/projects/dtrace/src/usr.bin/systat/ip.c#5 integrate .. //depot/projects/dtrace/src/usr.bin/systat/ip6.c#5 integrate .. //depot/projects/dtrace/src/usr.bin/systat/keyboard.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/systat/main.c#5 integrate .. //depot/projects/dtrace/src/usr.bin/systat/mbufs.c#6 integrate .. //depot/projects/dtrace/src/usr.bin/systat/netcmds.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/systat/netstat.c#6 integrate .. //depot/projects/dtrace/src/usr.bin/systat/pigs.c#7 integrate .. //depot/projects/dtrace/src/usr.bin/systat/swap.c#7 integrate .. //depot/projects/dtrace/src/usr.bin/systat/tcp.c#6 integrate .. //depot/projects/dtrace/src/usr.bin/systat/vmstat.c#7 integrate .. //depot/projects/dtrace/src/usr.bin/top/machine.c#9 integrate .. //depot/projects/dtrace/src/usr.bin/wall/wall.c#4 integrate .. //depot/projects/dtrace/www/en/administration.sgml#3 integrate .. //depot/projects/dtrace/www/en/cgi/man.cgi#7 integrate .. //depot/projects/dtrace/www/en/community.sgml#4 integrate .. //depot/projects/dtrace/www/en/donations/wantlist.sgml#28 integrate .. //depot/projects/dtrace/www/en/events/Makefile#5 integrate .. //depot/projects/dtrace/www/en/events/rss.xsl#1 branch .. //depot/projects/dtrace/www/en/gnome/newsflash.xsl#5 integrate .. //depot/projects/dtrace/www/en/gnome/rss2.xsl#2 integrate .. //depot/projects/dtrace/www/en/java/Makefile#3 integrate .. //depot/projects/dtrace/www/en/java/java-rss.xsl#1 branch .. //depot/projects/dtrace/www/en/java/news.xml#2 integrate .. //depot/projects/dtrace/www/en/java/newsflash.sgml#7 delete .. //depot/projects/dtrace/www/en/java/newsflash.xsl#1 branch .. //depot/projects/dtrace/www/en/layout/css/navigation.css#3 integrate .. //depot/projects/dtrace/www/en/news/Makefile#7 integrate .. //depot/projects/dtrace/www/en/news/status/status.sgml#10 integrate .. //depot/projects/dtrace/www/en/releases/6.3R/Makefile#2 integrate .. //depot/projects/dtrace/www/en/releases/6.3R/docbook.css#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/errata.html#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/hardware-alpha.html#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/hardware-amd64.html#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/hardware-i386.html#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/hardware-pc98.html#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/hardware-sparc64.html#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/hardware.sgml#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/installation-alpha.html#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/installation-amd64.html#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/installation-i386.html#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/installation-pc98.html#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/installation-sparc64.html#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/installation.sgml#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/readme.html#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/relnotes-alpha.html#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/relnotes-amd64.html#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/relnotes-i386.html#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/relnotes-pc98.html#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/relnotes-sparc64.html#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/relnotes.sgml#1 branch .. //depot/projects/dtrace/www/en/releng/index.sgml#26 integrate .. //depot/projects/dtrace/www/share/mk/doc.xml.mk#8 integrate .. //depot/projects/dtrace/www/share/sgml/advisories.xml#16 integrate .. //depot/projects/dtrace/www/share/sgml/header.ent#9 integrate .. //depot/projects/dtrace/www/share/sgml/libcommon.xsl#8 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#33 integrate .. //depot/projects/dtrace/www/share/sgml/templates.events.xsl#3 integrate .. //depot/projects/dtrace/www/share/sgml/templates.newsflash.xsl#3 integrate .. //depot/projects/dtrace/www/share/sgml/templates.press-rss.xsl#1 branch .. //depot/projects/dtrace/www/share/sgml/templates.press.xsl#4 integrate .. //depot/projects/dtrace/www/zh_CN/releases/6.3R/Makefile#1 branch .. //depot/projects/dtrace/www/zh_CN/releases/6.3R/docbook.css#1 branch .. //depot/projects/dtrace/www/zh_CN/releases/6.3R/errata.html#1 branch .. //depot/projects/dtrace/www/zh_CN/releases/6.3R/hardware-amd64.html#1 branch .. //depot/projects/dtrace/www/zh_CN/releases/6.3R/hardware-i386.html#1 branch .. //depot/projects/dtrace/www/zh_CN/releases/6.3R/hardware.sgml#1 branch .. //depot/projects/dtrace/www/zh_CN/releases/6.3R/installation-alpha.html#1 branch .. //depot/projects/dtrace/www/zh_CN/releases/6.3R/installation-amd64.html#1 branch .. //depot/projects/dtrace/www/zh_CN/releases/6.3R/installation-i386.html#1 branch .. //depot/projects/dtrace/www/zh_CN/releases/6.3R/installation-pc98.html#1 branch .. //depot/projects/dtrace/www/zh_CN/releases/6.3R/installation-powerpc.html#1 branch .. //depot/projects/dtrace/www/zh_CN/releases/6.3R/installation-sparc64.html#1 branch .. //depot/projects/dtrace/www/zh_CN/releases/6.3R/installation.sgml#1 branch .. //depot/projects/dtrace/www/zh_CN/releases/6.3R/readme.html#1 branch .. //depot/projects/dtrace/www/zh_CN/releases/6.3R/relnotes-alpha.html#1 branch .. //depot/projects/dtrace/www/zh_CN/releases/6.3R/relnotes-amd64.html#1 branch .. //depot/projects/dtrace/www/zh_CN/releases/6.3R/relnotes-i386.html#1 branch .. //depot/projects/dtrace/www/zh_CN/releases/6.3R/relnotes-pc98.html#1 branch .. //depot/projects/dtrace/www/zh_CN/releases/6.3R/relnotes-powerpc.html#1 branch .. //depot/projects/dtrace/www/zh_CN/releases/6.3R/relnotes-sparc64.html#1 branch .. //depot/projects/dtrace/www/zh_CN/releases/6.3R/relnotes.sgml#1 branch .. //depot/projects/dtrace/www/zh_CN/releases/Makefile#4 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#14 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -153,7 +153,11 @@ &man.altq.4; and &man.dummynet.4;. Dummynet has traditionally been closely tied with IPFW, and ALTQ with - IPF/PF. IPF, + PF. Traffic shaping for IPFILTER can currently + be done with IPFILTER for NAT and filtering and + IPFW with &man.dummynet.4; + or by using PF with + ALTQ. IPFW, and PF all use rules to control the access of packets to and from your system, although they go about it different ways and have different rule syntaxes. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1797,9 +1797,9 @@ :if=/usr/local/libexec/psif: - You should also specify the rw capability. - When this capability is present, LPD - opens the printer in read-write mode. + The rw capability should be also included in + order to let LPD to open the printer in + the read-write mode. If you have a parallel &postscript; printer (and therefore cannot use two-way communication with the printer, which ==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/firewalls/chapter.sgml#4 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -135,8 +135,13 @@ IPFIREWALL (IPFW гÑж нÑрлÑÑ… нь ÑлбÑг), ба OpenBSD-н PacketFilter (PF гÑж нÑрлÑÑ… нь ÑлбÑг). &os; нь мөн урÑгалыг Ñ…Ñзгаарлах(үндÑÑндÑÑ Ð·ÑƒÑ€Ð²Ð°Ñын өргөнийг Ñ…Ñзгаарлах) хоёр багцын хамт ирдÑг: - &man.altq.4; болон &man.dummynet.4;. Dummynet нь IPFW-тай, харин - ALTQ нь IPF/PF-тай нÑгт холбоотой ажилладаг. IPF, + &man.altq.4; болон &man.dummynet.4;. Dummynet нь анхнааÑаа IPFW-тай, харин + ALTQ нь PF-Ñ‚Ñй нÑгт холбоотой ажилладаг. + IPFILTER-ийн хувьд урÑгал Ñ…Ñзгаарлалтыг хийхдÑÑ + NAT болон шүүлтÑд IPFILTER-ийг ба + IPFW-ийг &man.dummynet.4;-Ñ‚Ñй цуг юм уу + ÑÑвÑл PF-ийг + ALTQ-тай цуг ашиглан хийж болно. IPFW, ба PF нь бүгд ÑиÑтем уруу орж байгаа болон гарч байгаа урÑгалыг дүрмүүдийн туÑламжтай удирдах боловч ÑинтакÑын хувьд ч, арга замын хувьд ч Ó©Ó©Ñ€ Ó©Ó©Ñ€ байдаг. ==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml#2 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -1563,9 +1563,9 @@ filter-name -c - -wwidth - -llength - -iindent + -w width + -l length + -i indent -n login -h host acct-file @@ -1659,8 +1659,8 @@ filter-name -xpixel-width - -ypixel-height + choice="plain">-x pixel-width + -y pixel-height -n login -h host acct-file @@ -1683,8 +1683,8 @@ filter-name - -wwidth - -llength + -w width + -l length ÑдгÑÑÑ€ нь текÑÑ‚ шүүлтүүрийн болон @@ -1787,9 +1787,9 @@ :if=/usr/local/libexec/psif: - Та Ð±Ð°Ñ rw боломжийг зааж өгөх Ñ…ÑÑ€ÑгтÑй; - ÑÐ½Ñ Ð½ÑŒ LPD-д Ñ…ÑвлÑгчийг унших-бичих горимоор - онгойлгохыг Ñ…Ñлж өгдөг. + LPD-д Ñ…ÑвлÑгчийг унших-бичих горимоор + онгойлгох боломж олгохын тулд rw боломж нь Ð±Ð°Ñ + орÑон байх шаардлагатай. Ð¥ÑÑ€Ñв танд зÑÑ€ÑгцÑÑ &postscript; Ñ…ÑвлÑгч байгаа (бөгөөд тиймÑÑÑ lprps-д Ñ…ÑÑ€ÑгтÑй хоёр талын холбоог Ñ…ÑвлÑгчтÑй ==== //depot/projects/dtrace/doc/share/mk/doc.xml.mk#7 (text+ko) ==== @@ -1,5 +1,5 @@ # doc.xml.mk -# $FreeBSD: doc/share/mk/doc.xml.mk,v 1.12 2008/01/07 10:08:29 murray Exp $ +# $FreeBSD: doc/share/mk/doc.xml.mk,v 1.13 2008/01/16 08:21:47 murray Exp $ XML_CATALOG_FILES= file://${.OBJDIR}/catalog-cwd.xml \ file://${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog.xml \ @@ -169,6 +169,7 @@ XML_NEWS_PRESS= ${WEB_PREFIX}/share/sgml/press.xml .endif XSL_NEWS_PRESS= ${WEB_PREFIX}/share/sgml/templates.press.xsl +XSL_NEWS_PRESS_RSS= ${WEB_PREFIX}/share/sgml/templates.press-rss.xsl XSL_NEWS_PRESS_OLD= ${WEB_PREFIX}/share/sgml/templates.oldpress.xsl # DEPENDSET: events .......................................................... ==== //depot/projects/dtrace/doc/share/sgml/freebsd.ent#14 (text+ko) ==== @@ -1,7 +1,7 @@ - - + + ==== //depot/projects/dtrace/doc/share/sgml/man-refs.ent#23 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.446 2008/01/01 23:55:27 bmah Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.447 2008/01/15 02:29:12 hrs Exp $ --> @@ -2552,6 +2552,7 @@ + ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml#15 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Chinese Documentation Project Original revision: 1.404 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml,v 1.17 2007/12/31 15:10:14 loader Exp $ + $FreeBSD: doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml,v 1.18 2008/01/16 08:22:58 loader Exp $ --> @@ -2591,7 +2591,7 @@ ²ÎÊýÄܹ»¿ØÖÆÍøÇÅÔÚת·¢±íÖб£´æ¶àÉÙ¸ö MAC µØÖ·£¬ ÒÔ¼°±íÏîÖÐÖ÷»úµÄ¹ýÆÚʱ¼ä¡£ ÆäËû²ÎÊý¿ØÖÆÉú³ÉÊ÷µÄÔËת·½Ê½¡£ - ½«³ÉÔ±ÍøÂç½Ó¿Ú¼ÙÈçÍøÇÅ¡£ ΪÁËÈÃÍøÇÅÄܹ»ÎªËùÓÐÍøÇųÉÔ±½Ó¿Úת·¢°ü£¬ + ½«³ÉÔ±ÍøÂç½Ó¿Ú¼ÓÈëÍøÇÅ¡£ ΪÁËÈÃÍøÇÅÄܹ»ÎªËùÓÐÍøÇųÉÔ±½Ó¿Úת·¢°ü£¬ ÍøÇŽӿںÍËùÓгÉÔ±½Ó¿Ú¶¼ÐèÒª´¦ÓÚÆôÓÃ״̬£º &prompt.root; ifconfig bridge0 addm fxp0 addm fxp1 up ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml#6 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.96 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml,v 1.6 2006/06/03 15:34:24 delphij Exp $ + Original Revision: 1.100 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml,v 1.7 2008/01/15 18:30:34 loader Exp $ --> @@ -1493,9 +1493,9 @@ filter-name -c - -wwidth - -llength - -iindent + -w width + -l length + -i indent -n login -h host acct-file @@ -1585,8 +1585,8 @@ filter-name -xpixel-width - -ypixel-height + choice="plain">-x pixel-width + -y pixel-height -n login -h host acct-file @@ -1607,8 +1607,8 @@ filter-name - -wwidth - -llength + -w width + -l length ºÍ ==== //depot/projects/dtrace/src/Makefile.inc1#36 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.591 2007/12/04 12:55:27 yar Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.592 2008/01/16 15:05:49 brueffer Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -237,7 +237,7 @@ # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - -DWITHOUT_FORTRAN -DWITHOUT_GDB + -DWITHOUT_GDB # world stage WMAKEENV= ${CROSSENV} \ ==== //depot/projects/dtrace/src/contrib/top/display.c#4 (text+ko) ==== @@ -8,7 +8,7 @@ * Copyright (c) 1984, 1989, William LeFebvre, Rice University * Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University * - * $FreeBSD: src/contrib/top/display.c,v 1.9 2005/05/19 13:34:19 keramida Exp $ + * $FreeBSD: src/contrib/top/display.c,v 1.10 2008/01/18 01:43:13 peter Exp $ */ /* @@ -78,8 +78,10 @@ static int *lmemory; static int *lswap; +static int num_cpus; static int *cpustate_columns; static int cpustate_total_length; +static int cpustates_column; static enum { OFF, ON, ERASE } header_status = ON; @@ -87,6 +89,29 @@ static void summary_format(); static void line_update(); +int x_lastpid = 10; +int y_lastpid = 0; +int x_loadave = 33; +int x_loadave_nompid = 15; +int y_loadave = 0; +int x_procstate = 0; +int y_procstate = 1; +int x_brkdn = 15; +int y_brkdn = 1; +int x_mem = 5; +int y_mem = 3; +int x_swap = 6; +int y_swap = 4; +int y_message = 5; +int x_header = 0; +int y_header = 6; +int x_idlecursor = 0; +int y_idlecursor = 5; +int y_procs = 7; + +int y_cpustates = 2; +int Header_lines = 7; + int display_resize() { @@ -138,6 +163,12 @@ /* call resize to do the dirty work */ lines = display_resize(); + num_cpus = statics->ncpus; + cpustates_column = 5; /* CPU: */ + if (num_cpus != 1) + cpustates_column += 2; /* CPU 0: */ + for (i = num_cpus; i > 9; i /= 10) + cpustates_column++; /* only do the rest if we need to */ if (lines > -1) @@ -153,7 +184,7 @@ num_swap = string_count(swap_names); lswap = (int *)malloc(num_swap * sizeof(int)); num_cpustates = string_count(cpustate_names); - lcpustates = (int *)malloc(num_cpustates * sizeof(int)); + lcpustates = (int *)malloc(num_cpustates * sizeof(int) * num_cpus); cpustate_columns = (int *)malloc(num_cpustates * sizeof(int)); memory_names = statics->memory_names; @@ -365,14 +396,13 @@ } } +#ifdef no_more /* * *_cpustates(states, names) - print the cpu state percentages * * Assumptions: cursor is on the PREVIOUS line */ -static int cpustates_column; - /* cpustates_tag() calculates the correct tag to use to label the line */ char *cpustates_tag() @@ -398,6 +428,7 @@ cpustates_column = strlen(use); return(use); } +#endif i_cpustates(states) @@ -406,11 +437,18 @@ { register int i = 0; register int value; - register char **names = cpustate_names; + register char **names; register char *thisname; + int cpu; + +for (cpu = 0; cpu < num_cpus; cpu++) { + names = cpustate_names; /* print tag and bump lastline */ - printf("\n%s", cpustates_tag()); + if (num_cpus == 1) + printf("\nCPU: "); + else + printf("\nCPU %d: ", cpu); lastline++; /* now walk thru the names and print the line */ @@ -423,14 +461,15 @@ /* if percentage is >= 1000, print it as 100% */ printf((value >= 1000 ? "%s%4.0f%% %s" : "%s%4.1f%% %s"), - i++ == 0 ? "" : ", ", + (i++ % num_cpustates) == 0 ? "" : ", ", ((float)value)/10., thisname); } } +} /* copy over values into "last" array */ - memcpy(lcpustates, states, num_cpustates * sizeof(int)); + memcpy(lcpustates, states, num_cpustates * sizeof(int) * num_cpus); } u_cpustates(states) @@ -439,14 +478,18 @@ { register int value; - register char **names = cpustate_names; + register char **names; register char *thisname; register int *lp; register int *colp; + int cpu; + +for (cpu = 0; cpu < num_cpus; cpu++) { + names = cpustate_names; - Move_to(cpustates_column, y_cpustates); - lastline = y_cpustates; - lp = lcpustates; + Move_to(cpustates_column, y_cpustates + cpu); + lastline = y_cpustates + cpu; + lp = lcpustates + (cpu * num_cpustates); colp = cpustate_columns; /* we could be much more optimal about this */ @@ -458,8 +501,8 @@ if (*lp != *states) { /* yes, move and change */ - Move_to(cpustates_column + *colp, y_cpustates); - lastline = y_cpustates; + Move_to(cpustates_column + *colp, y_cpustates + cpu); + lastline = y_cpustates + cpu; /* retrieve value and remember it */ value = *states; @@ -479,30 +522,39 @@ colp++; } } +} z_cpustates() { register int i = 0; - register char **names = cpustate_names; + register char **names; register char *thisname; register int *lp; + int cpu; + +for (cpu = 0; cpu < num_cpus; cpu++) { + names = cpustate_names; /* show tag and bump lastline */ - printf("\n%s", cpustates_tag()); + if (num_cpus == 1) + printf("\nCPU: "); + else + printf("\nCPU %d: ", cpu); lastline++; while ((thisname = *names++) != NULL) { if (*thisname != '\0') { - printf("%s %% %s", i++ == 0 ? "" : ", ", thisname); + printf("%s %% %s", (i++ % num_cpustates) == 0 ? "" : ", ", thisname); } } +} /* fill the "last" array with all -1s, to insure correct updating */ lp = lcpustates; - i = num_cpustates; + i = num_cpustates * num_cpus; while (--i >= 0) { *lp++ = -1; ==== //depot/projects/dtrace/src/contrib/top/layout.h#4 (text+ko) ==== @@ -4,26 +4,28 @@ * This file defines the locations on tne screen for various parts of the * display. These definitions are used by the routines in "display.c" for * cursor addressing. + * + * $FreeBSD: src/contrib/top/layout.h,v 1.3 2008/01/18 01:43:13 peter Exp $ */ -#define x_lastpid 10 -#define y_lastpid 0 -#define x_loadave 33 -#define x_loadave_nompid 15 -#define y_loadave 0 -#define x_procstate 0 -#define y_procstate 1 -#define x_brkdn 15 -#define y_brkdn 1 -#define x_mem 5 -#define y_mem 3 -#define x_swap 6 -#define y_swap 4 -#define y_message 5 -#define x_header 0 -#define y_header 6 -#define x_idlecursor 0 -#define y_idlecursor 5 -#define y_procs 7 +extern int x_lastpid; /* 10 */ +extern int y_lastpid; /* 0 */ +extern int x_loadave; /* 33 */ +extern int x_loadave_nompid; /* 15 */ +extern int y_loadave; /* 0 */ +extern int x_procstate; /* 0 */ +extern int y_procstate; /* 1 */ +extern int x_brkdn; /* 15 */ +extern int y_brkdn; /* 1 */ +extern int x_mem; /* 5 */ +extern int y_mem; /* 3 */ +extern int x_swap; /* 6 */ +extern int y_swap; /* 4 */ +extern int y_message; /* 5 */ +extern int x_header; /* 0 */ +extern int y_header; /* 6 */ +extern int x_idlecursor; /* 0 */ +extern int y_idlecursor; /* 5 */ +extern int y_procs; /* 7 */ -#define y_cpustates 2 +extern int y_cpustates; /* 2 */ ==== //depot/projects/dtrace/src/contrib/top/machine.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/contrib/top/machine.h,v 1.9 2007/05/04 15:42:58 rafan Exp $ + * $FreeBSD: src/contrib/top/machine.h,v 1.10 2008/01/18 01:43:13 peter Exp $ */ /* @@ -20,6 +20,7 @@ #ifdef ORDER char **order_names; #endif + int ncpus; }; /* @@ -43,6 +44,8 @@ int *memory; int *swap; struct timeval boottime; + unsigned long cpumask; /* bitfield of cpu states represented */ + int ncpus; }; /* cpu_states is an array of percentages * 10. For example, ==== //depot/projects/dtrace/src/contrib/top/top.c#7 (text+ko) ==== @@ -13,7 +13,7 @@ * Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory * Copyright (c) 1996, William LeFebvre, Group sys Consulting * - * $FreeBSD: src/contrib/top/top.c,v 1.24 2008/01/09 18:06:24 obrien Exp $ + * $FreeBSD: src/contrib/top/top.c,v 1.25 2008/01/18 01:43:13 peter Exp $ */ /* @@ -66,6 +66,7 @@ extern int overstrike; static int fmt_flags = 0; +int pcpu_stats = No; /* signal handling routines */ sigret_t leave(); @@ -282,7 +283,7 @@ optind = 1; } - while ((i = getopt(ac, av, "CSIHabijnquvs:d:U:m:o:t")) != EOF) + while ((i = getopt(ac, av, "CSIHPabijnpquvs:d:U:m:o:t")) != EOF) { switch(i) { @@ -407,6 +408,14 @@ ps.jail = !ps.jail; break; + case 'P': + pcpu_stats = Yes; + break; + + case 'p': + pcpu_stats = No; + break; + default: fprintf(stderr, "Top version %s\n" ==== //depot/projects/dtrace/src/contrib/top/top.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/contrib/top/top.h,v 1.4 2007/04/14 10:16:51 stas Exp $ + * $FreeBSD: src/contrib/top/top.h,v 1.5 2008/01/18 01:43:13 peter Exp $ */ /* * Top - a top users display for Berkeley Unix @@ -11,7 +11,7 @@ #define VERSION 3 /* Number of lines of header information on the standard screen */ -#define Header_lines 7 +extern int Header_lines; /* 7 */ /* Maximum number of columns allowed for display */ #define MAX_COLS 128 @@ -45,3 +45,5 @@ #define FMT_SHOWARGS 0x00000001 extern enum displaymodes displaymode; + +extern int pcpu_stats; ==== //depot/projects/dtrace/src/gnu/usr.bin/cvs/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/gnu/usr.bin/cvs/Makefile,v 1.17 2008/01/13 08:58:25 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cvs/Makefile,v 1.18 2008/01/16 17:16:36 obrien Exp $ -SUBDIR = lib libdiff cvs cvsbug doc +SUBDIR = lib libdiff cvs contrib cvsbug doc .include ==== //depot/projects/dtrace/src/gnu/usr.bin/cvs/contrib/Makefile#5 (text+ko) ==== @@ -1,4 +1,6 @@ -# $FreeBSD: src/gnu/usr.bin/cvs/contrib/Makefile,v 1.19 2008/01/13 09:45:53 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cvs/contrib/Makefile,v 1.20 2008/01/16 17:15:59 obrien Exp $ + +.POSIX: .include "../Makefile.inc" ==== //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kgdb.h#6 (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/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.6 2007/11/16 22:17:37 jhb Exp $ + * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.7 2008/01/17 21:43:12 jhb Exp $ */ #ifndef _KGDB_H_ @@ -32,6 +32,7 @@ struct thread_info; extern kvm_t *kvm; +extern char *kernel; struct kthr { struct kthr *next; @@ -63,5 +64,6 @@ char *kgdb_thr_extra_thread_info(int); uintptr_t kgdb_lookup(const char *sym); +CORE_ADDR kgdb_parse(const char *exp); #endif /* _KGDB_H_ */ ==== //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/main.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.11 2006/01/04 23:17:52 kan Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.12 2008/01/17 21:43:12 jhb Exp $"); #include #include @@ -75,7 +75,7 @@ static int verbose; static char crashdir[PATH_MAX]; -static char *kernel; +char *kernel; static char *remote; static char *vmcore; @@ -178,7 +178,7 @@ kgdb_new_objfile_chain(objfile); } -static CORE_ADDR +CORE_ADDR kgdb_parse(const char *exp) { struct cleanup *old_chain; ==== //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt.c#5 (text+ko) ==== @@ -25,13 +25,16 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.5 2006/10/16 20:06:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.6 2008/01/17 21:43:12 jhb Exp $"); #include #include +#include #include #include +#include #include +#include #include #include @@ -40,6 +43,9 @@ #include #include #include +#include +#include +#include #include "kgdb.h" @@ -199,6 +205,268 @@ kgdb_switch_to_thread(thr); } +static int +kld_ok (char *path) +{ + struct stat sb; + + if (stat(path, &sb) == 0 && S_ISREG(sb.st_mode)) + return (1); + return (0); +} >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 18 19:33:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0443516A41A; Fri, 18 Jan 2008 19:33:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A5D4D16A418 for ; Fri, 18 Jan 2008 19:33:51 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 85E2013C442 for ; Fri, 18 Jan 2008 19:33:51 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0IJXp6n051223 for ; Fri, 18 Jan 2008 19:33:51 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IJXofr051220 for perforce@freebsd.org; Fri, 18 Jan 2008 19:33:50 GMT (envelope-from csjp@freebsd.org) Date: Fri, 18 Jan 2008 19:33:50 GMT Message-Id: <200801181933.m0IJXofr051220@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 133579 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 19:33:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=133579 Change 133579 by csjp@csjp_xor on 2008/01/18 19:32:52 Add a case for AUE_LISTEN. This removes the following error messages: BSM conversion requested for unknown event 43140 It should be noted that we need to audit the fd argument here. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#34 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#34 (text+ko) ==== @@ -429,6 +429,7 @@ switch(ar->ar_event) { case AUE_ACCEPT: case AUE_BIND: + case AUE_LISTEN: case AUE_CONNECT: case AUE_RECV: case AUE_RECVFROM: From owner-p4-projects@FreeBSD.ORG Fri Jan 18 19:45:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 555D116A41B; Fri, 18 Jan 2008 19:45:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1AA3416A418 for ; Fri, 18 Jan 2008 19:45:04 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EF6C113C43E for ; Fri, 18 Jan 2008 19:45:03 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0IJj3Sr052845 for ; Fri, 18 Jan 2008 19:45:03 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IJj39c052842 for perforce@freebsd.org; Fri, 18 Jan 2008 19:45:03 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 18 Jan 2008 19:45:03 GMT Message-Id: <200801181945.m0IJj39c052842@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 133581 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 19:45:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=133581 Change 133581 by hselasky@hselasky_laptop001 on 2008/01/18 19:44:16 Factor out some code into a separate function in an attempt to avoid compiler warnings about variables being accessed uninitialized on FreeBSD 6.3 . Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#106 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#106 (text+ko) ==== @@ -2080,6 +2080,38 @@ return; } +static void +usbd_callback_intr_td_sub(struct usbd_xfer **xfer, uint8_t dropcount) +{ + struct usbd_memory_info *info = xfer[0]->usb_root; + + mtx_unlock(info->usb_mtx); + + /* + * We exploit the fact that the mutex is the same for + * all callbacks: + */ + mtx_lock(info->priv_mtx); + + /* call callback(s) */ + switch (dropcount) { + case 4: + usbd_callback_wrapper(xfer[3], info, USBD_CONTEXT_CALLBACK); + case 3: + usbd_callback_wrapper(xfer[2], info, USBD_CONTEXT_CALLBACK); + case 2: + usbd_callback_wrapper(xfer[1], info, USBD_CONTEXT_CALLBACK); + case 1: + usbd_callback_wrapper(xfer[0], info, USBD_CONTEXT_CALLBACK); + default: + break; + } + mtx_unlock(info->priv_mtx); + mtx_lock(info->usb_mtx); + info->memory_refcount -= dropcount; + return; +} + /*------------------------------------------------------------------------* * usbd_callback_intr_td * @@ -2093,7 +2125,6 @@ struct usbd_memory_info *info = arg; struct usbd_xfer *xfer[4]; struct thread *td; - uint8_t dropcount; /* adjust priority */ td = curthread; @@ -2110,60 +2141,31 @@ repeat: xfer[0] = LIST_FIRST(&(info->done_head)); if (xfer[0]) { - do { - LIST_REMOVE(xfer[0], done_list); - xfer[0]->done_list.le_prev = NULL; - xfer[1] = LIST_FIRST(&(info->done_head)); - if (xfer[1] == NULL) { - dropcount = 1; - break; - } - LIST_REMOVE(xfer[1], done_list); - xfer[1]->done_list.le_prev = NULL; - xfer[2] = LIST_FIRST(&(info->done_head)); - if (xfer[2] == NULL) { - dropcount = 2; - break; - } - LIST_REMOVE(xfer[2], done_list); - xfer[2]->done_list.le_prev = NULL; - xfer[3] = LIST_FIRST(&(info->done_head)); - if (xfer[3] == NULL) { - dropcount = 3; - break; - } - LIST_REMOVE(xfer[3], done_list); - xfer[3]->done_list.le_prev = NULL; - dropcount = 4; - } while (0); - - mtx_unlock(info->usb_mtx); - - /* - * we exploit the fact that the mutex is the same for - * all callbacks - */ - mtx_lock(info->priv_mtx); - - /* call callback(s) */ - switch (dropcount) { - case 4: - usbd_callback_wrapper(xfer[3], info, USBD_CONTEXT_CALLBACK); - case 3: - usbd_callback_wrapper(xfer[2], info, USBD_CONTEXT_CALLBACK); - case 2: - usbd_callback_wrapper(xfer[1], info, USBD_CONTEXT_CALLBACK); - case 1: - usbd_callback_wrapper(xfer[0], info, USBD_CONTEXT_CALLBACK); - default: - break; + LIST_REMOVE(xfer[0], done_list); + xfer[0]->done_list.le_prev = NULL; + xfer[1] = LIST_FIRST(&(info->done_head)); + if (xfer[1] == NULL) { + usbd_callback_intr_td_sub(xfer, 1); + goto repeat; + } + LIST_REMOVE(xfer[1], done_list); + xfer[1]->done_list.le_prev = NULL; + xfer[2] = LIST_FIRST(&(info->done_head)); + if (xfer[2] == NULL) { + usbd_callback_intr_td_sub(xfer, 2); + goto repeat; + } + LIST_REMOVE(xfer[2], done_list); + xfer[2]->done_list.le_prev = NULL; + xfer[3] = LIST_FIRST(&(info->done_head)); + if (xfer[3] == NULL) { + usbd_callback_intr_td_sub(xfer, 3); + goto repeat; } - mtx_unlock(info->priv_mtx); - - mtx_lock(info->usb_mtx); - info->memory_refcount -= dropcount; + LIST_REMOVE(xfer[3], done_list); + xfer[3]->done_list.le_prev = NULL; + usbd_callback_intr_td_sub(xfer, 4); goto repeat; - } else { if (info->memory_refcount != 0) { info->done_sleep = 1; From owner-p4-projects@FreeBSD.ORG Fri Jan 18 19:52:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBEAE16A46C; Fri, 18 Jan 2008 19:52:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8114A16A468 for ; Fri, 18 Jan 2008 19:52:11 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 621A613C44B for ; Fri, 18 Jan 2008 19:52:11 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0IJqBCO054528 for ; Fri, 18 Jan 2008 19:52:11 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IJqBoB054522 for perforce@freebsd.org; Fri, 18 Jan 2008 19:52:11 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 18 Jan 2008 19:52:11 GMT Message-Id: <200801181952.m0IJqBoB054522@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 133582 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 19:52:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=133582 Change 133582 by hselasky@hselasky_laptop001 on 2008/01/18 19:51:15 One of my scripts had mistakenly converted "USBD_SHORT_XFER_OK" into "USBD_ERR_SHORT_XFER_OK". Fix this. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#22 edit .. //depot/projects/usb/src/sys/dev/usb/ugen.c#38 edit .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#41 edit .. //depot/projects/usb/src/sys/dev/usb/usb.h#32 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#107 edit .. //depot/projects/usb/src/sys/dev/usb/uvisor.c#35 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#22 (text+ko) ==== @@ -434,7 +434,7 @@ goto done; } err = usbd_do_request_flags(sc->sc_udev, &Giant, req, - data, USBD_ERR_SHORT_XFER_OK, &actlen, 1000); + data, USBD_SHORT_XFER_OK, &actlen, 1000); if (err) { DPRINTFN(-1, "device request failed, err=%s " ==== //depot/projects/usb/src/sys/dev/usb/ugen.c#38 (text+ko) ==== @@ -1901,7 +1901,7 @@ } error = usbd_do_request_flags (sc->sc_udev, NULL, &ur->ucr_request, data, - (ur->ucr_flags & USBD_ERR_SHORT_XFER_OK), &actlen, + (ur->ucr_flags & USBD_SHORT_XFER_OK), &actlen, USBD_DEFAULT_TIMEOUT); ur->ucr_actlen = actlen; ==== //depot/projects/usb/src/sys/dev/usb/ulpt.c#41 (text+ko) ==== @@ -591,7 +591,7 @@ USETW(req.wValue, cd->bConfigurationValue); USETW2(req.wIndex, id->bInterfaceNumber, id->bAlternateSetting); USETW(req.wLength, sizeof devinfo - 1); - error = usbd_do_request_flags(dev, &req, devinfo, USBD_ERR_SHORT_XFER_OK, + error = usbd_do_request_flags(dev, &req, devinfo, USBD_SHORT_XFER_OK, &alen, USBD_DEFAULT_TIMEOUT); if (error) { device_printf(sc->sc_dev, "cannot get device id\n"); ==== //depot/projects/usb/src/sys/dev/usb/usb.h#32 (text+ko) ==== @@ -577,7 +577,7 @@ void *ucr_data; int ucr_flags; #define USBD_USE_POLLING 0x0001 /* internal flag */ -#define USBD_ERR_SHORT_XFER_OK 0x0004 /* allow short reads */ +#define USBD_SHORT_XFER_OK 0x0004 /* allow short reads */ #define USBD_DELAY_STATUS_STAGE 0x0010 /* insert delay before STATUS stage */ int ucr_actlen; /* actual length transferred */ }; ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#107 (text+ko) ==== @@ -3608,7 +3608,7 @@ PRINTFN(0, ("USB device mode\n")); usbd_temp_get_desc(udev, req, &desc, &temp); if (length > temp) { - if (!(flags & USBD_ERR_SHORT_XFER_OK)) { + if (!(flags & USBD_SHORT_XFER_OK)) { return (USBD_ERR_SHORT_XFER); } length = temp; @@ -3734,7 +3734,7 @@ if (temp > xfer->actlen) { temp = xfer->actlen; - if (!(flags & USBD_ERR_SHORT_XFER_OK)) { + if (!(flags & USBD_SHORT_XFER_OK)) { err = USBD_ERR_SHORT_XFER; } length = temp; ==== //depot/projects/usb/src/sys/dev/usb/uvisor.c#35 (text+ko) ==== @@ -436,7 +436,7 @@ USETW(req.wIndex, 0); USETW(req.wLength, UVISOR_CONNECTION_INFO_SIZE); err = usbd_do_request_flags - (udev, &Giant, &req, &coninfo, USBD_ERR_SHORT_XFER_OK, + (udev, &Giant, &req, &coninfo, USBD_SHORT_XFER_OK, &actlen, USBD_DEFAULT_TIMEOUT); if (err) { @@ -489,7 +489,7 @@ USETW(req.wLength, UVISOR_GET_PALM_INFORMATION_LEN); err = usbd_do_request_flags - (udev, &Giant, &req, &pconinfo, USBD_ERR_SHORT_XFER_OK, + (udev, &Giant, &req, &pconinfo, USBD_SHORT_XFER_OK, &actlen, USBD_DEFAULT_TIMEOUT); if (err) { From owner-p4-projects@FreeBSD.ORG Fri Jan 18 19:57:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9156C16A420; Fri, 18 Jan 2008 19:57:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3EE6316A41B for ; Fri, 18 Jan 2008 19:57:17 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 204CE13C467 for ; Fri, 18 Jan 2008 19:57:17 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0IJvHjU055172 for ; Fri, 18 Jan 2008 19:57:17 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IJvGto055169 for perforce@freebsd.org; Fri, 18 Jan 2008 19:57:16 GMT (envelope-from csjp@freebsd.org) Date: Fri, 18 Jan 2008 19:57:16 GMT Message-Id: <200801181957.m0IJvGto055169@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 133584 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 19:57:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=133584 Change 133584 by csjp@csjp_xor on 2008/01/18 19:56:31 Whitespace fixup Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#35 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#35 (text+ko) ==== @@ -1213,7 +1213,8 @@ if (ARG_IS_VALID(kar, ARG_GROUPSET)) { for(ctr = 0; ctr < ar->ar_arg_groups.gidset_size; ctr++) { - tok = au_to_arg32(1, "setgroups", ar->ar_arg_groups.gidset[ctr]); + tok = au_to_arg32(1, "setgroups", + ar->ar_arg_groups.gidset[ctr]); kau_write(rec, tok); } } From owner-p4-projects@FreeBSD.ORG Fri Jan 18 20:43:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FC2316A474; Fri, 18 Jan 2008 20:43:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1CBA916A421 for ; Fri, 18 Jan 2008 20:43:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DCD0913C43E for ; Fri, 18 Jan 2008 20:43:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0IKh5DE064736 for ; Fri, 18 Jan 2008 20:43:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IKh59j064733 for perforce@freebsd.org; Fri, 18 Jan 2008 20:43:05 GMT (envelope-from jb@freebsd.org) Date: Fri, 18 Jan 2008 20:43:05 GMT Message-Id: <200801182043.m0IKh59j064733@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133590 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 20:43:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=133590 Change 133590 by jb@jb_freebsd1 on 2008/01/18 20:42:15 Add VFS_AIO. Is this what qemu wants? Affected files ... .. //depot/projects/dtrace/src/sys/amd64/conf/YABBA#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/amd64/conf/YABBA#3 (text+ko) ==== @@ -5,6 +5,8 @@ options KDTRACE_HOOKS +options VFS_AIO + # This panics my Dell 531S. Bad ohci, no biscuit. nodevice ohci From owner-p4-projects@FreeBSD.ORG Fri Jan 18 20:56:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0765F16A421; Fri, 18 Jan 2008 20:56:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C0A8B16A417 for ; Fri, 18 Jan 2008 20:56:47 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A4A4213C46A for ; Fri, 18 Jan 2008 20:56:47 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0IKulEf075605 for ; Fri, 18 Jan 2008 20:56:47 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IKulWt075602 for perforce@freebsd.org; Fri, 18 Jan 2008 20:56:47 GMT (envelope-from scottl@freebsd.org) Date: Fri, 18 Jan 2008 20:56:47 GMT Message-Id: <200801182056.m0IKulWt075602@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 133593 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 20:56:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=133593 Change 133593 by scottl@scottl-ix on 2008/01/18 20:55:47 Hook up xenbus to xenhub and have it handle front-end bus stuff. Affected files ... .. //depot/projects/xen31-xenbus/sys/xen/xenbus/xenbus_probe.c#4 edit Differences ... ==== //depot/projects/xen31-xenbus/sys/xen/xenbus/xenbus_probe.c#4 (text+ko) ==== @@ -980,13 +980,18 @@ static int xenhub_attach(device_t dev) { + struct xenbus_device *sc; int err = 0, dom0; DPRINTK(""); + sc = device_get_softc(dev); + LIST_INIT(&xenbus_device_frontend_list); LIST_INIT(&xenbus_device_backend_list); LIST_INIT(&xendrv_list); + LIST_INIT(&sc->children); + #if 0 if (xen_init() < 0) { DPRINTK("failed"); @@ -1047,33 +1052,35 @@ /* Initialize the interface to xenstore. */ err = xs_init(); if (err) { - log(LOG_WARNING, - "XENBUS: Error initializing xenstore comms: %i\n", err); + log(LOG_WARNING, + "XENBUS: Error initializing xenstore comms: %i\n", err); return err; } if (!dom0) { + device_t child; + xenstored_ready = 1; + + if (device_find_child(dev, "xenbus", 0) != NULL) + panic("xenhub: could not attach xen buses"); + + child = BUS_ADD_CHILD(dev, 0, "xenbus", -1); + if (child == NULL) + panic("xenhub: could not attach frontend bus"); + device_set_desc(child, "Xen 3.x FrontEnd Bus"); + device_set_ivars(child, &xenbus_frontend); + #if 0 - xenbus_dev = BUS_ADD_CHILD(parent, 0, "xenbus", 0); - if (xenbus_dev == NULL) - panic("xenbus: could not attach"); - xenbus_backend_dev = BUS_ADD_CHILD(parent, 0, "xb_be", 0); - if (xenbus_backend_dev == NULL) - panic("xenbus: could not attach"); + child = BUS_ADD_CHILD(dev, 0, "xenbus", -1); + if (child== NULL) + panic("xenhub: could not attach backend bus"); + device_set_desc(child, "Xen 3.x BackEnd Bus"); + device_set_ivars(child, &xenbus_backend); #endif - BUG_ON((xenstored_ready <= 0)); - - - /* Enumerate devices in xenstore. */ - xenbus_probe_devices(&xenbus_frontend); - register_xenbus_watch(&fe_watch); - xenbus_backend_probe_and_watch(); + bus_generic_attach(dev); - - /* Notify others that xenstore is up */ - EVENTHANDLER_INVOKE(xenstore_event); } return 0; @@ -1093,13 +1100,6 @@ return (0); } -static int -xenhub_add_child(device_t parent, device_t child) -{ - - return (0); -} - static device_method_t xenhub_methods[] = { /* Device interface */ DEVMETHOD(device_identify, xenhub_identify), @@ -1113,7 +1113,7 @@ /* Bus interface */ DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_add_child, xenhub_add_child), + DEVMETHOD(bus_add_child, bus_generic_add_child), DEVMETHOD(bus_read_ivar, bus_generic_read_ivar), DEVMETHOD(bus_write_ivar, bus_generic_write_ivar), #if 0 @@ -1166,6 +1166,11 @@ /* Enumerate device in xenstore */ xenbus_probe_devices(sc->xenbus); + register_xenbus_watch(&fe_watch); + xenbus_backend_probe_and_watch(); + + /* Notify others that xenstore is up */ + EVENTHANDLER_INVOKE(xenstore_event); return (0); } From owner-p4-projects@FreeBSD.ORG Fri Jan 18 21:10:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D294916A421; Fri, 18 Jan 2008 21:10:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 97B4116A41B for ; Fri, 18 Jan 2008 21:10:01 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7CC9413C4F3 for ; Fri, 18 Jan 2008 21:10:01 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0ILA1Z3078461 for ; Fri, 18 Jan 2008 21:10:01 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ILA13X078457 for perforce@freebsd.org; Fri, 18 Jan 2008 21:10:01 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 18 Jan 2008 21:10:01 GMT Message-Id: <200801182110.m0ILA13X078457@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133594 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 21:10:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=133594 Change 133594 by kmacy@pandemonium:kmacy:xen31 on 2008/01/18 21:09:58 don't call ttwakeup from a critical section Affected files ... .. //depot/projects/xen31/sys/dev/xen/console/console.c#8 edit Differences ... ==== //depot/projects/xen31/sys/dev/xen/console/console.c#8 (text+ko) ==== @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -318,8 +319,12 @@ work_done = 1; } CN_UNLOCK(cn_mtx); - - if (work_done && xen_console_up) + + /* + * ttwakeup calls routines using blocking locks + * + */ + if (work_done && xen_console_up && curthread->td_critnest == 0) ttwakeup(xccons); } From owner-p4-projects@FreeBSD.ORG Fri Jan 18 21:14:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AB7816A469; Fri, 18 Jan 2008 21:14:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3FBA116A421 for ; Fri, 18 Jan 2008 21:14:06 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 194F413C4D9 for ; Fri, 18 Jan 2008 21:14:06 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0ILE5Jv079796 for ; Fri, 18 Jan 2008 21:14:05 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ILE5N8079792 for perforce@freebsd.org; Fri, 18 Jan 2008 21:14:05 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 18 Jan 2008 21:14:05 GMT Message-Id: <200801182114.m0ILE5N8079792@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133595 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 21:14:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=133595 Change 133595 by kmacy@pandemonium:kmacy:xen31 on 2008/01/18 21:13:58 Set the modified bit when mapping page tables - not doing so was causing us to lose the OS resrved bits which in turn confused process page accounting. Not quite diagnosed by alc, but prompted by him pressing me for why I wasn't setting the modified bit when mapping page table pages. He has my gratitude for pushing me on the issue. Affected files ... .. //depot/projects/xen31/sys/i386/xen/pmap.c#23 edit Differences ... ==== //depot/projects/xen31/sys/i386/xen/pmap.c#23 (text+ko) ==== @@ -332,13 +332,13 @@ switch (type) { case SH_PD_SET_VA: xen_queue_pt_update(shadow_pdir_ma, - xpmap_ptom(val & ~(PG_RW|PG_M))); + xpmap_ptom(val & ~(PG_RW))); xen_queue_pt_update(pdir_ma, xpmap_ptom(val)); break; case SH_PD_SET_VA_MA: xen_queue_pt_update(shadow_pdir_ma, - val & ~(PG_RW|PG_M)); + val & ~(PG_RW)); xen_queue_pt_update(pdir_ma, val); break; case SH_PD_SET_VA_CLEAR: @@ -948,7 +948,7 @@ mtx_lock(&PMAP2mutex); newpf = *pde & PG_FRAME; if ((*PMAP2 & PG_FRAME) != newpf) { - *PMAP2 = newpf | PG_V | PG_A; + *PMAP2 = newpf | PG_V | PG_A | PG_M; pmap_invalidate_page(kernel_pmap, (vm_offset_t)PADDR2); } return (PADDR2 + (i386_btop(va) & (NPTEPG - 1))); @@ -1005,7 +1005,7 @@ KASSERT(curthread->td_pinned > 0, ("curthread not pinned")); newpf = *pde & PG_FRAME; if ((*PMAP1 & PG_FRAME) != newpf) { - *PMAP1 = newpf | PG_V | PG_A; + *PMAP1 = newpf | PG_V | PG_A | PG_M; #ifdef SMP PMAP1cpu = PCPU_GET(cpuid); #endif @@ -1457,7 +1457,7 @@ pmap->pm_pdir[PTDPTDI + i] = xpmap_ptom(VM_PAGE_TO_PHYS(ptdpg[i + NPGPTD])) | PG_V; for (i = KPTDI; i < KPTDI + nkpt; i++) - pmap->pm_pdir_shadow[i] = PTD[i] & ~(PG_RW|PG_M|PG_A); + pmap->pm_pdir_shadow[i] = PTD[i] & ~(PG_RW); for (i = 0; i < NPGPTD; i++) { pt_entry_t *pd; @@ -2161,8 +2161,16 @@ * why, but I think the most likely explanation is that xen's writable * page table implementation doesn't respect the unused bits. */ - if ((oldpte & PG_MANAGED) || ((oldpte & PG_V) && (va < VM_MAXUSER_ADDRESS))) { + if ((oldpte & PG_MANAGED) +#ifdef PTEBROKEN + || ((oldpte & PG_V) && (va < VM_MAXUSER_ADDRESS)) +#endif + ) { m = PHYS_TO_VM_PAGE(xpmap_mtop(oldpte) & PG_FRAME); + + if (!(oldpte & PG_MANAGED)) + printf("va=0x%x is unmanaged :-( pte=0x%llx\n", va, oldpte); + if (oldpte & PG_M) { KASSERT((oldpte & PG_RW), ("pmap_remove_pte: modified page not writable: va: %#x, pte: %#jx", @@ -2172,11 +2180,9 @@ if (oldpte & PG_A) vm_page_flag_set(m, PG_REFERENCED); pmap_remove_entry(pmap, m, va); - } -#ifdef DEBUG - else if (va < VM_MAXUSER_ADDRESS) - printf("va=0x%x is unmanaged :-( \n", va); -#endif + } else if ((va < VM_MAXUSER_ADDRESS) && (oldpte & PG_V)) + printf("va=0x%x is unmanaged :-( pte=0x%llx\n", va, oldpte); + return (pmap_unuse_pt(pmap, va, free)); } @@ -2932,7 +2938,7 @@ npdes = size >> PDRSHIFT; for(i = 0; i < npdes; i++) { PD_SET_VA(pmap, ptepindex, - ptepa | PG_U | PG_RW | PG_V | PG_PS, FALSE); + ptepa | PG_U | PG_M | PG_RW | PG_V | PG_PS, FALSE); ptepa += NBPDR; ptepindex += 1; } From owner-p4-projects@FreeBSD.ORG Fri Jan 18 21:30:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D022516A468; Fri, 18 Jan 2008 21:30:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 960F516A419 for ; Fri, 18 Jan 2008 21:30:22 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7C4F113C45D for ; Fri, 18 Jan 2008 21:30:22 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0ILUMQ6081968 for ; Fri, 18 Jan 2008 21:30:22 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ILUMDb081965 for perforce@freebsd.org; Fri, 18 Jan 2008 21:30:22 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 18 Jan 2008 21:30:22 GMT Message-Id: <200801182130.m0ILUMDb081965@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133596 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 21:30:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=133596 Change 133596 by kmacy@pandemonium:kmacy:xen31 on 2008/01/18 21:30:00 don't acquire the console lock if we're in the middle of a panic Affected files ... .. //depot/projects/xen31/sys/dev/xen/console/console.c#9 edit Differences ... ==== //depot/projects/xen31/sys/dev/xen/console/console.c#9 (text+ko) ==== @@ -79,8 +79,16 @@ #define CN_LOCK_INIT(x, _name) \ mtx_init(&x, _name, NULL, MTX_SPIN|MTX_RECURSE) -#define CN_LOCK(l) mtx_lock_spin(&(l)) -#define CN_UNLOCK(l) mtx_unlock_spin(&(l)) +#define CN_LOCK(l) \ + do { \ + if (panicstr == NULL) \ + mtx_lock_spin(&(l)); \ + } while (0) +#define CN_UNLOCK(l) \ + do { \ + if (panicstr == NULL) \ + mtx_unlock_spin(&(l)); \ + } while (0) #define CN_LOCK_ASSERT(x) mtx_assert(&x, MA_OWNED) #define CN_LOCK_DESTROY(x) mtx_destroy(&x) From owner-p4-projects@FreeBSD.ORG Fri Jan 18 21:34:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DA3E16A421; Fri, 18 Jan 2008 21:34:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2331616A41B for ; Fri, 18 Jan 2008 21:34:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0874013C448 for ; Fri, 18 Jan 2008 21:34:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0ILYSpo083261 for ; Fri, 18 Jan 2008 21:34:28 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ILYSvY083258 for perforce@freebsd.org; Fri, 18 Jan 2008 21:34:28 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 18 Jan 2008 21:34:28 GMT Message-Id: <200801182134.m0ILYSvY083258@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 133598 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 21:34:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=133598 Change 133598 by hselasky@hselasky_laptop001 on 2008/01/18 21:33:26 Bugfix: When searching for an alternate setting in CDC ethernet, start at the interface descriptor and not at the beginning of the config descriptor. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#49 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#49 (text+ko) ==== @@ -285,7 +285,6 @@ const usb_cdc_union_descriptor_t *ud; const usb_cdc_ethernet_descriptor_t *ue; const usb_interface_descriptor_t *id; - usb_descriptor_t *desc = NULL; const struct cdce_type *t; struct ifnet *ifp; int error; @@ -308,11 +307,15 @@ /* search for alternate settings */ if (uaa->usb_mode == USB_MODE_HOST) { - id = uaa->iface->idesc; + usb_descriptor_t *desc; + usb_config_descriptor_t *cd; + + cd = usbd_get_config_descriptor(uaa->device); + desc = (void *)(uaa->iface->idesc); + id = (void *)desc; i = id->bInterfaceNumber; alt_index = 0; - while ((desc = usbd_desc_foreach( - usbd_get_config_descriptor(uaa->device), desc))) { + while ((desc = usbd_desc_foreach(cd, desc))) { id = (void *)desc; if ((id->bDescriptorType == UDESC_INTERFACE) && (id->bLength >= sizeof(*id))) { From owner-p4-projects@FreeBSD.ORG Fri Jan 18 21:37:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1B8A16A477; Fri, 18 Jan 2008 21:37:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 85D2816A46E for ; Fri, 18 Jan 2008 21:37:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 69E0413C4EB for ; Fri, 18 Jan 2008 21:37:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0ILbWex083385 for ; Fri, 18 Jan 2008 21:37:32 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ILbW23083382 for perforce@freebsd.org; Fri, 18 Jan 2008 21:37:32 GMT (envelope-from jb@freebsd.org) Date: Fri, 18 Jan 2008 21:37:32 GMT Message-Id: <200801182137.m0ILbW23083382@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133599 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 21:37:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=133599 Change 133599 by jb@jb_freebsd1 on 2008/01/18 21:37:13 I think I'd prefer to have this stuff in a different tree. It's getting in the way of preparing diffs-for-review. Affected files ... .. //depot/projects/dtrace/src/newrelease/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/Makefile.distrib#2 delete .. //depot/projects/dtrace/src/newrelease/Makefile.inc1#2 delete .. //depot/projects/dtrace/src/newrelease/Makefile.subr#2 delete .. //depot/projects/dtrace/src/newrelease/amd64/boot_crunch.conf#2 delete .. //depot/projects/dtrace/src/newrelease/amd64/mkisoimages.sh#2 delete .. //depot/projects/dtrace/src/newrelease/bootonly/Makefile.inc1#2 delete .. //depot/projects/dtrace/src/newrelease/disc1/Makefile.inc1#2 delete .. //depot/projects/dtrace/src/newrelease/disc2/Makefile.inc1#2 delete .. //depot/projects/dtrace/src/newrelease/doc/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/Makefile.inc1#2 delete .. //depot/projects/dtrace/src/newrelease/doc/README#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/early-adopter/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/early-adopter/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/errata/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/errata/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/Makefile.inc#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/alpha/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/alpha/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/common/artheader.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/common/hw.ent#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/common/intro.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/i386/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/i386/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/ia64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/pc98/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/pc98/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/sparc64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/sparc64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/Makefile.inc#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/alpha/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/alpha/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/common/abstract.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/common/artheader.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/common/install.ent#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/common/install.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/common/layout.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/common/trouble.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/i386/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/i386/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/ia64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/ia64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/pc98/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/pc98/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/sparc64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/sparc64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/readme/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/readme/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/Makefile.inc#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/alpha/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/alpha/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/common/relnotes.ent#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/i386/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/i386/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/pc98/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/pc98/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/sparc64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/sparc64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/share/sgml/catalog#2 delete .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/share/sgml/release.dsl#2 delete .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/errata/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/errata/article.html-text#2 delete .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/errata/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/errata/article.txt#2 delete .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/hardware/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/hardware/article.html-text#2 delete .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/hardware/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/hardware/article.txt#2 delete .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/readme/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/readme/article.html-text#2 delete .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/readme/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/readme/article.txt#2 delete .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/relnotes/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/relnotes/article.html-text#2 delete .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/relnotes/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/relnotes/article.txt#2 delete .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/share/sgml/catalog#2 delete .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/share/sgml/release.dsl#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/early-adopter/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/early-adopter/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/errata/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/errata/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/Makefile.inc#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/alpha/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/alpha/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/common/artheader.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/common/hw.ent#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/common/intro.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/i386/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/i386/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/ia64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/pc98/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/pc98/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/sparc64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/sparc64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/Makefile.inc#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/alpha/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/alpha/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/common/abstract.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/common/artheader.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/common/install.ent#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/common/install.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/common/layout.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/common/trouble.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/common/upgrade.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/i386/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/i386/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/pc98/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/pc98/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/sparc64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/sparc64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/sparc64/install.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/relnotes/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/relnotes/Makefile.inc#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/relnotes/alpha/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/relnotes/alpha/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/relnotes/common/relnotes.ent#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/relnotes/i386/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/relnotes/i386/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/share/sgml/catalog#2 delete .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/share/sgml/release.dsl#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/errata/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/errata/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/Makefile.inc#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/alpha/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/alpha/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/amd64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/amd64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/common/artheader.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/common/dev.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/common/hw.ent#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/common/intro.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/i386/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/i386/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/ia64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/ia64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/pc98/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/pc98/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/sparc64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/sparc64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/Makefile.inc#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/alpha/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/alpha/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/amd64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/amd64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/common/new.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/common/relnotes.ent#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/i386/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/i386/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/ia64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/ia64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/pc98/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/pc98/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/sparc64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/share/sgml/catalog#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/share/sgml/release.dsl#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/errata/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/errata/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/Makefile.inc#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/alpha/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/amd64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/common/hw.ent#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/common/intro.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/i386/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/i386/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/ia64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/pc98/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/Makefile.inc#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/alpha/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/alpha/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/amd64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/amd64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/common/abstract.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/common/artheader.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/common/install.ent#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/common/install.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/common/layout.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/common/trouble.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/i386/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/i386/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/ia64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/ia64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/pc98/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/pc98/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/sparc64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/readme/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/readme/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/Makefile.inc#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/alpha/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/amd64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/common/relnotes.ent#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/i386/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/ia64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/pc98/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/sparc64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/share/sgml/catalog#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/share/sgml/release.dsl#2 delete .. //depot/projects/dtrace/src/newrelease/doc/share/examples/Makefile.relnotesng#2 delete .. //depot/projects/dtrace/src/newrelease/doc/share/misc/dev.archlist.txt#2 delete .. //depot/projects/dtrace/src/newrelease/doc/share/misc/man2hwnotes.pl#2 delete .. //depot/projects/dtrace/src/newrelease/doc/share/mk/doc.relnotes.mk#2 delete .. //depot/projects/dtrace/src/newrelease/doc/share/sgml/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/share/sgml/catalog#2 delete .. //depot/projects/dtrace/src/newrelease/doc/share/sgml/default.dsl#2 delete .. //depot/projects/dtrace/src/newrelease/doc/share/sgml/release.dsl#2 delete .. //depot/projects/dtrace/src/newrelease/doc/share/sgml/release.ent#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/errata/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/errata/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/Makefile.inc#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/amd64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/amd64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/common/artheader.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/common/hw.ent#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/common/intro.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/i386/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/i386/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/Makefile.inc#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/amd64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/amd64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/common/abstract.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/common/artheader.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/common/install.ent#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/common/install.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/common/layout.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/common/trouble.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/common/upgrade.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/i386/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/i386/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/ia64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/ia64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/pc98/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/pc98/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/sparc64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/sparc64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/sparc64/install.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/readme/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/readme/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/Makefile.inc#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/amd64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/common/new.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/common/relnotes.ent#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/i386/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/i386/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/ia64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/ia64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/pc98/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/pc98/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/share/sgml/catalog#2 delete .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/share/sgml/release.dsl#2 delete .. //depot/projects/dtrace/src/newrelease/fixitfd/Makefile.inc1#2 delete .. //depot/projects/dtrace/src/newrelease/floppies/Makefile.inc1#2 delete .. //depot/projects/dtrace/src/newrelease/ftp/Makefile.inc1#2 delete .. //depot/projects/dtrace/src/newrelease/i386/boot_crunch.conf#2 delete .. //depot/projects/dtrace/src/newrelease/i386/fixit-small_crunch.conf#2 delete .. //depot/projects/dtrace/src/newrelease/i386/fixit_crunch.conf#2 delete .. //depot/projects/dtrace/src/newrelease/i386/mkisoimages.sh#2 delete .. //depot/projects/dtrace/src/newrelease/latest/Makefile#2 delete .. //depot/projects/dtrace/src/newrelease/latest/latest.c#2 delete .. //depot/projects/dtrace/src/newrelease/live/Makefile.inc1#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jan 18 21:45:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0775916A41A; Fri, 18 Jan 2008 21:45:43 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A7B1416A417 for ; Fri, 18 Jan 2008 21:45:42 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8E0FE13C44B for ; Fri, 18 Jan 2008 21:45:42 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0ILjgYh089426 for ; Fri, 18 Jan 2008 21:45:42 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ILjg57089423 for perforce@freebsd.org; Fri, 18 Jan 2008 21:45:42 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 18 Jan 2008 21:45:42 GMT Message-Id: <200801182145.m0ILjg57089423@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 133600 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 21:45:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=133600 Change 133600 by hselasky@hselasky_laptop001 on 2008/01/18 21:44:55 Bugfix. Need to have "usb_mtx" locked when calling "usbd_transfer_unsetup_sub()". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#108 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#108 (text+ko) ==== @@ -1018,6 +1018,12 @@ done: if (buf) { if (info->setup_refcount == 0) { + /* + * "usbd_transfer_unsetup_sub" will unlock + * "usb_mtx" before returning ! + */ + mtx_lock(info->usb_mtx); + /* something went wrong */ usbd_transfer_unsetup_sub(info, 0); } @@ -1058,6 +1064,8 @@ struct usbd_page_cache *pc; uint32_t temp; + mtx_assert(info->usb_mtx, MA_OWNED); + /* wait for any outstanding DMA operations */ if (needs_delay) { From owner-p4-projects@FreeBSD.ORG Fri Jan 18 21:52:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C00A816A419; Fri, 18 Jan 2008 21:52:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6D1EF16A417 for ; Fri, 18 Jan 2008 21:52:50 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5300513C45A for ; Fri, 18 Jan 2008 21:52:50 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0ILqoZN090830 for ; Fri, 18 Jan 2008 21:52:50 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ILqoDZ090822 for perforce@freebsd.org; Fri, 18 Jan 2008 21:52:50 GMT (envelope-from scottl@freebsd.org) Date: Fri, 18 Jan 2008 21:52:50 GMT Message-Id: <200801182152.m0ILqoDZ090822@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 133602 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 21:52:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=133602 Change 133602 by scottl@scottl-ix on 2008/01/18 21:52:25 Merge more console and pmap fixes from xen31 Affected files ... .. //depot/projects/xen31-xenbus/sys/dev/xen/console/console.c#3 integrate .. //depot/projects/xen31-xenbus/sys/i386/xen/pmap.c#3 integrate Differences ... ==== //depot/projects/xen31-xenbus/sys/dev/xen/console/console.c#3 (text+ko) ==== @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -78,8 +79,16 @@ #define CN_LOCK_INIT(x, _name) \ mtx_init(&x, _name, NULL, MTX_SPIN|MTX_RECURSE) -#define CN_LOCK(l) mtx_lock_spin(&(l)) -#define CN_UNLOCK(l) mtx_unlock_spin(&(l)) +#define CN_LOCK(l) \ + do { \ + if (panicstr == NULL) \ + mtx_lock_spin(&(l)); \ + } while (0) +#define CN_UNLOCK(l) \ + do { \ + if (panicstr == NULL) \ + mtx_unlock_spin(&(l)); \ + } while (0) #define CN_LOCK_ASSERT(x) mtx_assert(&x, MA_OWNED) #define CN_LOCK_DESTROY(x) mtx_destroy(&x) @@ -318,8 +327,12 @@ work_done = 1; } CN_UNLOCK(cn_mtx); - - if (work_done && xen_console_up) + + /* + * ttwakeup calls routines using blocking locks + * + */ + if (work_done && xen_console_up && curthread->td_critnest == 0) ttwakeup(xccons); } ==== //depot/projects/xen31-xenbus/sys/i386/xen/pmap.c#3 (text+ko) ==== @@ -332,13 +332,13 @@ switch (type) { case SH_PD_SET_VA: xen_queue_pt_update(shadow_pdir_ma, - xpmap_ptom(val & ~(PG_RW|PG_M))); + xpmap_ptom(val & ~(PG_RW))); xen_queue_pt_update(pdir_ma, xpmap_ptom(val)); break; case SH_PD_SET_VA_MA: xen_queue_pt_update(shadow_pdir_ma, - val & ~(PG_RW|PG_M)); + val & ~(PG_RW)); xen_queue_pt_update(pdir_ma, val); break; case SH_PD_SET_VA_CLEAR: @@ -948,7 +948,7 @@ mtx_lock(&PMAP2mutex); newpf = *pde & PG_FRAME; if ((*PMAP2 & PG_FRAME) != newpf) { - *PMAP2 = newpf | PG_V | PG_A; + *PMAP2 = newpf | PG_V | PG_A | PG_M; pmap_invalidate_page(kernel_pmap, (vm_offset_t)PADDR2); } return (PADDR2 + (i386_btop(va) & (NPTEPG - 1))); @@ -1005,7 +1005,7 @@ KASSERT(curthread->td_pinned > 0, ("curthread not pinned")); newpf = *pde & PG_FRAME; if ((*PMAP1 & PG_FRAME) != newpf) { - *PMAP1 = newpf | PG_V | PG_A; + *PMAP1 = newpf | PG_V | PG_A | PG_M; #ifdef SMP PMAP1cpu = PCPU_GET(cpuid); #endif @@ -1457,7 +1457,7 @@ pmap->pm_pdir[PTDPTDI + i] = xpmap_ptom(VM_PAGE_TO_PHYS(ptdpg[i + NPGPTD])) | PG_V; for (i = KPTDI; i < KPTDI + nkpt; i++) - pmap->pm_pdir_shadow[i] = PTD[i] & ~(PG_RW|PG_M|PG_A); + pmap->pm_pdir_shadow[i] = PTD[i] & ~(PG_RW); for (i = 0; i < NPGPTD; i++) { pt_entry_t *pd; @@ -2161,8 +2161,16 @@ * why, but I think the most likely explanation is that xen's writable * page table implementation doesn't respect the unused bits. */ - if ((oldpte & PG_MANAGED) || ((oldpte & PG_V) && (va < VM_MAXUSER_ADDRESS))) { + if ((oldpte & PG_MANAGED) +#ifdef PTEBROKEN + || ((oldpte & PG_V) && (va < VM_MAXUSER_ADDRESS)) +#endif + ) { m = PHYS_TO_VM_PAGE(xpmap_mtop(oldpte) & PG_FRAME); + + if (!(oldpte & PG_MANAGED)) + printf("va=0x%x is unmanaged :-( pte=0x%llx\n", va, oldpte); + if (oldpte & PG_M) { KASSERT((oldpte & PG_RW), ("pmap_remove_pte: modified page not writable: va: %#x, pte: %#jx", @@ -2172,11 +2180,9 @@ if (oldpte & PG_A) vm_page_flag_set(m, PG_REFERENCED); pmap_remove_entry(pmap, m, va); - } -#ifdef DEBUG - else if (va < VM_MAXUSER_ADDRESS) - printf("va=0x%x is unmanaged :-( \n", va); -#endif + } else if ((va < VM_MAXUSER_ADDRESS) && (oldpte & PG_V)) + printf("va=0x%x is unmanaged :-( pte=0x%llx\n", va, oldpte); + return (pmap_unuse_pt(pmap, va, free)); } @@ -2932,7 +2938,7 @@ npdes = size >> PDRSHIFT; for(i = 0; i < npdes; i++) { PD_SET_VA(pmap, ptepindex, - ptepa | PG_U | PG_RW | PG_V | PG_PS, FALSE); + ptepa | PG_U | PG_M | PG_RW | PG_V | PG_PS, FALSE); ptepa += NBPDR; ptepindex += 1; } From owner-p4-projects@FreeBSD.ORG Fri Jan 18 23:05:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 462EF16A46B; Fri, 18 Jan 2008 23:05:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0B68C16A468 for ; Fri, 18 Jan 2008 23:05:12 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E747713C461 for ; Fri, 18 Jan 2008 23:05:11 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0IN5BCL004601 for ; Fri, 18 Jan 2008 23:05:11 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IN5BX9004598 for perforce@freebsd.org; Fri, 18 Jan 2008 23:05:11 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 18 Jan 2008 23:05:11 GMT Message-Id: <200801182305.m0IN5BX9004598@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133613 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 23:05:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=133613 Change 133613 by kmacy@pandemonium:kmacy:xen31 on 2008/01/18 23:04:32 implement pmap_growkernel Affected files ... .. //depot/projects/xen31/sys/i386/xen/pmap.c#24 edit Differences ... ==== //depot/projects/xen31/sys/i386/xen/pmap.c#24 (text+ko) ==== @@ -1767,7 +1767,6 @@ vm_paddr_t ptppaddr; vm_page_t nkpg; pd_entry_t newpdir; - pt_entry_t *pde; mtx_assert(&kernel_map->system_mtx, MA_OWNED); if (kernel_vm_end == 0) { @@ -1808,19 +1807,12 @@ pmap_zero_page(nkpg); ptppaddr = VM_PAGE_TO_PHYS(nkpg); newpdir = (pd_entry_t) (ptppaddr | PG_V | PG_RW | PG_A | PG_M); -#ifdef notyet - PD_SET_VA(kernel_pmap, &pdir_pde(kernel_pmap->pm_pdir, kernel_vm_end), newpdir, TRUE); -#else - panic("implement me"); -#endif + PD_SET_VA(kernel_pmap, (kernel_vm_end >> PDRSHIFT), newpdir, TRUE); mtx_lock_spin(&allpmaps_lock); - LIST_FOREACH(pmap, &allpmaps, pm_list) { - pde = pmap_pde(pmap, kernel_vm_end); -#ifdef notyet - PD_SET_VA(pmap, pde, newpdir, FALSE); -#endif - } + LIST_FOREACH(pmap, &allpmaps, pm_list) + PD_SET_VA(pmap, (kernel_vm_end >> PDRSHIFT), newpdir, FALSE); + PT_UPDATES_FLUSH(); mtx_unlock_spin(&allpmaps_lock); kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1); From owner-p4-projects@FreeBSD.ORG Sat Jan 19 00:19:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82BB216A41B; Sat, 19 Jan 2008 00:19:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 47D0C16A418 for ; Sat, 19 Jan 2008 00:19:32 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1883613C455 for ; Sat, 19 Jan 2008 00:19:32 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0J0JWsu018573 for ; Sat, 19 Jan 2008 00:19:32 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0J0JVnB018570 for perforce@freebsd.org; Sat, 19 Jan 2008 00:19:31 GMT (envelope-from imp@freebsd.org) Date: Sat, 19 Jan 2008 00:19:31 GMT Message-Id: <200801190019.m0J0JVnB018570@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133620 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 00:19:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=133620 Change 133620 by imp@imp_paco-paco on 2008/01/19 00:19:26 kerberos doesn't work, so kill it. Affected files ... .. //depot/projects/mips2/src/Makefile.inc1#12 edit Differences ... ==== //depot/projects/mips2/src/Makefile.inc1#12 (text+ko) ==== @@ -1267,7 +1267,7 @@ .if defined(XDEV) && defined(XDEV_ARCH) NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \ - -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE + -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE -DWITHOUT_KERBEROS XDDIR=${XDEV}-freebsd XDTP=/usr/${XDDIR} From owner-p4-projects@FreeBSD.ORG Sat Jan 19 02:12:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 184D916A469; Sat, 19 Jan 2008 02:12:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D22A016A418 for ; Sat, 19 Jan 2008 02:12:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B8C6E13C442 for ; Sat, 19 Jan 2008 02:12:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0J2Calx052185 for ; Sat, 19 Jan 2008 02:12:36 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0J2Ca1v052182 for perforce@freebsd.org; Sat, 19 Jan 2008 02:12:36 GMT (envelope-from jb@freebsd.org) Date: Sat, 19 Jan 2008 02:12:36 GMT Message-Id: <200801190212.m0J2Ca1v052182@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133629 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 02:12:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=133629 Change 133629 by jb@jb_freebsd1 on 2008/01/19 02:11:48 Remove Solaris makefiles that we don't use. Affected files ... .. //depot/doc/obliterate#13 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/Makefile#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/Makefile#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/Makefile#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/32/Makefile#4 delete Differences ... ==== //depot/doc/obliterate#13 (text+ko) ==== @@ -23,3 +23,5 @@ # clients: gnagelhout silby_patrocles # dead machines: njl_mrspecial mharvan_twoflower +jb_zoo +jb_test From owner-p4-projects@FreeBSD.ORG Sat Jan 19 02:13:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B80F216A420; Sat, 19 Jan 2008 02:13:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A79B16A417 for ; Sat, 19 Jan 2008 02:13:38 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 29D0013C448 for ; Sat, 19 Jan 2008 02:13:38 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0J2Dcsq052955 for ; Sat, 19 Jan 2008 02:13:38 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0J2Dc6C052952 for perforce@freebsd.org; Sat, 19 Jan 2008 02:13:38 GMT (envelope-from jb@freebsd.org) Date: Sat, 19 Jan 2008 02:13:38 GMT Message-Id: <200801190213.m0J2Dc6C052952@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133630 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 02:13:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=133630 Change 133630 by jb@jb_freebsd1 on 2008/01/19 02:13:21 Remove an oops. I had already cleaned up the old clients, but left this file open for edit when I did other stuff. Sorry. Affected files ... .. //depot/doc/obliterate#14 edit Differences ... ==== //depot/doc/obliterate#14 (text+ko) ==== @@ -23,5 +23,3 @@ # clients: gnagelhout silby_patrocles # dead machines: njl_mrspecial mharvan_twoflower -jb_zoo -jb_test From owner-p4-projects@FreeBSD.ORG Sat Jan 19 02:14:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABED816A41B; Sat, 19 Jan 2008 02:14:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7146F16A419 for ; Sat, 19 Jan 2008 02:14:39 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 56DFD13C4CE for ; Sat, 19 Jan 2008 02:14:39 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0J2Ed0v053126 for ; Sat, 19 Jan 2008 02:14:39 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0J2Ed4L053123 for perforce@freebsd.org; Sat, 19 Jan 2008 02:14:39 GMT (envelope-from jb@freebsd.org) Date: Sat, 19 Jan 2008 02:14:39 GMT Message-Id: <200801190214.m0J2Ed4L053123@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133631 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 02:14:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=133631 Change 133631 by jb@jb_freebsd1 on 2008/01/19 02:14:32 Remove more Solaris makefile which we don't use. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/64/Makefile#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile.com#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Makefile#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/Makefile#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jan 19 02:17:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A06C16A469; Sat, 19 Jan 2008 02:17:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EBC1016A417 for ; Sat, 19 Jan 2008 02:17:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BAEA813C442 for ; Sat, 19 Jan 2008 02:17:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0J2Hgac053277 for ; Sat, 19 Jan 2008 02:17:42 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0J2HgfX053274 for perforce@freebsd.org; Sat, 19 Jan 2008 02:17:42 GMT (envelope-from jb@freebsd.org) Date: Sat, 19 Jan 2008 02:17:42 GMT Message-Id: <200801190217.m0J2HgfX053274@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133632 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 02:17:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=133632 Change 133632 by jb@jb_freebsd1 on 2008/01/19 02:16:52 Remove files (for now) that I'm not back to porting yet. They are getting in the way of preparing review diffs. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/sparc64/dtrace_asm.S#2 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/sparc64/dtrace_isa.c#2 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/sparc64/dtrace_subr.c#2 delete .. //depot/projects/dtrace/src/sys/cddl/sparc64/cyclic_machdep.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jan 19 02:19:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F30C916A418; Sat, 19 Jan 2008 02:19:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B86FD16A420 for ; Sat, 19 Jan 2008 02:19:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A002913C447 for ; Sat, 19 Jan 2008 02:19:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0J2JlxU053336 for ; Sat, 19 Jan 2008 02:19:47 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0J2Jls5053333 for perforce@freebsd.org; Sat, 19 Jan 2008 02:19:47 GMT (envelope-from jb@freebsd.org) Date: Sat, 19 Jan 2008 02:19:47 GMT Message-Id: <200801190219.m0J2Jls5053333@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133633 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 02:19:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=133633 Change 133633 by jb@jb_freebsd1 on 2008/01/19 02:19:26 Remove stuff that is either obsolete or doesn't belong here. Affected files ... .. //depot/projects/dtrace/src/sys/sparc64/dtrace/dtrace_asm.s#2 delete .. //depot/projects/dtrace/src/sys/sparc64/dtrace/dtrace_isa.c#2 delete .. //depot/projects/dtrace/src/sys/sparc64/dtrace/dtrace_stub.c#2 delete .. //depot/projects/dtrace/src/sys/sparc64/dtrace/fasttrap.conf#2 delete .. //depot/projects/dtrace/src/sys/sparc64/dtrace/fasttrap_isa.c#2 delete .. //depot/projects/dtrace/src/sys/sparc64/dtrace/fbt.c#2 delete .. //depot/projects/dtrace/src/sys/sparc64/dtrace/fbt.conf#2 delete .. //depot/projects/dtrace/src/sys/sparc64/dtrace/sdt.c#2 delete .. //depot/projects/dtrace/src/sys/sparc64/dtrace/sdt.conf#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jan 19 02:23:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42F0416A41A; Sat, 19 Jan 2008 02:23:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 086E116A418 for ; Sat, 19 Jan 2008 02:23:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E278113C469 for ; Sat, 19 Jan 2008 02:23:51 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0J2NpxA054643 for ; Sat, 19 Jan 2008 02:23:51 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0J2NpUa054640 for perforce@freebsd.org; Sat, 19 Jan 2008 02:23:51 GMT (envelope-from jb@freebsd.org) Date: Sat, 19 Jan 2008 02:23:51 GMT Message-Id: <200801190223.m0J2NpUa054640@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133634 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 02:23:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=133634 Change 133634 by jb@jb_freebsd1 on 2008/01/19 02:23:20 Files with "CVS" in the name get ignored by the p4 importer, so they have to be done manually. Sigh. Affected files ... .. //depot/projects/dtrace/src/contrib/cvs/DEVEL-CVS#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/cvs/DEVEL-CVS#2 (text+ko) ==== @@ -4,37 +4,6 @@ development group operates. Also see the HACKING file. ---------------------------------------------------------------------- -Charter for the devel-cvs mailing list: - -The CVS Developers' List exists to help people -with access to the CVS source repository co-ordinate changes, make -releases, and administer the repository. - -Everyone who has been given checkin access to the repository for the -CVS sources should read devel-cvs. Only those with checkin access may -send messages to the list. - -The devel-cvs list may be used to discuss: -- administrivia regarding the CVS source repository and release - process, and -- changes and features intended for inclusion in the official CVS - release (either source code or documentation), which someone plans - to implement, or has implemented. - -The devel-cvs list should not be used to discuss: -- changes or features to packages other than the CVS release - (e.g., related packages like tkCVS, RAD/CVS, or other groups' - distributions of CVS, like RCVS, etc.), -- changes which nobody has offered to implement, or -- the philosophy of CVS (as opposed to a specific change to CVS). -These topics should either go on info-cvs, or have a new mailing list -created for them. - -The topic restrictions in this charter do not reflect the development -group's future plans for CVS; rather, they reflect a topic -classification which the group finds helpful. - ----------------------------------------------------------------------- Policies regarding the CVS source repository: By checking items into the repository, developers agree to permit From owner-p4-projects@FreeBSD.ORG Sat Jan 19 02:27:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CABCF16A46C; Sat, 19 Jan 2008 02:27:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9051E16A469 for ; Sat, 19 Jan 2008 02:27:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 767A713C47E for ; Sat, 19 Jan 2008 02:27:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0J2RupM054796 for ; Sat, 19 Jan 2008 02:27:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0J2RuAp054793 for perforce@freebsd.org; Sat, 19 Jan 2008 02:27:56 GMT (envelope-from jb@freebsd.org) Date: Sat, 19 Jan 2008 02:27:56 GMT Message-Id: <200801190227.m0J2RuAp054793@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133635 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 02:27:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=133635 Change 133635 by jb@jb_freebsd1 on 2008/01/19 02:27:53 I don't understand why I had to merge this manually. Must be some history of PEBKC. Affected files ... .. //depot/projects/dtrace/src/share/man/man4/enc.4#9 edit Differences ... ==== //depot/projects/dtrace/src/share/man/man4/enc.4#9 (text+ko) ==== @@ -29,7 +29,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/share/man/man4/enc.4,v 1.5 2007/08/02 08:04:48 bz Exp $ +.\" $FreeBSD: src/share/man/man4/enc.4,v 1.6 2007/11/28 22:35:48 bz Exp $ .\" .Dd November 28, 2007 .Dt ENC 4 From owner-p4-projects@FreeBSD.ORG Sat Jan 19 02:29:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55F8A16A418; Sat, 19 Jan 2008 02:29:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 037E716A421 for ; Sat, 19 Jan 2008 02:29:59 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C64BF13C467 for ; Sat, 19 Jan 2008 02:29:58 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0J2Twwx054858 for ; Sat, 19 Jan 2008 02:29:58 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0J2TwNU054855 for perforce@freebsd.org; Sat, 19 Jan 2008 02:29:58 GMT (envelope-from jb@freebsd.org) Date: Sat, 19 Jan 2008 02:29:58 GMT Message-Id: <200801190229.m0J2TwNU054855@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133636 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 02:29:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=133636 Change 133636 by jb@jb_freebsd1 on 2008/01/19 02:29:11 Another file missed by the integration. Affected files ... .. //depot/projects/dtrace/src/sys/net/if_enc.c#11 edit Differences ... ==== //depot/projects/dtrace/src/sys/net/if_enc.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/sys/net/if_enc.c,v 1.7 2007/11/28 22:33:52 bz Exp $ + * $FreeBSD: src/sys/net/if_enc.c,v 1.8 2007/12/26 08:41:58 thompsa Exp $ */ #include From owner-p4-projects@FreeBSD.ORG Sat Jan 19 05:44:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E969016A421; Sat, 19 Jan 2008 05:44:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94F9316A41B for ; Sat, 19 Jan 2008 05:44:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5E84713C45A for ; Sat, 19 Jan 2008 05:44:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0J5iN4d082618 for ; Sat, 19 Jan 2008 05:44:23 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0J5iMKd082615 for perforce@freebsd.org; Sat, 19 Jan 2008 05:44:22 GMT (envelope-from jb@freebsd.org) Date: Sat, 19 Jan 2008 05:44:22 GMT Message-Id: <200801190544.m0J5iMKd082615@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133637 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 05:44:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=133637 Change 133637 by jb@jb_freebsd1 on 2008/01/19 05:44:15 Remove headers that aren't referenced. They get in the way of my diffs. Affected files ... .. //depot/projects/dtrace/src/sys/sparc64/include/dtrace.h#2 delete .. //depot/projects/dtrace/src/sys/sparc64/include/dtrace_asm.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jan 19 06:12:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A44A616A468; Sat, 19 Jan 2008 06:12:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 69D0F16A41B for ; Sat, 19 Jan 2008 06:12:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4BCC613C457 for ; Sat, 19 Jan 2008 06:12:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0J6Cr8C084878 for ; Sat, 19 Jan 2008 06:12:53 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0J6Crw1084875 for perforce@freebsd.org; Sat, 19 Jan 2008 06:12:53 GMT (envelope-from jb@freebsd.org) Date: Sat, 19 Jan 2008 06:12:53 GMT Message-Id: <200801190612.m0J6Crw1084875@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133638 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 06:12:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=133638 Change 133638 by jb@jb_freebsd1 on 2008/01/19 06:12:45 Change the file system layout to keep things together which belong together. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/amd64/cyclic_machdep.c#10 delete .. //depot/projects/dtrace/src/sys/cddl/cyclic/amd64/cyclic_machdep.c#1 add .. //depot/projects/dtrace/src/sys/cddl/cyclic/cyclic.c#1 add .. //depot/projects/dtrace/src/sys/cddl/cyclic/cyclic_test.c#1 add .. //depot/projects/dtrace/src/sys/cddl/cyclic/i386/cyclic_machdep.c#1 add .. //depot/projects/dtrace/src/sys/cddl/i386/cyclic_machdep.c#9 delete .. //depot/projects/dtrace/src/sys/cddl/kern/cyclic.c#10 delete .. //depot/projects/dtrace/src/sys/cddl/kern/cyclic_test.c#6 delete .. //depot/projects/dtrace/src/sys/modules/cyclic/Makefile#9 edit .. //depot/projects/dtrace/src/sys/modules/cyclic_test/Makefile#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/modules/cyclic/Makefile#9 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD# -.PATH: ${.CURDIR}/../../cddl/kern +.PATH: ${.CURDIR}/../../cddl/cyclic KMOD= cyclic SRCS= cyclic.c @@ -10,7 +10,7 @@ CFLAGS+= -I${.CURDIR}/../../compat/opensolaris \ -I${.CURDIR}/../../contrib/opensolaris/uts/common \ -I${.CURDIR}/../.. \ - -I${.CURDIR}/../../cddl/${MACHINE_ARCH} + -I${.CURDIR}/../../cddl/cyclic/${MACHINE_ARCH} CFLAGS+= -DSMP -DDEBUG=1 ==== //depot/projects/dtrace/src/sys/modules/cyclic_test/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD# -.PATH: ${.CURDIR}/../../cddl/kern +.PATH: ${.CURDIR}/../../cddl/cyclic KMOD= cyclic_test SRCS= cyclic_test.c From owner-p4-projects@FreeBSD.ORG Sat Jan 19 06:35:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B86B016A47B; Sat, 19 Jan 2008 06:35:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7DB8A16A46C for ; Sat, 19 Jan 2008 06:35:19 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5EA1C13C442 for ; Sat, 19 Jan 2008 06:35:19 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0J6ZJRK086730 for ; Sat, 19 Jan 2008 06:35:19 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0J6ZIM3086727 for perforce@freebsd.org; Sat, 19 Jan 2008 06:35:18 GMT (envelope-from jb@freebsd.org) Date: Sat, 19 Jan 2008 06:35:18 GMT Message-Id: <200801190635.m0J6ZIM3086727@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133641 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 06:35:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=133641 Change 133641 by jb@jb_freebsd1 on 2008/01/19 06:34:28 Remove the vmem references which just allocate a unique ID. For now we'll just use an unsigned long value and allocate a higher one each time. The first person to allocate more than 4 billion probes or aggregations can implement an nice simple resource number allocator. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_clone.c#6 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#27 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#23 edit .. //depot/projects/dtrace/src/sys/cddl/kern/vmem.c#7 delete .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/kmem.h#3 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#17 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#14 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#7 delete Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_clone.c#6 (text+ko) ==== @@ -50,7 +50,7 @@ return; /* Allocate a unique minor number. */ - u = (long) vmem_alloc(dtrace_minor, 1, VM_BESTFIT | VM_SLEEP); + u = dtrace_minor++; /* Clone the device to the new minor number. */ if (clone_create(&dtrace_clones, &dtrace_cdevsw, &u, dev, 0) != 0) ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#27 (text+ko) ==== @@ -92,11 +92,6 @@ #endif ASSERT(MUTEX_HELD(&cpu_lock)); - dtrace_arena = vmem_create("dtrace", (void *)1, UINT32_MAX, 1, - NULL, NULL, NULL, 0, VM_SLEEP | VMC_IDENTIFIER); - dtrace_minor = vmem_create("dtrace_minor", (void *)DTRACEMNRN_CLONE, - UINT32_MAX - DTRACEMNRN_CLONE, 1, NULL, NULL, NULL, 0, - VM_SLEEP | VMC_IDENTIFIER); #ifdef DOODAD dtrace_taskq = taskq_create("dtrace_taskq", 1, maxclsyspri, 1, INT_MAX, 0); ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#23 (text+ko) ==== @@ -121,8 +121,6 @@ dtrace_byname = NULL; kmem_cache_destroy(dtrace_state_cache); - vmem_destroy(dtrace_minor); - vmem_destroy(dtrace_arena); if (dtrace_toxrange != NULL) { kmem_free(dtrace_toxrange, 0); ==== //depot/projects/dtrace/src/sys/compat/opensolaris/sys/kmem.h#3 (text+ko) ==== @@ -32,7 +32,6 @@ #include #include #include -#include #include #include @@ -54,6 +53,8 @@ void *kc_private; } kmem_cache_t; +#define vmem_t void + void *zfs_kmem_alloc(size_t size, int kmflags); void zfs_kmem_free(void *buf, size_t size); u_long kmem_size(void); ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#17 (text) ==== @@ -116,7 +116,6 @@ #include #include #include -#include #include #include "dtrace_cddl.h" #include "dtrace_debug.c" @@ -192,10 +191,13 @@ #if defined(sun) static dev_info_t *dtrace_devi; /* device info */ #endif +#if defined(sun) static vmem_t *dtrace_arena; /* probe ID arena */ static vmem_t *dtrace_minor; /* minor number arena */ -#if defined(sun) static taskq_t *dtrace_taskq; /* task queue */ +#else +static u_long dtrace_arena; /* Probe ID number. */ +static u_long dtrace_minor; /* Minor device number. */ #endif static dtrace_probe_t **dtrace_probes; /* array of all probes */ static int dtrace_nprobes; /* number of probes */ @@ -7164,7 +7166,9 @@ kmem_free(probe->dtpr_mod, strlen(probe->dtpr_mod) + 1); kmem_free(probe->dtpr_func, strlen(probe->dtpr_func) + 1); kmem_free(probe->dtpr_name, strlen(probe->dtpr_name) + 1); +#if defined(sun) vmem_free(dtrace_arena, (void *)(uintptr_t)(probe->dtpr_id), 1); +#endif kmem_free(probe, sizeof (dtrace_probe_t)); } @@ -7279,7 +7283,9 @@ kmem_free(probe->dtpr_func, strlen(probe->dtpr_func) + 1); kmem_free(probe->dtpr_name, strlen(probe->dtpr_name) + 1); kmem_free(probe, sizeof (dtrace_probe_t)); +#if defined(sun) vmem_free(dtrace_arena, (void *)((uintptr_t)i + 1), 1); +#endif } mutex_exit(&dtrace_lock); @@ -7315,8 +7321,12 @@ mutex_enter(&dtrace_lock); } +#if defined(sun) id = (dtrace_id_t)(uintptr_t)vmem_alloc(dtrace_arena, 1, VM_BESTFIT | VM_SLEEP); +#else + id = ++dtrace_arena; +#endif probe = kmem_zalloc(sizeof (dtrace_probe_t), KM_SLEEP); probe->dtpr_id = id; @@ -9513,8 +9523,12 @@ /* * We need to allocate an id for this aggregation. */ +#if defined(sun) aggid = (dtrace_aggid_t)(uintptr_t)vmem_alloc(state->dts_aggid_arena, 1, VM_BESTFIT | VM_SLEEP); +#else + aggid = ++(state->dts_aggid_arena); +#endif if (aggid - 1 >= state->dts_naggregations) { dtrace_aggregation_t **oaggs = state->dts_aggregations; @@ -9563,7 +9577,9 @@ dtrace_aggid_t aggid = agg->dtag_id; ASSERT(DTRACEACT_ISAGG(act->dta_kind)); +#if defined(sun) vmem_free(state->dts_aggid_arena, (void *)(uintptr_t)aggid, 1); +#endif ASSERT(state->dts_aggregations[aggid - 1] == agg); state->dts_aggregations[aggid - 1] = NULL; @@ -12379,10 +12395,10 @@ state->dts_epid = DTRACE_EPIDNONE + 1; (void) snprintf(c, sizeof (c), "dtrace_aggid_%d", m); +#if defined(sun) state->dts_aggid_arena = vmem_create(c, (void *)1, UINT32_MAX, 1, NULL, NULL, NULL, 0, VM_SLEEP | VMC_IDENTIFIER); -#if defined(sun) if (devp != NULL) { major = getemajor(*devp); } else { @@ -12394,6 +12410,7 @@ if (devp != NULL) *devp = state->dts_dev; #else + state->dts_aggid_arena = 0; state->dts_dev = dev; #endif @@ -13183,11 +13200,11 @@ dtrace_format_destroy(state); +#if defined(sun) if (state->dts_aggid_arena != NULL) { vmem_destroy(state->dts_aggid_arena); state->dts_aggid_arena = NULL; } -#if defined(sun) ddi_soft_state_free(dtrace_softstate, minor); vmem_free(dtrace_minor, (void *)(uintptr_t)minor, 1); #endif ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#14 (text) ==== @@ -1125,7 +1125,11 @@ int dts_nspeculations; /* number of speculations */ int dts_naggregations; /* number of aggregations */ dtrace_aggregation_t **dts_aggregations; /* aggregation array */ +#if defined(sun) vmem_t *dts_aggid_arena; /* arena for aggregation IDs */ +#else + u_long dts_aggid_arena; /* arena for aggregation IDs */ +#endif uint64_t dts_errors; /* total number of errors */ uint32_t dts_speculations_busy; /* number of spec. busy */ uint32_t dts_speculations_unavail; /* number of spec unavail */ From owner-p4-projects@FreeBSD.ORG Sat Jan 19 07:07:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD70616A41A; Sat, 19 Jan 2008 07:07:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7977816A418 for ; Sat, 19 Jan 2008 07:07:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5927013C442 for ; Sat, 19 Jan 2008 07:07:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0J77r7L090866 for ; Sat, 19 Jan 2008 07:07:53 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0J77qMX090863 for perforce@freebsd.org; Sat, 19 Jan 2008 07:07:52 GMT (envelope-from jb@freebsd.org) Date: Sat, 19 Jan 2008 07:07:52 GMT Message-Id: <200801190707.m0J77qMX090863@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133642 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 07:07:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=133642 Change 133642 by jb@jb_freebsd1 on 2008/01/19 07:07:21 IFC Affected files ... .. //depot/projects/dtrace/ports/MOVED#62 integrate .. //depot/projects/dtrace/ports/UPDATING#46 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kthr.c#8 integrate .. //depot/projects/dtrace/src/lib/libc/sparc64/_fpmath.h#4 integrate .. //depot/projects/dtrace/src/lib/msun/Makefile#10 integrate .. //depot/projects/dtrace/src/lib/msun/Symbol.map#9 integrate .. //depot/projects/dtrace/src/lib/msun/ld128/s_exp2l.c#1 branch .. //depot/projects/dtrace/src/lib/msun/ld80/s_exp2l.c#1 branch .. //depot/projects/dtrace/src/lib/msun/man/exp.3#5 integrate .. //depot/projects/dtrace/src/lib/msun/man/log.3#1 branch .. //depot/projects/dtrace/src/lib/msun/src/e_expf.c#4 integrate .. //depot/projects/dtrace/src/lib/msun/src/math.h#8 integrate .. //depot/projects/dtrace/src/lib/msun/src/s_exp2.c#4 integrate .. //depot/projects/dtrace/src/lib/msun/src/s_exp2f.c#4 integrate .. //depot/projects/dtrace/src/share/man/man9/VOP_LOCK.9#6 integrate .. //depot/projects/dtrace/src/share/misc/bsd-family-tree#14 integrate .. //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#23 integrate .. //depot/projects/dtrace/src/sys/dev/bge/if_bgereg.h#16 integrate .. //depot/projects/dtrace/src/sys/dev/mii/brgphy.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_usrreq.c#22 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_bsm.c#11 integrate .. //depot/projects/dtrace/src/tools/build/mk/OptionalObsoleteFiles.inc#10 integrate .. //depot/projects/dtrace/src/tools/regression/lib/msun/Makefile#7 integrate .. //depot/projects/dtrace/src/tools/regression/lib/msun/test-exponential.c#1 branch .. //depot/projects/dtrace/src/tools/regression/lib/msun/test-exponential.t#1 branch .. //depot/projects/dtrace/src/usr.bin/vmstat/vmstat.c#8 integrate .. //depot/projects/dtrace/www/en/releases/6.3R/Makefile#3 integrate .. //depot/projects/dtrace/www/en/releases/6.3R/announce.sgml#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/hardware-powerpc.html#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/hardware.sgml#2 integrate .. //depot/projects/dtrace/www/en/releases/6.3R/installation-powerpc.html#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/installation.sgml#2 integrate .. //depot/projects/dtrace/www/en/releases/6.3R/relnotes-powerpc.html#1 branch .. //depot/projects/dtrace/www/en/releases/6.3R/relnotes.sgml#2 integrate .. //depot/projects/dtrace/www/en/releases/6.3R/schedule.sgml#6 integrate .. //depot/projects/dtrace/www/en/releases/index.sgml#8 integrate .. //depot/projects/dtrace/www/en/releng/index.sgml#27 integrate .. //depot/projects/dtrace/www/share/sgml/events.xml#18 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#34 integrate .. //depot/projects/dtrace/www/share/sgml/release.ent#18 integrate Differences ... ==== //depot/projects/dtrace/ports/MOVED#62 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1528 2008/01/09 15:19:45 tabthorpe Exp $ +# $FreeBSD: ports/MOVED,v 1.1529 2008/01/18 21:19:47 beech Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -3354,3 +3354,4 @@ audio/paman|audio/pavucontrol|2008-01-01|New tool to work with pulseaudio audio/akode-plugins-polypaudio||2008-01-01|Polypaudio is obsolete in favor of pulseaudio audio/teknap|net-p2p/teknap|2008-01-09|moved to net-p2p category +net/freeradius-devel|net/freeradius2|2008-01-18|Development version no longer necessary ==== //depot/projects/dtrace/ports/UPDATING#46 (text+ko) ==== @@ -6,6 +6,46 @@ time you update your ports collection, before attempting any port upgrades. +20080118: + AFFECTS: users of net/freeradius + AUTHOR: David Wood + + FreeRADIUS 2.0 is now available as the net/freeradius2 port. All + FreeRADIUS users are advised to consider upgrading to 2.0. It is the + FreeRADIUS team's intention to put the 1.x server into 'maintenance' mode with + just critical bug fixes.[1] 2.0 has many improvements including numerous bug + fixesthat were too difficult for the 1.x server, as well as many new features. + + Before uninstalling 1.x, it is recommended that you backup your + configuration, which is typically in /usr/local/etc/raddb, then move + it out of the way. It is also worth backing up the default configuration, + which is typically in /usr/local/share/examples/freeradius/raddb. + + 1.x configurations should work with the 2.0 server [2]. However the + port automatically upgrades any unedited files in the configuration when + you install a new version of FreeRADIUS. Installing 2.0 with the residue + of a 1.x configuration in the default location will result in a mixed 1.x and + 2.0 configuration that may not work. + + The recommended approach is to diff your 1.x configuration against the + default 1.x configuration, then make corresponding changes to a copy + of the default 2.0 configuration. If you moved your 1.x configuration out of + the way before upgrading, you will have a 2.0 configuration ready to edit in + the default location. It is worth reading man 5 unlang for details of + the new FreeRADIUS 'un-language' before starting. + + Alternatively, you can move your 1.x configuration to another + location, such as /usr/local/etc/raddb_v1, then edit /etc/rc.conf to point the + rc.d script to that location. For example: + + radiusd_flags="-d /usr/local/etc/raddb_v1" + + I cannot guarantee that all 1.x configurations will work with the 2.0 + server,and I only recommend using a 1.x configuration as an interim measure. + + [1] - http://www.freeradius.org/business/roadmap.html + [2] - http://preview.tinyurl.com/ysrr6a + 20080114: AFFECTS: users of devel/perforce AUTHOR: lth@FreeBSD.org @@ -5947,4 +5987,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.574 2008/01/14 15:09:29 lth Exp $ +$FreeBSD: ports/UPDATING,v 1.575 2008/01/18 21:46:50 beech Exp $ ==== //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kthr.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.8 2007/11/16 22:17:37 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.9 2008/01/18 18:57:27 emaste Exp $"); #include #include @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -204,17 +205,26 @@ char * kgdb_thr_extra_thread_info(int tid) { + char comm[MAXCOMLEN + 1]; + char td_name[MAXCOMLEN + 1]; struct kthr *kt; struct proc *p; - static char comm[MAXCOMLEN + 1]; + struct thread *t; + static char info[MAXCOMLEN + 1 + MAXCOMLEN + 1]; kt = kgdb_thr_lookup_tid(tid); if (kt == NULL) return (NULL); p = (struct proc *)kt->paddr; + t = (struct thread *)kt->kaddr; if (kvm_read(kvm, (uintptr_t)&p->p_comm[0], &comm, sizeof(comm)) != sizeof(comm)) return (NULL); - - return (comm); + if (kvm_read(kvm, (uintptr_t)&t->td_name[0], &td_name, + sizeof(td_name)) == sizeof(td_name) && + strcmp(comm, td_name) != 0) + snprintf(info, sizeof(info), "%s/%s", comm, td_name); + else + strlcpy(info, comm, sizeof(info)); + return (info); } ==== //depot/projects/dtrace/src/lib/libc/sparc64/_fpmath.h#4 (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/sparc64/_fpmath.h,v 1.5 2005/03/07 04:55:22 das Exp $ + * $FreeBSD: src/lib/libc/sparc64/_fpmath.h,v 1.6 2008/01/18 21:25:51 das Exp $ */ union IEEEl2bits { @@ -35,6 +35,11 @@ unsigned long manh :48; unsigned long manl :64; } bits; + struct { + unsigned int expsign :16; + unsigned long manh :48; + unsigned long manl :64; + } xbits; }; #define mask_nbit_l(u) ((void)0) ==== //depot/projects/dtrace/src/lib/msun/Makefile#10 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 5.1beta 93/09/24 -# $FreeBSD: src/lib/msun/Makefile,v 1.85 2008/01/14 02:12:06 das Exp $ +# $FreeBSD: src/lib/msun/Makefile,v 1.86 2008/01/18 21:43:10 das Exp $ # # ==================================================== # Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -78,7 +78,7 @@ COMMON_SRCS+= s_copysignl.c s_fabsl.c s_llrintl.c s_lrintl.c s_modfl.c .if ${LDBL_PREC} != 53 # If long double != double use these; otherwise, we alias the double versions. -COMMON_SRCS+= s_fmal.c s_frexpl.c s_logbl.c s_nanl.c \ +COMMON_SRCS+= s_exp2l.c s_fmal.c s_frexpl.c s_logbl.c s_nanl.c \ s_nextafterl.c s_nexttoward.c s_rintl.c s_scalbnl.c .endif @@ -106,7 +106,8 @@ feclearexcept.3 feenableexcept.3 fegetenv.3 \ fegetround.3 fenv.3 floor.3 \ fma.3 fmax.3 fmod.3 hypot.3 ieee.3 ieee_test.3 ilogb.3 j0.3 \ - lgamma.3 lrint.3 lround.3 math.3 nan.3 nextafter.3 remainder.3 rint.3 \ + lgamma.3 log.3 lrint.3 lround.3 math.3 nan.3 \ + nextafter.3 remainder.3 rint.3 \ round.3 scalbn.3 signbit.3 sin.3 sinh.3 sqrt.3 tan.3 tanh.3 trunc.3 MLINKS+=acos.3 acosf.3 @@ -125,10 +126,8 @@ MLINKS+=cosh.3 coshf.3 MLINKS+=csqrt.3 csqrtf.3 MLINKS+=erf.3 erfc.3 erf.3 erff.3 erf.3 erfcf.3 -MLINKS+=exp.3 expm1.3 exp.3 log.3 exp.3 log10.3 exp.3 log1p.3 exp.3 pow.3 \ - exp.3 exp2.3 exp.3 exp2f.3 exp.3 expf.3 \ - exp.3 expm1f.3 exp.3 logf.3 exp.3 powf.3 \ - exp.3 log10f.3 exp.3 log1pf.3 +MLINKS+=exp.3 expm1.3 exp.3 expm1f.3 exp.3 pow.3 exp.3 powf.3 \ + exp.3 exp2.3 exp.3 exp2f.3 exp.3 exp2l.3 exp.3 expf.3 MLINKS+=fabs.3 fabsf.3 fabs.3 fabsl.3 MLINKS+=fdim.3 fdimf.3 fdim.3 fdiml.3 MLINKS+=feclearexcept.3 fegetexceptflag.3 feclearexcept.3 feraiseexcept.3 \ @@ -150,6 +149,7 @@ MLINKS+=j0.3 j1.3 j0.3 jn.3 j0.3 y0.3 j0.3 y1.3 j0.3 y1f.3 j0.3 yn.3 MLINKS+=j0.3 j0f.3 j0.3 j1f.3 j0.3 jnf.3 j0.3 y0f.3 j0.3 ynf.3 MLINKS+=lgamma.3 gamma.3 lgamma.3 gammaf.3 lgamma.3 lgammaf.3 lgamma.3 tgamma.3 +MLINKS+=log.3 log10.3 log.3 log10f.3 log.3 log1p.3 log.3 log1pf.3 log.3 logf.3 MLINKS+=lrint.3 llrint.3 lrint.3 llrintf.3 lrint.3 llrintl.3 \ lrint.3 lrintf.3 lrint.3 lrintl.3 MLINKS+=lround.3 llround.3 lround.3 llroundf.3 lround.3 llroundl.3 \ ==== //depot/projects/dtrace/src/lib/msun/Symbol.map#9 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/msun/Symbol.map,v 1.11 2008/01/14 02:12:06 das Exp $ + * $FreeBSD: src/lib/msun/Symbol.map,v 1.12 2008/01/18 21:43:10 das Exp $ */ /* 7.0-CURRENT */ @@ -197,4 +197,5 @@ lrintl; nearbyintl; rintl; + exp2l; }; ==== //depot/projects/dtrace/src/lib/msun/man/exp.3#5 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)exp.3 6.12 (Berkeley) 7/31/91 -.\" $FreeBSD: src/lib/msun/man/exp.3,v 1.23 2007/01/09 01:02:05 imp Exp $ +.\" $FreeBSD: src/lib/msun/man/exp.3,v 1.24 2008/01/18 21:43:00 das Exp $ .\" -.Dd April 5, 2005 +.Dd January 17, 2008 .Dt EXP 3 .Os .Sh NAME @@ -37,17 +37,12 @@ .\" The sorting error is intentional. exp and expf should be adjacent. .Nm exp2 , .Nm exp2f , +.Nm exp2l , .Nm expm1 , .Nm expm1f , -.Nm log , -.Nm logf , -.Nm log10 , -.Nm log10f , -.Nm log1p , -.Nm log1pf , .Nm pow , .Nm powf -.Nd exponential, logarithm, power functions +.Nd exponential and power functions .Sh LIBRARY .Lb libm .Sh SYNOPSIS @@ -60,23 +55,13 @@ .Fn exp2 "double x" .Ft float .Fn exp2f "float x" +.Ft long double +.Fn exp2l "long double x" .Ft double .Fn expm1 "double x" .Ft float .Fn expm1f "float x" .Ft double -.Fn log "double x" -.Ft float -.Fn logf "float x" -.Ft double -.Fn log10 "double x" -.Ft float -.Fn log10f "float x" -.Ft double -.Fn log1p "double x" -.Ft float -.Fn log1pf "float x" -.Ft double .Fn pow "double x" "double y" .Ft float .Fn powf "float x" "float y" @@ -91,9 +76,10 @@ .Fa x . .Pp The -.Fn exp2 -and the -.Fn exp2f +.Fn exp2 , +.Fn exp2f , +and +.Fn exp2l functions compute the base 2 exponential of the given argument .Fa x . .Pp @@ -105,29 +91,6 @@ .Fa x . .Pp The -.Fn log -and the -.Fn logf -functions compute the value of the natural logarithm of argument -.Fa x . -.Pp -The -.Fn log10 -and the -.Fn log10f -functions compute the value of the logarithm of argument -.Fa x -to base 10. -.Pp -The -.Fn log1p -and the -.Fn log1pf -functions compute -the value of log(1+x) accurately even for tiny argument -.Fa x . -.Pp -The .Fn pow and the .Fn powf @@ -159,30 +122,7 @@ < 0 and .Fa y is not an integer. -An attempt to take the logarithm of \*(Pm0 will result in -a divide-by-zero exception, and an infinity will be returned. -An attempt to take the logarithm of a negative number will -result in an invalid exception, and an \*(Na will be generated. .Sh NOTES -The functions exp(x)\-1 and log(1+x) are called -expm1 and logp1 in -.Tn BASIC -on the Hewlett\-Packard -.Tn HP Ns \-71B -and -.Tn APPLE -Macintosh, -.Tn EXP1 -and -.Tn LN1 -in Pascal, exp1 and log1 in C -on -.Tn APPLE -Macintoshes, where they have been provided to make -sure financial calculations of ((1+x)**n\-1)/x, namely -expm1(n\(**log1p(x))/x, will be accurate when x is tiny. -They also provide accurate inverse hyperbolic functions. -.Pp The function .Fn pow x 0 returns x**0 = 1 for all x including x = 0, \*(If, and \*(Na . @@ -229,4 +169,9 @@ .El .Sh SEE ALSO .Xr fenv 3 , +.Xr ldexp 3 , +.Xr log 3 , .Xr math 3 +.Sh STANDARDS +These functions conform to +.St -isoC-99 . ==== //depot/projects/dtrace/src/lib/msun/src/e_expf.c#4 (text+ko) ==== @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_expf.c,v 1.10 2005/11/30 04:56:49 bde Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_expf.c,v 1.11 2008/01/18 22:19:04 das Exp $"; #endif #include "math.h" @@ -24,7 +24,6 @@ one = 1.0, halF[2] = {0.5,-0.5,}, huge = 1.0e+30, -twom100 = 7.8886090522e-31, /* 2**-100=0x0d800000 */ o_threshold= 8.8721679688e+01, /* 0x42b17180 */ u_threshold= -1.0397208405e+02, /* 0xc2cff1b5 */ ln2HI[2] ={ 6.9314575195e-01, /* 0x3f317200 */ @@ -38,6 +37,8 @@ P4 = -1.6533901999e-06, /* 0xb5ddea0e */ P5 = 4.1381369442e-08; /* 0x3331bb4c */ +static volatile float twom100 = 7.8886090522e-31; /* 2**-100=0x0d800000 */ + float __ieee754_expf(float x) /* default IEEE double exp */ { ==== //depot/projects/dtrace/src/lib/msun/src/math.h#8 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math.h,v 1.66 2008/01/14 02:12:06 das Exp $ + * $FreeBSD: src/lib/msun/src/math.h,v 1.67 2008/01/18 21:42:46 das Exp $ */ #ifndef _MATH_H_ @@ -408,7 +408,9 @@ long double cosl(long double); long double erfcl(long double); long double erfl(long double); +#endif long double exp2l(long double); +#if 0 long double expl(long double); long double expm1l(long double); #endif ==== //depot/projects/dtrace/src/lib/msun/src/s_exp2.c#4 (text+ko) ==== @@ -25,7 +25,9 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2.c,v 1.1 2005/04/05 02:57:15 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2.c,v 1.3 2008/01/18 22:19:04 das Exp $"); + +#include #include "math.h" #include "math_private.h" @@ -35,7 +37,6 @@ static const double huge = 0x1p1000, - twom1000 = 0x1p-1000, redux = 0x1.8p52 / TBLSIZE, P1 = 0x1.62e42fefa39efp-1, P2 = 0x1.ebfbdff82c575p-3, @@ -43,6 +44,8 @@ P4 = 0x1.3b2ab88f70400p-7, P5 = 0x1.5d88003875c74p-10; +static volatile double twom1000 = 0x1p-1000; + static const double tbl[TBLSIZE * 2] = { /* exp2(z + eps) eps */ 0x1.6a09e667f3d5dp-1, 0x1.9880p-44, @@ -387,3 +390,7 @@ return (r * twom1000); } } + +#if (LDBL_MANT_DIG == 53) +__weak_reference(exp2, exp2l); +#endif ==== //depot/projects/dtrace/src/lib/msun/src/s_exp2f.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2f.c,v 1.1 2005/04/05 02:57:15 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2f.c,v 1.2 2008/01/18 22:19:04 das Exp $"); #include "math.h" #include "math_private.h" @@ -35,13 +35,14 @@ static const float huge = 0x1p100f, - twom100 = 0x1p-100f, redux = 0x1.8p23f / TBLSIZE, P1 = 0x1.62e430p-1f, P2 = 0x1.ebfbe0p-3f, P3 = 0x1.c6b348p-5f, P4 = 0x1.3b2c9cp-7f; +static volatile float twom100 = 0x1p-100f; + static const double exp2ft[TBLSIZE] = { 0x1.6a09e667f3bcdp-1, 0x1.7a11473eb0187p-1, ==== //depot/projects/dtrace/src/share/man/man9/VOP_LOCK.9#6 (text+ko) ==== @@ -26,9 +26,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/share/man/man9/VOP_LOCK.9,v 1.21 2008/01/10 19:11:37 brueffer Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_LOCK.9,v 1.22 2008/01/18 22:09:29 attilio Exp $ .\" -.Dd January 10, 2008 +.Dd January 19, 2008 .Os .Dt VOP_LOCK 9 .Sh NAME @@ -42,9 +42,9 @@ .In sys/lock.h .In sys/vnode.h .Ft int -.Fn VOP_LOCK "struct vnode *vp" "int flags" "struct thread *td" +.Fn VOP_LOCK "struct vnode *vp" "int flags" .Ft int -.Fn VOP_UNLOCK "struct vnode *vp" "int flags" "struct thread *td" +.Fn VOP_UNLOCK "struct vnode *vp" "int flags" .Ft int .Fn VOP_ISLOCKED "struct vnode *vp" "struct thread *td" .Ft int ==== //depot/projects/dtrace/src/share/misc/bsd-family-tree#14 (text+ko) ==== @@ -214,7 +214,9 @@ | | | | | DragonFly 1.10.0 | | | | OpenBSD 4.2 | | | | NetBSD 4.0 | | - | V | | | | + | FreeBSD 6.3 | | | | + | | | | | + | | | | | FreeBSD 7 -current | NetBSD -current OpenBSD -current | | | | | | v v v v v @@ -472,6 +474,7 @@ DragonFly 1.10.0 2007-08-06 [DFB] OpenBSD 4.2 2007-11-01 [OBD] NetBSD 4.0 2007-12-19 [NBD] +FreeBSD 6.3 2008-01-18 [FBD] Bibliography ------------------------ @@ -532,4 +535,4 @@ Copyright (c) 1997-2007 Wolfram Schneider URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree -$FreeBSD: src/share/misc/bsd-family-tree,v 1.117 2007/12/19 18:19:53 maxim Exp $ +$FreeBSD: src/share/misc/bsd-family-tree,v 1.118 2008/01/18 19:25:15 maxim Exp $ ==== //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#23 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.200 2007/12/25 19:51:18 remko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.202 2008/01/18 22:09:49 jkim Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -1309,7 +1309,7 @@ } /* Configure mbuf pool watermarks */ - if (!(BGE_IS_5705_PLUS(sc))) { + if (BGE_IS_5705_PLUS(sc)) { CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_READDMA_LOWAT, 0x0); CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_MACRX_LOWAT, 0x10); } else { @@ -2264,6 +2264,15 @@ sc->bge_asicrev = BGE_ASICREV(sc->bge_chipid); sc->bge_chiprev = BGE_CHIPREV(sc->bge_chipid); + /* + * Don't enable Ethernet@WireSpeed for the 5700 or the + * 5705 A0 and A1 chips. + */ + if (sc->bge_asicrev != BGE_ASICREV_BCM5700 && + sc->bge_chipid != BGE_CHIPID_BCM5705_A0 && + sc->bge_chipid != BGE_CHIPID_BCM5705_A1) + sc->bge_flags |= BGE_FLAG_WIRESPEED; + if (bge_has_eeprom(sc)) sc->bge_flags |= BGE_FLAG_EEPROM; ==== //depot/projects/dtrace/src/sys/dev/bge/if_bgereg.h#16 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.74 2007/12/25 19:51:18 remko Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.75 2008/01/18 22:09:49 jkim Exp $ */ /* @@ -2459,7 +2459,8 @@ uint32_t bge_flags; #define BGE_FLAG_TBI 0x00000001 #define BGE_FLAG_JUMBO 0x00000002 -#define BGE_FLAG_EEPROM 0x00000004 +#define BGE_FLAG_WIRESPEED 0x00000004 +#define BGE_FLAG_EEPROM 0x00000008 #define BGE_FLAG_MSI 0x00000100 #define BGE_FLAG_PCIX 0x00000200 #define BGE_FLAG_PCIE 0x00000400 ==== //depot/projects/dtrace/src/sys/dev/mii/brgphy.c#14 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.70 2007/06/08 02:34:44 davidch Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.71 2008/01/18 22:09:50 jkim Exp $"); /* * Driver for the Broadcom BCM54xx/57xx 1000baseTX PHY. @@ -915,13 +915,7 @@ brgphy_jumbo_settings(sc, ifp->if_mtu); - /* - * Don't enable Ethernet@WireSpeed for the 5700 or the - * 5705 A1 and A2 chips. - */ - if (bge_sc->bge_asicrev != BGE_ASICREV_BCM5700 && - bge_sc->bge_chipid != BGE_CHIPID_BCM5705_A1 && - bge_sc->bge_chipid != BGE_CHIPID_BCM5705_A2) + if (bge_sc->bge_flags & BGE_FLAG_WIRESPEED) brgphy_ethernet_wirespeed(sc); /* Enable Link LED on Dell boxes */ ==== //depot/projects/dtrace/src/sys/kern/uipc_usrreq.c#22 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.213 2008/01/13 14:44:09 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.214 2008/01/18 19:16:03 rwatson Exp $"); #include "opt_ddb.h" #include "opt_mac.h" @@ -1122,7 +1122,6 @@ struct sockaddr *sa; UNP_GLOBAL_WLOCK_ASSERT(); - UNP_GLOBAL_WUNLOCK(); unp = sotounpcb(so); KASSERT(unp != NULL, ("unp_connect: unp == NULL")); @@ -1137,6 +1136,7 @@ UNP_PCB_UNLOCK(unp); return (EALREADY); } + UNP_GLOBAL_WUNLOCK(); unp->unp_flags |= UNP_CONNECTING; UNP_PCB_UNLOCK(unp); ==== //depot/projects/dtrace/src/sys/security/audit/audit_bsm.c#11 (text) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_bsm.c,v 1.22 2007/10/26 01:23:07 csjp Exp $ + * $FreeBSD: src/sys/security/audit/audit_bsm.c,v 1.24 2008/01/18 19:57:21 csjp Exp $ */ #include @@ -429,6 +429,7 @@ switch(ar->ar_event) { case AUE_ACCEPT: case AUE_BIND: + case AUE_LISTEN: case AUE_CONNECT: case AUE_RECV: case AUE_RECVFROM: @@ -1191,7 +1192,8 @@ if (ARG_IS_VALID(kar, ARG_GROUPSET)) { for(ctr = 0; ctr < ar->ar_arg_groups.gidset_size; ctr++) { - tok = au_to_arg32(1, "setgroups", ar->ar_arg_groups.gidset[ctr]); + tok = au_to_arg32(1, "setgroups", + ar->ar_arg_groups.gidset[ctr]); kau_write(rec, tok); } } ==== //depot/projects/dtrace/src/tools/build/mk/OptionalObsoleteFiles.inc#10 (text) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/tools/build/mk/OptionalObsoleteFiles.inc,v 1.11 2007/10/09 13:42:33 obrien Exp $ +# $FreeBSD: src/tools/build/mk/OptionalObsoleteFiles.inc,v 1.12 2008/01/18 23:24:10 brueffer Exp $ # # This file add support for the WITHOUT_* and WITH_* knobs in src.conf(5) to # the check-old and delete-old* targets. @@ -381,18 +381,6 @@ # to be filled in #.endif -.if ${MK_FORTRAN} == no -OLD_FILES+=usr/bin/f77 -OLD_FILES+=usr/include/g2c.h -OLD_FILES+=usr/lib/libg2c.a -OLD_FILES+=usr/lib/libg2c_p.a -OLD_FILES+=usr/lib/libg2c.so.2 -OLD_FILES+=usr/lib/libg2c.so -OLD_FILES+=usr/libexec/f771 -OLD_FILES+=usr/share/info/g77.info.gz -OLD_FILES+=usr/share/man/man1/f77.1.gz -.endif - #.if ${MK_GAMES} == no # to be filled in #.endif ==== //depot/projects/dtrace/src/tools/regression/lib/msun/Makefile#7 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/tools/regression/lib/msun/Makefile,v 1.9 2007/12/16 23:00:18 das Exp $ +# $FreeBSD: src/tools/regression/lib/msun/Makefile,v 1.10 2008/01/18 21:46:54 das Exp $ -TESTS= test-csqrt test-fenv test-ilogb test-lrint \ +TESTS= test-csqrt test-exponential test-fenv test-ilogb test-lrint \ test-lround test-nan test-next test-rem CFLAGS+= -O0 -lm ==== //depot/projects/dtrace/src/usr.bin/vmstat/vmstat.c#8 (text+ko) ==== @@ -44,7 +44,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.bin/vmstat/vmstat.c,v 1.99 2007/12/13 02:36:11 peter Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/vmstat/vmstat.c,v 1.100 2008/01/18 22:09:44 peter Exp $"); #include #include @@ -739,7 +739,7 @@ (void)printf(" faults "); if (Pflag) { for (i = 0; i < ncpus; i++) { - if (cpumask && (1ul << i)) + if (cpumask & (1ul << i)) printf("cpu%-2d ", i); } printf("\n"); @@ -976,7 +976,7 @@ /* devstats does this for cp_time */ for (i = 0; i <= maxid; i++) { - if (cpumask && (1ul << i) == 0) + if ((cpumask & (1ul << i)) == 0) continue; for (state = 0; state < CPUSTATES; ++state) { tmp = cur_cp_times[i * CPUSTATES + state]; @@ -987,7 +987,7 @@ over = 0; for (i = 0; i <= maxid; i++) { - if (cpumask && (1ul << i) == 0) + if ((cpumask & (1ul << i)) == 0) continue; total = 0; for (state = 0; state < CPUSTATES; ++state) ==== //depot/projects/dtrace/www/en/releases/6.3R/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/releases/6.3R/Makefile,v 1.4 2008/01/18 17:49:46 bmah Exp $ +# $FreeBSD: www/en/releases/6.3R/Makefile,v 1.6 2008/01/18 20:11:12 bmah Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -7,7 +7,7 @@ .include "../Makefile.inc" .endif -#DOCS= announce.sgml +DOCS= announce.sgml DOCS+= relnotes.sgml DOCS+= hardware.sgml DOCS+= installation.sgml @@ -22,17 +22,20 @@ DATA+= hardware-amd64.html DATA+= hardware-i386.html DATA+= hardware-pc98.html +DATA+= hardware-powerpc.html DATA+= hardware-sparc64.html DATA+= installation-alpha.html DATA+= installation-amd64.html DATA+= installation-i386.html DATA+= installation-pc98.html +DATA+= installation-powerpc.html DATA+= installation-sparc64.html DATA+= readme.html DATA+= relnotes-alpha.html DATA+= relnotes-amd64.html DATA+= relnotes-i386.html DATA+= relnotes-pc98.html +DATA+= relnotes-powerpc.html DATA+= relnotes-sparc64.html DATA+= docbook.css ==== //depot/projects/dtrace/www/en/releases/6.3R/hardware.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -19,6 +19,7 @@
  • amd64
  • i386
  • pc98
    • +
  • powerpc
  • sparc64
    • ==== //depot/projects/dtrace/www/en/releases/6.3R/installation.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -19,6 +19,7 @@
  • amd64
  • i386
  • pc98
    • +
  • powerpc
  • sparc64
    • ==== //depot/projects/dtrace/www/en/releases/6.3R/relnotes.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -19,6 +19,7 @@
  • amd64
  • i386
  • pc98
    • +
  • powerpc
  • sparc64
    • ==== //depot/projects/dtrace/www/en/releases/6.3R/schedule.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -172,14 +172,14 @@ RELEASE builds 19 Dec 2007 - -- + 15 Jan 2008 Begin RELEASE builds. Announcement 23 Dec 2007 - -- + 18 Jan 2008 Announcement sent out after a majority of the mirrors have received the bits. ==== //depot/projects/dtrace/www/en/releases/index.sgml#8 (text+ko) ==== @@ -1,10 +1,10 @@ - + ]> - + &header; @@ -66,6 +66,17 @@

    Past Releases

      +
    • 6.2 (January 2007) + + Announcement: + Release Notes: + Hardware Notes: + Installation Notes: + Readme: + Errata + +
      • +
    • 6.1 (May 2006) Announcement: ==== //depot/projects/dtrace/www/en/releng/index.sgml#27 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -49,19 +49,7 @@ - June 2007 - Start FreeBSD 7.0 Release Process - 7.0R Schedule - - - - January 2008 - Release FreeBSD 6.3 - 6.3R Schedule - - - - TBA + February 2008 Release FreeBSD 7.0 7.0R Schedule ==== //depot/projects/dtrace/www/share/sgml/events.xml#18 (text+ko) ==== @@ -10,7 +10,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 19 07:22:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 132E616A473; Sat, 19 Jan 2008 07:22:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B7B916A46B for ; Sat, 19 Jan 2008 07:22:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 449D613C4DD for ; Sat, 19 Jan 2008 07:22:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0J7M8v4092307 for ; Sat, 19 Jan 2008 07:22:08 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0J7M8Wk092304 for perforce@freebsd.org; Sat, 19 Jan 2008 07:22:08 GMT (envelope-from jb@freebsd.org) Date: Sat, 19 Jan 2008 07:22:08 GMT Message-Id: <200801190722.m0J7M8Wk092304@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133643 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 07:22:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=133643 Change 133643 by jb@jb_freebsd1 on 2008/01/19 07:21:40 Remove the last vmem reference. Affected files ... .. //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#14 edit Differences ... ==== //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#14 (text+ko) ==== @@ -9,7 +9,6 @@ KMOD= dtrace SRCS= dtrace.c \ - vmem.c \ dtrace_asm.S \ dtrace_subr.c From owner-p4-projects@FreeBSD.ORG Sat Jan 19 08:30:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2860B16A41B; Sat, 19 Jan 2008 08:30:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E267C16A417 for ; Sat, 19 Jan 2008 08:30:18 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C419313C442 for ; Sat, 19 Jan 2008 08:30:18 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0J8UI2M097058 for ; Sat, 19 Jan 2008 08:30:18 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0J8UI6b097055 for perforce@freebsd.org; Sat, 19 Jan 2008 08:30:18 GMT (envelope-from sephe@FreeBSD.org) Date: Sat, 19 Jan 2008 08:30:18 GMT Message-Id: <200801190830.m0J8UI6b097055@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 133644 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 08:30:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=133644 Change 133644 by sephe@sephe_zealot:sam_wifi on 2008/01/19 08:30:06 Capabilities information is 2bytes long. Deprecate isi_capinfo and isr_capinfo, which are 1byte long. Add isi_capinfo2 and isr_capinfo2. This makes 'ifconfig iface list scan' list complete BSS capabilities, noticablely "short slot time" Obtained from: DragonFly Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#71 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#85 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#46 edit .. //depot/projects/wifi/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#10 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#71 (text+ko) ==== @@ -1965,7 +1965,7 @@ , getmaxrate(sr->isr_rates, sr->isr_nrates) , (sr->isr_rssi/2)+sr->isr_noise, sr->isr_noise , sr->isr_intval - , getcaps(sr->isr_capinfo) + , getcaps(sr->isr_capinfo2) ); printies(vp + sr->isr_ssid_len, sr->isr_ie_len, 24); printf("\n"); @@ -2121,7 +2121,7 @@ , si->isi_inact , gettxseq(si) , getrxseq(si) - , getcaps(si->isi_capinfo) + , getcaps(si->isi_capinfo2) , getflags(si->isi_state) ); printies(cp + si->isi_ie_off, si->isi_ie_len, 24); ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#85 (text+ko) ==== @@ -438,7 +438,8 @@ sr->isr_rssi = se->se_rssi; sr->isr_noise = se->se_noise; sr->isr_intval = se->se_intval; - sr->isr_capinfo = se->se_capinfo; + sr->isr_capinfo = se->se_capinfo; /* deprecated */ + sr->isr_capinfo2 = se->se_capinfo; sr->isr_erp = se->se_erp; IEEE80211_ADDR_COPY(sr->isr_bssid, se->se_bssid); nr = min(se->se_rates[1], IEEE80211_RATE_MAXSIZE); @@ -560,7 +561,8 @@ si->isi_authmode = ni->ni_authmode; ic->ic_node_getsignal(ni, &si->isi_rssi, &si->isi_noise); si->isi_noise = 0; /* XXX */ - si->isi_capinfo = ni->ni_capinfo; + si->isi_capinfo = ni->ni_capinfo; /* deprecated */ + si->isi_capinfo2 = ni->ni_capinfo; si->isi_erp = ni->ni_erp; IEEE80211_ADDR_COPY(si->isi_macaddr, ni->ni_macaddr); si->isi_nrates = ni->ni_rates.rs_nrates; ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#46 (text+ko) ==== @@ -344,7 +344,7 @@ uint8_t isi_authmode; /* authentication algorithm */ int8_t isi_rssi; /* receive signal strength */ int8_t isi_noise; /* noise floor */ - uint8_t isi_capinfo; /* capabilities */ + uint8_t isi_capinfo; /* deprecated */ uint8_t isi_erp; /* ERP element */ uint8_t isi_macaddr[IEEE80211_ADDR_LEN]; uint8_t isi_nrates; @@ -358,6 +358,7 @@ uint16_t isi_txseqs[IEEE80211_TID_SIZE];/* tx seq #/TID */ uint16_t isi_rxseqs[IEEE80211_TID_SIZE];/* rx seq#/TID */ uint16_t isi_inact; /* inactivity timer */ + uint16_t isi_capinfo2; /* capabilities */ /* XXX frag state? */ /* variable length IE data */ }; @@ -531,12 +532,13 @@ int8_t isr_noise; int8_t isr_rssi; uint8_t isr_intval; /* beacon interval */ - uint8_t isr_capinfo; /* capabilities */ + uint8_t isr_capinfo; /* deprecated */ uint8_t isr_erp; /* ERP element */ uint8_t isr_bssid[IEEE80211_ADDR_LEN]; uint8_t isr_nrates; uint8_t isr_rates[IEEE80211_RATE_MAXSIZE]; uint8_t isr_ssid_len; /* SSID length */ + uint16_t isr_capinfo2; /* capabilities */ /* variable length SSID followed by IE data */ }; ==== //depot/projects/wifi/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#10 (text+ko) ==== @@ -641,7 +641,7 @@ wsr->noise = sr->isr_noise; wsr->qual = sr->isr_rssi; wsr->level = 0; /* XXX? */ - wsr->caps = sr->isr_capinfo; + wsr->caps = sr->isr_capinfo2; wsr->maxrate = getmaxrate(sr->isr_rates, sr->isr_nrates); vp = ((u_int8_t *)sr) + sr->isr_ie_off; memcpy(wsr->ssid, vp, sr->isr_ssid_len); From owner-p4-projects@FreeBSD.ORG Sat Jan 19 09:04:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0971F16A41B; Sat, 19 Jan 2008 09:04:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A698416A417 for ; Sat, 19 Jan 2008 09:04:54 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8820413C467 for ; Sat, 19 Jan 2008 09:04:54 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0J94si4008621 for ; Sat, 19 Jan 2008 09:04:54 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0J94s46008618 for perforce@freebsd.org; Sat, 19 Jan 2008 09:04:54 GMT (envelope-from peter-gmail@wemm.org) Date: Sat, 19 Jan 2008 09:04:54 GMT Message-Id: <200801190904.m0J94s46008618@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 133645 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 09:04:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=133645 Change 133645 by peter@peter_overcee on 2008/01/19 09:04:08 Add sysctl to turn off fsync Affected files ... .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#78 edit Differences ... ==== //depot/projects/hammer/sys/kern/vfs_syscalls.c#78 (text+ko) ==== @@ -3216,6 +3216,8 @@ } #endif +static int nofsync = 0; +SYSCTL_INT(_debug, OID_AUTO, nofsync, CTLFLAG_RW, &nofsync, 0, ""); /* * Sync an open file. */ @@ -3238,6 +3240,8 @@ int error; AUDIT_ARG(fd, uap->fd); + if (nofsync) + return (0); if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); vp = fp->f_vnode; From owner-p4-projects@FreeBSD.ORG Sat Jan 19 09:13:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C40816A421; Sat, 19 Jan 2008 09:13:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E56D516A417 for ; Sat, 19 Jan 2008 09:13:02 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C76E213C465 for ; Sat, 19 Jan 2008 09:13:02 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0J9D2kB008990 for ; Sat, 19 Jan 2008 09:13:02 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0J9D2bt008987 for perforce@freebsd.org; Sat, 19 Jan 2008 09:13:02 GMT (envelope-from scottl@freebsd.org) Date: Sat, 19 Jan 2008 09:13:02 GMT Message-Id: <200801190913.m0J9D2bt008987@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 133646 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 09:13:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=133646 Change 133646 by scottl@scottl-ix on 2008/01/19 09:12:20 Don't spam bp->bio_data while doing a re-aligned I/O operation. For reasons I don't understand, it causes problems during writes, but not during reads. Affected files ... .. //depot/projects/xen31-xenbus/sys/dev/xen/blkfront/blkfront.c#3 edit Differences ... ==== //depot/projects/xen31-xenbus/sys/dev/xen/blkfront/blkfront.c#3 (text+ko) ==== @@ -656,6 +656,7 @@ */ static int blkif_queue_request(struct bio *bp) { + caddr_t alignbuf; unsigned long buffer_ma; blkif_request_t *ring_req; unsigned long id; @@ -683,16 +684,18 @@ PAGE_SIZE; caddr_t newbuf = malloc(bp->bio_bcount + align, M_DEVBUF, M_NOWAIT); - caddr_t alignbuf = (char *)roundup2((u_long)newbuf, align); + + alignbuf = (char *)roundup2((u_long)newbuf, align); /* save a copy of the current buffer */ - bp->bio_driver1 = bp->bio_data; + bp->bio_driver1 = newbuf; + bp->bio_driver2 = alignbuf; /* Copy the data for a write */ if (bp->bio_cmd == BIO_WRITE) bcopy(bp->bio_data, alignbuf, bp->bio_bcount); - bp->bio_data = alignbuf; - } + } else + alignbuf = bp->bio_data; /* Fill out a communications ring structure. */ ring_req = RING_GET_REQUEST(&info->ring, @@ -711,7 +714,7 @@ * chaining is not supported. */ - buffer_ma = vtomach(bp->bio_data); + buffer_ma = vtomach(alignbuf); fsect = (buffer_ma & PAGE_MASK) >> XBD_SECTOR_SHFT; lsect = fsect + (bp->bio_bcount >> XBD_SECTOR_SHFT) - 1; /* install a grant reference. */ @@ -823,14 +826,15 @@ switch (bret->operation) { case BLKIF_OP_READ: /* had an unaligned buffer that needs to be copied */ - if (bp->bio_driver1) - bcopy(bp->bio_data, bp->bio_driver1, bp->bio_bcount); + if (bp->bio_driver1) { + bcopy(bp->bio_driver2, bp->bio_data, bp->bio_bcount); + bp->bio_driver1 = NULL; + } case BLKIF_OP_WRITE: /* free the copy buffer */ if (bp->bio_driver1) { - free(bp->bio_data, M_DEVBUF); - bp->bio_data = bp->bio_driver1; + free(bp->bio_driver1, M_DEVBUF); bp->bio_driver1 = NULL; } From owner-p4-projects@FreeBSD.ORG Sat Jan 19 09:15:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DEBF816A468; Sat, 19 Jan 2008 09:15:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A46C516A41B for ; Sat, 19 Jan 2008 09:15:05 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6E10E13C4DD for ; Sat, 19 Jan 2008 09:15:05 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0J9F5Nj009952 for ; Sat, 19 Jan 2008 09:15:05 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0J9F5Xb009949 for perforce@freebsd.org; Sat, 19 Jan 2008 09:15:05 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 19 Jan 2008 09:15:05 GMT Message-Id: <200801190915.m0J9F5Xb009949@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 133647 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 09:15:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=133647 Change 133647 by hselasky@hselasky_laptop001 on 2008/01/19 09:14:17 Dummy commit. The changes has already been committed. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/README#34 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/README#34 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sat Jan 19 09:16:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E720C16A46B; Sat, 19 Jan 2008 09:16:06 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AB2F516A418 for ; Sat, 19 Jan 2008 09:16:06 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6EF5D13C448 for ; Sat, 19 Jan 2008 09:16:06 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0J9G6W3010010 for ; Sat, 19 Jan 2008 09:16:06 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0J9G67C010007 for perforce@freebsd.org; Sat, 19 Jan 2008 09:16:06 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 19 Jan 2008 09:16:06 GMT Message-Id: <200801190916.m0J9G67C010007@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 133648 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 09:16:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=133648 Change 133648 by hselasky@hselasky_laptop001 on 2008/01/19 09:15:57 Dummy commit. The changes have already been committed. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/README#35 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/README#35 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sat Jan 19 09:52:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2ACE16A469; Sat, 19 Jan 2008 09:52:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6EB6016A418 for ; Sat, 19 Jan 2008 09:52:48 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4E7E113C457 for ; Sat, 19 Jan 2008 09:52:48 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0J9qmOg011392 for ; Sat, 19 Jan 2008 09:52:48 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0J9qilw011373 for perforce@freebsd.org; Sat, 19 Jan 2008 09:52:44 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 19 Jan 2008 09:52:44 GMT Message-Id: <200801190952.m0J9qilw011373@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 133649 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 09:52:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=133649 Change 133649 by rdivacky@rdivacky_witten on 2008/01/19 09:52:38 IFC Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/include/unistd.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/lib/libc/gen/Makefile.inc#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/conf/GENERIC#8 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/ieeefp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linprocfs/linprocfs.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#21 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_getcwd.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_stats.c#13 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/pecoff/imgact_pecoff.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/svr4/imgact_svr4.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/svr4/svr4_fcntl.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/svr4/svr4_misc.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/NOTES#11 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files#13 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/options#11 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ddb/db_textdump.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/coretemp/coretemp.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_t3_cpl.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_adapter.h#8 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_main.c#8 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_sge.c#8 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/sys/mvec.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/sys/uipc_mvec.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/fdc/fdc.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/hwpmc/hwpmc_mod.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ichwd/ichwd.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ichwd/ichwd.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/iir/iir.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/md/md.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ppbus/ppbconf.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/streams/streams.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ehci.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_rum.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_udav.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_zyd.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/cd9660/cd9660_lookup.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/coda/coda_vfsops.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/devfs/devfs_devs.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/devfs/devfs_vnops.c#8 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/fifofs/fifo_vnops.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/hpfs/hpfs_subr.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/msdosfs/msdosfs_lookup.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/msdosfs/msdosfs_vfsops.c#8 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/ntfs/ntfs_subr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/ntfs/ntfs_vfsops.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/nullfs/null_subr.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/nullfs/null_vfsops.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/portalfs/portal_vfsops.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/procfs/procfs.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/procfs/procfs_map.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/pseudofs/pseudofs_vnops.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/smbfs/smbfs_io.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/smbfs/smbfs_vnops.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_subr.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_vfsops.c#8 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_vnops.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/udf/udf_vnops.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/unionfs/union_subr.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/unionfs/union_vfsops.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/unionfs/union_vnops.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/ext2fs/ext2_lookup.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/ext2fs/fs.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/reiserfs/reiserfs_namei.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/conf/GENERIC#8 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/ibcs2/ibcs2_misc.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/ibcs2/imgact_coff.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/include/ieeefp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/include/pmap.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/imgact_linux.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/conf/GENERIC#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/imgact_aout.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/imgact_elf.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/imgact_gzip.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/init_main.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/init_sysent.c#12 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_alq.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_descrip.c#11 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_event.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_exec.c#19 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_jail.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_ktrace.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_lock.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_proc.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_resource.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_sig.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_synch.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/subr_lock.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/sys_generic.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/sys_pipe.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/sys_socket.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.c#12 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.master#13 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/systrace_args.c#12 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/tty.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/uipc_mqueue.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/uipc_sem.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/uipc_shm.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/uipc_syscalls.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_acl.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_aio.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_bio.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_cache.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_extattr.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_lookup.c#12 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_mount.c#9 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#58 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_vnops.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/frag6.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/icmp6.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6_ifattach.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6_pcb.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6_proto.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6_rmx.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6_src.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ip6_input.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ip6_mroute.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ip6_output.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/mld6.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/nd6.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/nd6_nbr.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/nd6_rtr.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/raw_ip6.c#8 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/udp6_usrreq.c#9 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/nfsclient/nfs_socket.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/nfsclient/nfs_subs.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/nfsserver/nfs_serv.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/nfsserver/nfs_srvsubs.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/opencrypto/cryptodev.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/pc98/conf/GENERIC#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/conf/GENERIC#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit_arg.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit_bsm_klib.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit_worker.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac/mac_framework.h#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac/mac_policy.h#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac/mac_posix_shm.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac/mac_process.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac/mac_syscalls.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac_stub/mac_stub.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac_test/mac_test.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/conf/GENERIC#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/buf.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/fcntl.h#11 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/file.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/lockmgr.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/mbuf.h#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/mman.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/param.h#8 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/proc.h#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.h#12 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.mk#12 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#16 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/sysproto.h#12 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/vnode.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ufs/ffs/ffs_snapshot.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ufs/ufs/ufs_lookup.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ufs/ufs/ufs_quota.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ufs/ufs/ufs_vnops.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/swap_pager.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_contig.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_kern.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_mmap.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_object.c#8 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vnode_pager.c#6 integrate Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/include/unistd.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.80 2006/12/14 21:42:03 pjd Exp $ + * $FreeBSD: src/include/unistd.h,v 1.81 2008/01/10 22:11:20 jhb Exp $ */ #ifndef _UNISTD_H_ @@ -480,6 +480,7 @@ void endusershell(void); int exect(const char *, char * const *, char * const *); int execvP(const char *, const char *, char * const *); +int feature_present(const char *); char *fflagstostr(u_long); int getdomainname(char *, int); int getgrouplist(const char *, gid_t, gid_t *, int *); ==== //depot/projects/soc2007/rdivacky/linux_at/lib/libc/gen/Makefile.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.128 2007/09/28 02:22:56 scf Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.130 2008/01/10 22:11:21 jhb Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -10,7 +10,7 @@ clock.c closedir.c confstr.c \ crypt.c ctermid.c daemon.c devname.c dirname.c disklabel.c \ dlfcn.c dlfunc.c drand48.c erand48.c err.c errlst.c errno.c \ - exec.c fdopendir.c fmtcheck.c fmtmsg.c fnmatch.c \ + exec.c fdopendir.c feature_present.c fmtcheck.c fmtmsg.c fnmatch.c \ fpclassify.c frexp.c fstab.c ftok.c fts.c ftw.c \ getbootfile.c getbsize.c \ getcap.c getcwd.c getdomainname.c getgrent.c getgrouplist.c \ @@ -21,7 +21,7 @@ initgroups.c isatty.c isinf.c isnan.c jrand48.c lcong48.c \ lockf.c lrand48.c mrand48.c nftw.c nice.c \ nlist.c nrand48.c opendir.c \ - pause.c pmadvise.c popen.c posixshm.c pselect.c \ + pause.c pmadvise.c popen.c pselect.c \ psignal.c pw_scan.c pwcache.c \ raise.c readdir.c readpassphrase.c rewinddir.c \ scandir.c seed48.c seekdir.c sem.c semctl.c \ @@ -45,7 +45,8 @@ basename.3 check_utility_compat.3 clock.3 \ confstr.3 ctermid.3 daemon.3 devname.3 directory.3 dirname.3 \ dladdr.3 dlinfo.3 dllockinit.3 dlopen.3 \ - err.3 exec.3 fmtcheck.3 fmtmsg.3 fnmatch.3 fpclassify.3 frexp.3 \ + err.3 exec.3 \ + feature_present.3 fmtcheck.3 fmtmsg.3 fnmatch.3 fpclassify.3 frexp.3 \ ftok.3 fts.3 ftw.3 \ getbootfile.3 getbsize.3 getcap.3 getcontext.3 getcwd.3 \ getdiskbyname.3 getdomainname.3 getfsent.3 \ @@ -59,7 +60,7 @@ raise.3 rand48.3 readpassphrase.3 rfork_thread.3 \ scandir.3 sem_destroy.3 sem_getvalue.3 sem_init.3 \ sem_open.3 sem_post.3 sem_wait.3 \ - setjmp.3 setmode.3 setproctitle.3 shm_open.3 \ + setjmp.3 setmode.3 setproctitle.3 \ siginterrupt.3 signal.3 sigsetops.3 sleep.3 \ statvfs.3 stringlist.3 \ strtofflags.3 sysconf.3 sysctl.3 syslog.3 tcgetpgrp.3 \ @@ -133,7 +134,6 @@ setjmp.3 longjmperr.3 setjmp.3 longjmperror.3 \ setjmp.3 siglongjmp.3 setjmp.3 sigsetjmp.3 MLINKS+=setmode.3 getmode.3 -MLINKS+=shm_open.3 shm_unlink.3 MLINKS+=sigsetops.3 sigaddset.3 sigsetops.3 sigdelset.3 \ sigsetops.3 sigemptyset.3 sigsetops.3 sigfillset.3 \ sigsetops.3 sigismember.3 ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/pmap.c#8 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.601 2008/01/03 07:34:32 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.603 2008/01/08 08:30:30 alc Exp $"); /* * Manages physical address maps. @@ -614,7 +614,6 @@ { TAILQ_INIT(&m->md.pv_list); - m->md.pv_list_count = 0; } /* @@ -1699,7 +1698,6 @@ TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); - m->md.pv_list_count--; free_pv_entry(pmap, pv); if (pmap != locked_pmap) PMAP_UNLOCK(pmap); @@ -1847,7 +1845,6 @@ } KASSERT(pv != NULL, ("pmap_remove_entry: pv not found")); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count--; if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); free_pv_entry(pmap, pv); @@ -1867,7 +1864,6 @@ pv = get_pv_entry(pmap, FALSE); pv->pv_va = va; TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count++; } /* @@ -1884,7 +1880,6 @@ (pv = get_pv_entry(pmap, TRUE)) != NULL) { pv->pv_va = va; TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count++; return (TRUE); } else return (FALSE); @@ -2080,15 +2075,8 @@ pd_entry_t ptepde; vm_page_t free; -#if defined(PMAP_DIAGNOSTIC) - /* - * XXX This makes pmap_remove_all() illegal for non-managed pages! - */ - if (m->flags & PG_FICTITIOUS) { - panic("pmap_remove_all: illegal for unmanaged page, va: 0x%lx", - VM_PAGE_TO_PHYS(m)); - } -#endif + KASSERT((m->flags & PG_FICTITIOUS) == 0, + ("pmap_remove_all: page %p is fictitious", m)); mtx_assert(&vm_page_queue_mtx, MA_OWNED); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { pmap = PV_PMAP(pv); @@ -2118,7 +2106,6 @@ pmap_invalidate_page(pmap, pv->pv_va); pmap_free_zero_pages(free); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count--; free_pv_entry(pmap, pv); PMAP_UNLOCK(pmap); } @@ -3045,7 +3032,6 @@ PV_STAT(pv_entry_spare++); pv_entry_count--; pc->pc_map[field] |= bitmask; - m->md.pv_list_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/conf/GENERIC#8 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.490 2007/12/15 00:56:16 scottl Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.491 2008/01/07 21:40:09 jhb Exp $ cpu HAMMER ident GENERIC @@ -52,6 +52,7 @@ options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options COMPAT_FREEBSD5 # Compatible with FreeBSD5 options COMPAT_FREEBSD6 # Compatible with FreeBSD6 +options COMPAT_FREEBSD7 # Compatible with FreeBSD7 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/ieeefp.h#2 (text+ko) ==== @@ -32,32 +32,33 @@ * SUCH DAMAGE. * * from: @(#) ieeefp.h 1.0 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/amd64/include/ieeefp.h,v 1.14 2005/04/12 23:12:00 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/ieeefp.h,v 1.19 2008/01/11 17:11:32 bde Exp $ */ +#ifndef _MACHINE_IEEEFP_H_ +#define _MACHINE_IEEEFP_H_ + /* - * IEEE floating point type and constant definitions. + * IEEE floating point type, constant and function definitions. + * XXX: {FP,SSE}*FLD and {FP,SSE}*OFF are undocumented pollution. */ -#ifndef _MACHINE_IEEEFP_H_ -#define _MACHINE_IEEEFP_H_ - #ifndef _SYS_CDEFS_H_ #error this file needs sys/cdefs.h as a prerequisite #endif /* - * FP rounding modes + * Rounding modes. */ typedef enum { FP_RN=0, /* round to nearest */ - FP_RM, /* round down to minus infinity */ - FP_RP, /* round up to plus infinity */ + FP_RM, /* round down towards minus infinity */ + FP_RP, /* round up towards plus infinity */ FP_RZ /* truncate */ } fp_rnd_t; /* - * FP precision modes + * Precision (i.e., rounding precision) modes. */ typedef enum { FP_PS=0, /* 24 bit (single-precision) */ @@ -69,7 +70,7 @@ #define fp_except_t int /* - * FP exception masks + * Exception bit masks. */ #define FP_X_INV 0x01 /* invalid operation */ #define FP_X_DNML 0x02 /* denormal */ @@ -80,23 +81,19 @@ #define FP_X_STK 0x40 /* stack fault */ /* - * FP registers + * FPU control word bit-field masks. */ -#define FP_MSKS_REG 0 /* exception masks */ -#define FP_PRC_REG 0 /* precision */ -#define FP_RND_REG 0 /* direction */ -#define FP_STKY_REG 1 /* sticky flags */ +#define FP_MSKS_FLD 0x3f /* exception masks field */ +#define FP_PRC_FLD 0x300 /* precision control field */ +#define FP_RND_FLD 0xc00 /* rounding control field */ /* - * FP register bit field masks + * FPU status word bit-field masks. */ -#define FP_MSKS_FLD 0x3f /* exception masks field */ -#define FP_PRC_FLD 0x300 /* precision control field */ -#define FP_RND_FLD 0xc00 /* round control field */ #define FP_STKY_FLD 0x3f /* sticky flags field */ /* - * SSE mxcsr register bit field masks + * SSE mxcsr register bit-field masks. */ #define SSE_STKY_FLD 0x3f /* exception flags */ #define SSE_DAZ_FLD 0x40 /* Denormals are zero */ @@ -105,15 +102,19 @@ #define SSE_FZ_FLD 0x8000 /* flush to zero on underflow */ /* - * FP register bit field offsets + * FPU control word bit-field offsets (shift counts). */ #define FP_MSKS_OFF 0 /* exception masks offset */ #define FP_PRC_OFF 8 /* precision control offset */ -#define FP_RND_OFF 10 /* round control offset */ +#define FP_RND_OFF 10 /* rounding control offset */ + +/* + * FPU status word bit-field offsets (shift counts). + */ #define FP_STKY_OFF 0 /* sticky flags offset */ /* - * SSE mxcsr register bit field offsets + * SSE mxcsr register bit-field offsets (shift counts). */ #define SSE_STKY_OFF 0 /* exception flags offset */ #define SSE_DAZ_OFF 6 /* DAZ exception mask offset */ @@ -121,18 +122,45 @@ #define SSE_RND_OFF 13 /* rounding control offset */ #define SSE_FZ_OFF 15 /* flush to zero offset */ -#if defined(__GNUCLIKE_ASM) && defined(__CC_SUPPORTS___INLINE__) \ - && !defined(__cplusplus) +#ifdef __GNUCLIKE_ASM +#define __fldcw(addr) __asm __volatile("fldcw %0" : : "m" (*(addr))) #define __fldenv(addr) __asm __volatile("fldenv %0" : : "m" (*(addr))) +#define __fnstcw(addr) __asm __volatile("fnstcw %0" : "=m" (*(addr))) #define __fnstenv(addr) __asm __volatile("fnstenv %0" : "=m" (*(addr))) -#define __fldcw(addr) __asm __volatile("fldcw %0" : : "m" (*(addr))) -#define __fnstcw(addr) __asm __volatile("fnstcw %0" : "=m" (*(addr))) #define __fnstsw(addr) __asm __volatile("fnstsw %0" : "=m" (*(addr))) #define __ldmxcsr(addr) __asm __volatile("ldmxcsr %0" : : "m" (*(addr))) #define __stmxcsr(addr) __asm __volatile("stmxcsr %0" : "=m" (*(addr))) /* + * Load the control word. Be careful not to trap if there is a currently + * unmasked exception (ones that will become freshly unmasked are not a + * problem). This case must be handled by a save/restore of the + * environment or even of the full x87 state. Accessing the environment + * is very inefficient, so only do it when necessary. + */ +static __inline void +__fnldcw(unsigned short _cw, unsigned short _newcw) +{ + struct { + unsigned _cw; + unsigned _other[6]; + } _env; + unsigned short _sw; + + if ((_cw & FP_MSKS_FLD) != FP_MSKS_FLD) { + __fnstsw(&_sw); + if (((_sw & ~_cw) & FP_STKY_FLD) != 0) { + __fnstenv(&_env); + _env._cw = _newcw; + __fldenv(&_env); + return; + } + } + __fldcw(&_newcw); +} + +/* * General notes about conflicting SSE vs FP status bits. * This code assumes that software will not fiddle with the control * bits of the SSE and x87 in such a way to get them out of sync and @@ -143,28 +171,27 @@ * merge the two together. I think. */ -/* Set rounding control */ -static __inline__ fp_rnd_t +static __inline fp_rnd_t __fpgetround(void) { unsigned short _cw; __fnstcw(&_cw); - return ((_cw & FP_RND_FLD) >> FP_RND_OFF); + return ((fp_rnd_t)((_cw & FP_RND_FLD) >> FP_RND_OFF)); } -static __inline__ fp_rnd_t +static __inline fp_rnd_t __fpsetround(fp_rnd_t _m) { - unsigned short _cw; - unsigned int _mxcsr; fp_rnd_t _p; + unsigned _mxcsr; + unsigned short _cw, _newcw; __fnstcw(&_cw); - _p = (_cw & FP_RND_FLD) >> FP_RND_OFF; - _cw &= ~FP_RND_FLD; - _cw |= (_m << FP_RND_OFF) & FP_RND_FLD; - __fldcw(&_cw); + _p = (fp_rnd_t)((_cw & FP_RND_FLD) >> FP_RND_OFF); + _newcw = _cw & ~FP_RND_FLD; + _newcw |= (_m << FP_RND_OFF) & FP_RND_FLD; + __fnldcw(_cw, _newcw); __stmxcsr(&_mxcsr); _mxcsr &= ~SSE_RND_FLD; _mxcsr |= (_m << SSE_RND_OFF) & SSE_RND_FLD; @@ -173,108 +200,104 @@ } /* - * Set precision for fadd/fsub/fsqrt etc x87 instructions + * Get or set the rounding precision for x87 arithmetic operations. * There is no equivalent SSE mode or control. */ -static __inline__ fp_prec_t + +static __inline fp_prec_t __fpgetprec(void) { unsigned short _cw; __fnstcw(&_cw); - return ((_cw & FP_PRC_FLD) >> FP_PRC_OFF); + return ((fp_prec_t)((_cw & FP_PRC_FLD) >> FP_PRC_OFF)); } -static __inline__ fp_prec_t -__fpsetprec(fp_rnd_t _m) +static __inline fp_prec_t +__fpsetprec(fp_prec_t _m) { - unsigned short _cw; fp_prec_t _p; + unsigned short _cw, _newcw; __fnstcw(&_cw); - _p = (_cw & FP_PRC_FLD) >> FP_PRC_OFF; - _cw &= ~FP_PRC_FLD; - _cw |= (_m << FP_PRC_OFF) & FP_PRC_FLD; - __fldcw(&_cw); + _p = (fp_prec_t)((_cw & FP_PRC_FLD) >> FP_PRC_OFF); + _newcw = _cw & ~FP_PRC_FLD; + _newcw |= (_m << FP_PRC_OFF) & FP_PRC_FLD; + __fnldcw(_cw, _newcw); return (_p); } /* - * Look at the exception masks - * Note that x87 masks are inverse of the fp*() functions - * API. ie: mask = 1 means disable for x87 and SSE, but - * for the fp*() api, mask = 1 means enabled. + * Get or set the exception mask. + * Note that the x87 mask bits are inverted by the API -- a mask bit of 1 + * means disable for x87 and SSE, but for fp*mask() it means enable. */ -static __inline__ fp_except_t + +static __inline fp_except_t __fpgetmask(void) { unsigned short _cw; __fnstcw(&_cw); - return ((~_cw) & FP_MSKS_FLD); + return ((~_cw & FP_MSKS_FLD) >> FP_MSKS_OFF); } -static __inline__ fp_except_t +static __inline fp_except_t __fpsetmask(fp_except_t _m) { - unsigned short _cw; - unsigned int _mxcsr; fp_except_t _p; + unsigned _mxcsr; + unsigned short _cw, _newcw; __fnstcw(&_cw); - _p = (~_cw) & FP_MSKS_FLD; - _cw &= ~FP_MSKS_FLD; - _cw |= (~_m) & FP_MSKS_FLD; - __fldcw(&_cw); + _p = (~_cw & FP_MSKS_FLD) >> FP_MSKS_OFF; + _newcw = _cw & ~FP_MSKS_FLD; + _newcw |= (~_m << FP_MSKS_OFF) & FP_MSKS_FLD; + __fnldcw(_cw, _newcw); __stmxcsr(&_mxcsr); /* XXX should we clear non-ieee SSE_DAZ_FLD and SSE_FZ_FLD ? */ _mxcsr &= ~SSE_MSKS_FLD; - _mxcsr |= ((~_m) << SSE_MSKS_OFF) & SSE_MSKS_FLD; + _mxcsr |= (~_m << SSE_MSKS_OFF) & SSE_MSKS_FLD; __ldmxcsr(&_mxcsr); return (_p); } -/* See which sticky exceptions are pending, and reset them */ -static __inline__ fp_except_t +static __inline fp_except_t __fpgetsticky(void) { + unsigned _ex, _mxcsr; unsigned short _sw; - unsigned int _mxcsr; - fp_except_t _ex; __fnstsw(&_sw); - _ex = _sw & FP_STKY_FLD; + _ex = (_sw & FP_STKY_FLD) >> FP_STKY_OFF; __stmxcsr(&_mxcsr); - _ex |= _mxcsr & SSE_STKY_FLD; - return (_ex); + _ex |= (_mxcsr & SSE_STKY_FLD) >> SSE_STKY_OFF; + return ((fp_except_t)_ex); } -#endif /* __GNUCLIKE_ASM && __CC_SUPPORTS___INLINE__ && !__cplusplus */ +#endif /* __GNUCLIKE_ASM */ -#if !defined(__IEEEFP_NOINLINES__) && !defined(__cplusplus) \ - && defined(__GNUCLIKE_ASM) && defined(__CC_SUPPORTS___INLINE__) +#if !defined(__IEEEFP_NOINLINES__) && defined(__GNUCLIKE_ASM) +#define fpgetmask() __fpgetmask() +#define fpgetprec() __fpgetprec() #define fpgetround() __fpgetround() -#define fpsetround(_m) __fpsetround(_m) -#define fpgetprec() __fpgetprec() -#define fpsetprec(_m) __fpsetprec(_m) -#define fpgetmask() __fpgetmask() -#define fpsetmask(_m) __fpsetmask(_m) #define fpgetsticky() __fpgetsticky() +#define fpsetmask(m) __fpsetmask(m) +#define fpsetprec(m) __fpsetprec(m) +#define fpsetround(m) __fpsetround(m) /* Suppress prototypes in the MI header. */ #define _IEEEFP_INLINED_ 1 -#else /* !__IEEEFP_NOINLINES__ && !__cplusplus && __GNUCLIKE_ASM - && __CC_SUPPORTS___INLINE__ */ +#else /* !(!__IEEEFP_NOINLINES__ && __GNUCLIKE_ASM) */ -/* Augment the userland declarations */ +/* Augment the userland declarations. */ __BEGIN_DECLS -extern fp_prec_t fpgetprec(void); -extern fp_prec_t fpsetprec(fp_prec_t); +fp_prec_t fpgetprec(void); +fp_prec_t fpsetprec(fp_prec_t); __END_DECLS -#endif /* !__IEEEFP_NOINLINES__ && !__cplusplus && __GNUCLIKE_ASM - && __CC_SUPPORTS___INLINE__ */ +#endif /* !__IEEEFP_NOINLINES__ && __GNUCLIKE_ASM */ #endif /* !_MACHINE_IEEEFP_H_ */ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/pmap.h#2 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.138 2006/12/05 11:31:33 ru Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.139 2008/01/06 18:51:04 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -231,7 +231,6 @@ struct pv_chunk; struct md_page { - int pv_list_count; TAILQ_HEAD(,pv_entry) pv_list; }; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/if_ate.c#4 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.22 2007/12/16 12:57:12 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.23 2008/01/07 00:36:09 cognet Exp $"); #include #include @@ -191,7 +191,7 @@ callout_init_mtx(&sc->tick_ch, &sc->sc_mtx, 0); if ((err = ate_get_mac(sc, eaddr)) != 0) { - device_printf(dev, "No MAC address set"); + device_printf(dev, "No MAC address set\n"); goto out; } ate_set_mac(sc, eaddr); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_da.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.225 2007/12/11 06:41:38 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.226 2008/01/12 19:24:55 maxim Exp $"); #include @@ -477,7 +477,7 @@ * PR: usb/96546 */ {T_DIRECT, SIP_MEDIA_REMOVABLE, "EM732X", "MP3 Player*", - "1.0"}, /*quirks*/ DA_Q_NO_SYNC_CACHE + "1.00"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, { /* ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_proto.h#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.79 2007/12/06 23:37:26 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.93 2007/12/06 23:36:57 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.80 2008/01/08 22:01:25 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.94 2008/01/08 21:58:14 jhb Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_syscall.h#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.77 2007/12/06 23:37:26 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.93 2007/12/06 23:36:57 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.78 2008/01/08 22:01:25 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.94 2008/01/08 21:58:14 jhb Exp */ #define FREEBSD32_SYS_syscall 0 @@ -338,4 +338,6 @@ #define FREEBSD32_SYS_freebsd32_truncate 479 #define FREEBSD32_SYS_freebsd32_ftruncate 480 #define FREEBSD32_SYS_thr_kill2 481 -#define FREEBSD32_SYS_MAXSYSCALL 482 +#define FREEBSD32_SYS_shm_open 482 +#define FREEBSD32_SYS_shm_unlink 483 +#define FREEBSD32_SYS_MAXSYSCALL 484 ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_syscalls.c#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.68 2007/12/06 23:37:26 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.93 2007/12/06 23:36:57 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.69 2008/01/08 22:01:25 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.94 2008/01/08 21:58:14 jhb Exp */ const char *freebsd32_syscallnames[] = { @@ -489,4 +489,6 @@ "freebsd32_truncate", /* 479 = freebsd32_truncate */ "freebsd32_ftruncate", /* 480 = freebsd32_ftruncate */ "thr_kill2", /* 481 = thr_kill2 */ + "shm_open", /* 482 = shm_open */ + "shm_unlink", /* 483 = shm_unlink */ }; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_sysent.c#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.78 2007/12/06 23:37:26 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.93 2007/12/06 23:36:57 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.79 2008/01/08 22:01:25 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.94 2008/01/08 21:58:14 jhb Exp */ #include "opt_compat.h" @@ -521,4 +521,6 @@ { AS(freebsd32_truncate_args), (sy_call_t *)freebsd32_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 479 = freebsd32_truncate */ { AS(freebsd32_ftruncate_args), (sy_call_t *)freebsd32_ftruncate, AUE_FTRUNCATE, NULL, 0, 0 }, /* 480 = freebsd32_ftruncate */ { AS(thr_kill2_args), (sy_call_t *)thr_kill2, AUE_KILL, NULL, 0, 0 }, /* 481 = thr_kill2 */ + { AS(shm_open_args), (sy_call_t *)shm_open, AUE_NULL, NULL, 0, 0 }, /* 482 = shm_open */ + { AS(shm_unlink_args), (sy_call_t *)shm_unlink, AUE_NULL, NULL, 0, 0 }, /* 483 = shm_unlink */ }; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/syscalls.master#6 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.93 2007/12/06 23:36:57 jhb Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.94 2008/01/08 21:58:14 jhb Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -796,3 +796,6 @@ 480 AUE_FTRUNCATE STD { int freebsd32_ftruncate(int fd, \ u_int32_t lengthlo, u_int32_t lengthhi); } 481 AUE_KILL NOPROTO { int thr_kill2(pid_t pid, long id, int sig); } +482 AUE_NULL NOPROTO { int shm_open(const char *path, int flags, \ + mode_t mode); } +483 AUE_NULL NOPROTO { int shm_unlink(const char *path); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linprocfs/linprocfs.c#6 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.117 2007/11/29 06:34:29 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.118 2008/01/10 01:10:41 attilio Exp $"); #include #include @@ -934,7 +934,7 @@ if (vp) { vn_fullpath(td, vp, &name, &freename); locked = VFS_LOCK_GIANT(vp->v_mount); - vn_lock(vp, LK_SHARED | LK_RETRY, td); + vn_lock(vp, LK_SHARED | LK_RETRY); VOP_GETATTR(vp, &vat, td->td_ucred, td); ino = vat.va_fileid; vput(vp); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#21 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.107 2007/12/29 14:28:01 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.108 2008/01/10 01:10:41 attilio Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -367,7 +367,7 @@ buflen = max(LINUX_DIRBLKSIZ, nbytes); buflen = min(buflen, MAXBSIZE); buf = malloc(buflen, M_TEMP, M_WAITOK); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); again: aiov.iov_base = buf; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_getcwd.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.28 2007/10/24 19:03:52 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.29 2008/01/10 01:10:42 attilio Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -325,7 +325,7 @@ * uvp is either NULL, or locked and held. */ - error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY, td); + error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY); if (error != 0) panic("vn_lock LK_RETRY returned error %d", error); if (bufp) @@ -378,7 +378,7 @@ goto out; } VREF(lvp); - error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY, td); + error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY); if (error != 0) panic("vn_lock LK_RETRY returned %d", error); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_stats.c#13 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.89 2007/12/29 14:25:29 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.90 2008/01/05 12:36:35 kib Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -291,13 +291,15 @@ #ifdef DEBUG if (ldebug(stat)) - printf(ARGS(stat, "%s, *"), args->path); + printf(ARGS(stat, "%s, *"), path); #endif error = kern_stat(td, path, UIO_SYSSPACE, &buf); + if (error) { + LFREEPATH(path); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 19 16:14:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7669216A419; Sat, 19 Jan 2008 16:14:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3978516A417 for ; Sat, 19 Jan 2008 16:14:27 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3B97813C465 for ; Sat, 19 Jan 2008 16:14:27 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0JGERqm051903 for ; Sat, 19 Jan 2008 16:14:27 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0JGERPj051900 for perforce@freebsd.org; Sat, 19 Jan 2008 16:14:27 GMT (envelope-from scottl@freebsd.org) Date: Sat, 19 Jan 2008 16:14:27 GMT Message-Id: <200801191614.m0JGERPj051900@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 133661 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 16:14:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=133661 Change 133661 by scottl@scottl-ix on 2008/01/19 16:13:55 Fix a memory leak created by the last fix. Affected files ... .. //depot/projects/xen31-xenbus/sys/dev/xen/blkfront/blkfront.c#4 edit Differences ... ==== //depot/projects/xen31-xenbus/sys/dev/xen/blkfront/blkfront.c#4 (text+ko) ==== @@ -826,10 +826,9 @@ switch (bret->operation) { case BLKIF_OP_READ: /* had an unaligned buffer that needs to be copied */ - if (bp->bio_driver1) { + if (bp->bio_driver1) bcopy(bp->bio_driver2, bp->bio_data, bp->bio_bcount); - bp->bio_driver1 = NULL; - } + /* FALLTHROUGH */ case BLKIF_OP_WRITE: /* free the copy buffer */ From owner-p4-projects@FreeBSD.ORG Sat Jan 19 16:25:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2609416A46D; Sat, 19 Jan 2008 16:25:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DFF8B16A418 for ; Sat, 19 Jan 2008 16:25:38 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E219013C447 for ; Sat, 19 Jan 2008 16:25:38 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0JGPcVo052412 for ; Sat, 19 Jan 2008 16:25:38 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0JGPc69052408 for perforce@freebsd.org; Sat, 19 Jan 2008 16:25:38 GMT (envelope-from scottl@freebsd.org) Date: Sat, 19 Jan 2008 16:25:38 GMT Message-Id: <200801191625.m0JGPc69052408@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 133662 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 16:25:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=133662 Change 133662 by scottl@scottl-ix on 2008/01/19 16:25:13 Merge back the blkfront fixes. I'm still not exactly sure why these make a difference, and due to the nature of the corruption it's hard to write a good test case to confirm the behavior. However, there is evidence that without these changes, sometimes data blocks would simply not get written to disk. Affected files ... .. //depot/projects/xen31/sys/dev/xen/blkfront/blkfront.c#13 integrate Differences ... ==== //depot/projects/xen31/sys/dev/xen/blkfront/blkfront.c#13 (text+ko) ==== @@ -656,6 +656,7 @@ */ static int blkif_queue_request(struct bio *bp) { + caddr_t alignbuf; unsigned long buffer_ma; blkif_request_t *ring_req; unsigned long id; @@ -683,16 +684,18 @@ PAGE_SIZE; caddr_t newbuf = malloc(bp->bio_bcount + align, M_DEVBUF, M_NOWAIT); - caddr_t alignbuf = (char *)roundup2((u_long)newbuf, align); + + alignbuf = (char *)roundup2((u_long)newbuf, align); /* save a copy of the current buffer */ - bp->bio_driver1 = bp->bio_data; + bp->bio_driver1 = newbuf; + bp->bio_driver2 = alignbuf; /* Copy the data for a write */ if (bp->bio_cmd == BIO_WRITE) bcopy(bp->bio_data, alignbuf, bp->bio_bcount); - bp->bio_data = alignbuf; - } + } else + alignbuf = bp->bio_data; /* Fill out a communications ring structure. */ ring_req = RING_GET_REQUEST(&info->ring, @@ -711,7 +714,7 @@ * chaining is not supported. */ - buffer_ma = vtomach(bp->bio_data); + buffer_ma = vtomach(alignbuf); fsect = (buffer_ma & PAGE_MASK) >> XBD_SECTOR_SHFT; lsect = fsect + (bp->bio_bcount >> XBD_SECTOR_SHFT) - 1; /* install a grant reference. */ @@ -824,13 +827,13 @@ case BLKIF_OP_READ: /* had an unaligned buffer that needs to be copied */ if (bp->bio_driver1) - bcopy(bp->bio_data, bp->bio_driver1, bp->bio_bcount); + bcopy(bp->bio_driver2, bp->bio_data, bp->bio_bcount); + /* FALLTHROUGH */ case BLKIF_OP_WRITE: /* free the copy buffer */ if (bp->bio_driver1) { - free(bp->bio_data, M_DEVBUF); - bp->bio_data = bp->bio_driver1; + free(bp->bio_driver1, M_DEVBUF); bp->bio_driver1 = NULL; } From owner-p4-projects@FreeBSD.ORG Sat Jan 19 19:21:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D1C7916A46D; Sat, 19 Jan 2008 19:21:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7C76D16A468; Sat, 19 Jan 2008 19:21:58 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 54EAA13C478; Sat, 19 Jan 2008 19:21:58 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.1/8.14.1) with ESMTP id m0JJI7xo081233; Sat, 19 Jan 2008 12:18:07 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sat, 19 Jan 2008 12:21:00 -0700 (MST) Message-Id: <20080119.122100.-1947363520.imp@bsdimp.com> To: bms@FreeBSD.org From: "M. Warner Losh" In-Reply-To: <4790B2CE.3000707@FreeBSD.org> References: <200801180532.m0I5WSsY047069@repoman.freebsd.org> <4790B2CE.3000707@FreeBSD.org> X-Mailer: Mew version 5.2 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 133523 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 19:21:59 -0000 In message: <4790B2CE.3000707@FreeBSD.org> "Bruce M. Simpson" writes: : Warner Losh wrote: : > http://perforce.freebsd.org/chv.cgi?CH=133523 : > : > Change 133523 by imp@imp_paco-paco on 2008/01/18 05:31:51 : > : > Go ahead and integrate my cross build patches here so that : > I can build cross compilers. : > : > : : What's LIBC= for? MAC OS X build. Likely an oversight on my part. : It looks like you added install targets for xdev, does this mean we can : build cross compilers and install them w/o having to run them from the : top level src makefile targets? Yes. : It would be great if there were something to simplify the means of : building cross toolchains similar to Gentoo's crossdev. : : There are many devices out there which FreeBSD could potentially run on : -- however the vendors ship them with Linux, and being able to get e.g. : cross builds of mtd-utils to run on them would be very helpful for : opening them up. Yup. That's the idea. The other part of the ideas I've had was to have buildworld behave differently when CROSS_COMPILER=xxxx-ytyyyy- is set. Have it just build w/o building the tools to build freebsd (at least not the compiler/linker parts). Warner From owner-p4-projects@FreeBSD.ORG Sat Jan 19 20:38:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B90416A41A; Sat, 19 Jan 2008 20:38:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0FA9116A418 for ; Sat, 19 Jan 2008 20:38:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1493C13C46A for ; Sat, 19 Jan 2008 20:38:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0JKc5Bq082297 for ; Sat, 19 Jan 2008 20:38:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0JKc5g3082294 for perforce@freebsd.org; Sat, 19 Jan 2008 20:38:05 GMT (envelope-from jb@freebsd.org) Date: Sat, 19 Jan 2008 20:38:05 GMT Message-Id: <200801192038.m0JKc5g3082294@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133677 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 20:38:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=133677 Change 133677 by jb@jb_freebsd1 on 2008/01/19 20:38:03 IFC Affected files ... .. //depot/projects/dtrace/ports/UIDs#16 integrate .. //depot/projects/dtrace/src/lib/msun/src/s_log1p.c#4 integrate .. //depot/projects/dtrace/src/lib/msun/src/s_log1pf.c#4 integrate .. //depot/projects/dtrace/src/lib/msun/src/s_rint.c#5 integrate .. //depot/projects/dtrace/src/lib/msun/src/s_rintf.c#4 integrate .. //depot/projects/dtrace/src/sys/fs/coda/cnode.h#2 integrate .. //depot/projects/dtrace/src/sys/fs/coda/coda_namecache.h#2 integrate .. //depot/projects/dtrace/src/sys/fs/coda/coda_psdev.c#2 integrate .. //depot/projects/dtrace/src/sys/fs/coda/coda_vfsops.c#4 integrate .. //depot/projects/dtrace/src/sys/fs/coda/coda_vnops.c#4 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#4 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#4 integrate .. //depot/projects/dtrace/src/sys/kern/kern_shutdown.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_bio.c#18 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#28 integrate .. //depot/projects/dtrace/src/sys/nfs4client/nfs4_vnops.c#9 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_subs.c#10 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_vnops.c#13 integrate .. //depot/projects/dtrace/src/sys/sys/buf.h#7 integrate .. //depot/projects/dtrace/src/sys/sys/lockmgr.h#11 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#33 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vfsops.c#19 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#35 integrate Differences ... ==== //depot/projects/dtrace/ports/UIDs#16 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/UIDs,v 1.53 2008/01/11 15:46:29 rafan Exp $ +$FreeBSD: ports/UIDs,v 1.54 2008/01/19 11:47:16 edwin Exp $ # Please keep this file sorted by UID! smmsp:*:25:25:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin bind:*:53:53:Bind Sandbox:/:/usr/sbin/nologin @@ -70,7 +70,7 @@ vchat:*:128:128:VChat Conferencing System:/nonexistent:/usr/sbin/nologin _bgpd:*:130:130:BGP Daemon:/var/empty:/usr/sbin/nologin _ospfd:*:131:131:OSPF Daemon:/var/empty:/usr/sbin/nologin -_spamd:*:132:132::0:0:Spam Daemon:/var/empty:/usr/sbin/nologin +_spamd:*:132:132:Spam Daemon:/var/empty:/usr/sbin/nologin dovecot:*:143:143:Dovecot User:/var/empty:/usr/sbin/nologin rbldns:*:153:153:rbldnsd pseudo-user:/nonexistent:/usr/sbin/nologin sfs:*:171:171:Self-Certifying File System:/nonexistent:/usr/sbin/nologin @@ -98,10 +98,10 @@ hacluster:*:275:275:Heartbeat cluster user:/nonexistent:/usr/sbin/nologin mrtg:*:279:279:MRTG daemon:/nonexistent:/usr/sbin/nologin prelude:*:281:281:Prelude user:/nonexistent:/usr/sbin/nologin -_sphinx:*:312:312::0:0:Sphinxsearch Owner:/nonexistent:/usr/sbin/nologin +_sphinx:*:312:312:Sphinxsearch Owner:/nonexistent:/usr/sbin/nologin dkfilter:*:325:325:DK Filter Owner:/nonexistent:/usr/sbin/nologin -wildfire:*:340:340::0:0:Wildfire Daemon:/nonexistent:/usr/sbin/nologin -stunnel:*:341:341::0:0:Stunnel Daemon:/nonexistent:/usr/sbin/nologin +wildfire:*:340:340:Wildfire Daemon:/nonexistent:/usr/sbin/nologin +stunnel:*:341:341:Stunnel Daemon:/nonexistent:/usr/sbin/nologin _iodined:*:353:353:Iodine Daemon:/nonexistent:/usr/sbin/nologin ldap:*:389:389:OpenLDAP Server:/nonexistent:/usr/sbin/nologin tiarra:*:398:398:Tiarra IRC Proxy:/nonexistent:/usr/sbin/nologin ==== //depot/projects/dtrace/src/lib/msun/src/s_log1p.c#4 (text+ko) ==== @@ -10,9 +10,8 @@ * ==================================================== */ -#ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_log1p.c,v 1.8 2005/12/04 12:28:33 bde Exp $"; -#endif +#include +__FBSDID("$FreeBSD: src/lib/msun/src/s_log1p.c,v 1.9 2008/01/19 18:13:21 bde Exp $"); /* double log1p(double x) * @@ -79,6 +78,8 @@ * See HP-15C Advanced Functions Handbook, p.193. */ +#include + #include "math.h" #include "math_private.h" @@ -124,7 +125,7 @@ if (hx >= 0x7ff00000) return x+x; if(k!=0) { if(hx<0x43400000) { - u = 1.0+x; + STRICT_ASSIGN(double,u,1.0+x); GET_HIGH_WORD(hu,u); k = (hu>>20)-1023; c = (k>0)? 1.0-(u-x):x-(u-1.0);/* correction term */ ==== //depot/projects/dtrace/src/lib/msun/src/s_log1pf.c#4 (text+ko) ==== @@ -13,9 +13,10 @@ * ==================================================== */ -#ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_log1pf.c,v 1.9 2005/12/04 12:30:44 bde Exp $"; -#endif +#include +__FBSDID("$FreeBSD: src/lib/msun/src/s_log1pf.c,v 1.10 2008/01/19 18:13:21 bde Exp $"); + +#include #include "math.h" #include "math_private.h" @@ -62,7 +63,7 @@ if (hx >= 0x7f800000) return x+x; if(k!=0) { if(hx<0x5a000000) { - *(volatile float *)&u = (float)1.0+x; + STRICT_ASSIGN(float,u,(float)1.0+x); GET_FLOAT_WORD(hu,u); k = (hu>>23)-127; /* correction term */ ==== //depot/projects/dtrace/src/lib/msun/src/s_rint.c#5 (text+ko) ==== @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_rint.c,v 1.14 2008/01/14 02:12:06 das Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_rint.c,v 1.15 2008/01/19 16:37:57 bde Exp $"; #endif /* @@ -51,7 +51,7 @@ i0 &= 0xfffe0000; i0 |= ((i1|-i1)>>12)&0x80000; SET_HIGH_WORD(x,i0); - w = TWO52[sx]+x; + STRICT_ASSIGN(double,w,TWO52[sx]+x); t = w-TWO52[sx]; GET_HIGH_WORD(i0,t); SET_HIGH_WORD(t,(i0&0x7fffffff)|(sx<<31)); @@ -84,7 +84,7 @@ if((i1&i)!=0) i1 = (i1&(~i))|((0x40000000)>>(j0-20)); } INSERT_WORDS(x,i0,i1); - *(volatile double *)&w = TWO52[sx]+x; /* clip any extra precision */ + STRICT_ASSIGN(double,w,TWO52[sx]+x); return w-TWO52[sx]; } ==== //depot/projects/dtrace/src/lib/msun/src/s_rintf.c#4 (text+ko) ==== @@ -14,10 +14,12 @@ */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_rintf.c,v 1.10 2005/12/03 09:00:29 bde Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_rintf.c,v 1.11 2008/01/19 16:37:57 bde Exp $"; #endif -#include +#include +#include + #include "math.h" #include "math_private.h" @@ -31,20 +33,20 @@ rintf(float x) { int32_t i0,j0,sx; - volatile float w,t; /* volatile works around gcc bug */ + float w,t; GET_FLOAT_WORD(i0,x); sx = (i0>>31)&1; j0 = ((i0>>23)&0xff)-0x7f; if(j0<23) { if(j0<0) { if((i0&0x7fffffff)==0) return x; - w = TWO23[sx]+x; + STRICT_ASSIGN(float,w,TWO23[sx]+x); t = w-TWO23[sx]; GET_FLOAT_WORD(i0,t); SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31)); return t; } - w = TWO23[sx]+x; + STRICT_ASSIGN(float,w,TWO23[sx]+x); return w-TWO23[sx]; } if(j0==0x80) return x+x; /* inf or NaN */ ==== //depot/projects/dtrace/src/sys/fs/coda/cnode.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/cnode.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/fs/coda/cnode.h,v 1.21 2007/07/12 21:04:57 rwatson Exp $ + * $FreeBSD: src/sys/fs/coda/cnode.h,v 1.22 2008/01/19 14:32:44 rwatson Exp $ * */ @@ -74,15 +74,9 @@ #define CODA_FREE(ptr, size) free((ptr), M_CODA) /* - * global cache state control - */ -extern int coda_nc_use; - -/* * Used to select debugging statements throughout the cfs code. */ extern int codadebug; -extern int coda_nc_debug; extern int coda_printf_delay; extern int coda_vnop_print_entry; extern int coda_psdev_print_entry; ==== //depot/projects/dtrace/src/sys/fs/coda/coda_namecache.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_namecache.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/fs/coda/coda_namecache.h,v 1.11 2007/07/12 20:40:37 rwatson Exp $ + * $FreeBSD: src/sys/fs/coda/coda_namecache.h,v 1.13 2008/01/19 19:21:07 rwatson Exp $ * */ @@ -63,13 +63,8 @@ * 2nd try -- same, except dir fid.vnode instead of cp */ -#ifdef oldhash -#define CODA_NC_HASH(name, namelen, cp) \ - ((name[0] + name[namelen-1] + namelen + (int)(intptr_t)(cp)) & (coda_nc_hashsize-1)) -#else #define CODA_NC_HASH(name, namelen, cp) \ ((name[0] + (name[namelen-1]<<4) + namelen + (((int)(intptr_t)cp)>>8)) & (coda_nc_hashsize-1)) -#endif #define CODA_NAMEMATCH(cp, name, namelen, dcp) \ ((namelen == cp->namelen) && (dcp == cp->dcp) && \ @@ -136,21 +131,28 @@ #define CODA_NC_DEBUG(N, STMT) { if (coda_nc_debug & (1 < -__FBSDID("$FreeBSD: src/sys/fs/coda/coda_psdev.c,v 1.39 2007/07/12 21:04:57 rwatson Exp $"); - - -extern int coda_nc_initialized; /* Set if cache has been initialized */ +__FBSDID("$FreeBSD: src/sys/fs/coda/coda_psdev.c,v 1.40 2008/01/19 14:32:44 rwatson Exp $"); #include #include ==== //depot/projects/dtrace/src/sys/fs/coda/coda_vfsops.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/coda/coda_vfsops.c,v 1.69 2008/01/10 01:10:44 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/coda/coda_vfsops.c,v 1.72 2008/01/19 16:39:14 rwatson Exp $"); #include #include @@ -77,9 +77,6 @@ #define MARK_INT_FAIL(op) (coda_vfsopstats[op].unsat_intrn++) #define MARK_INT_GEN(op) (coda_vfsopstats[op].gen_intrn++) -extern int coda_nc_initialized; /* Set if cache has been initialized */ -extern int vc_nb_open(struct cdev *, int, int, struct thread *); - int coda_vfsopstats_init(void) { @@ -227,10 +224,10 @@ printf("coda_unmount: ROOT: vp %p, cp %p\n", mi->mi_rootvp, VTOC(mi->mi_rootvp)); #endif vrele(mi->mi_rootvp); + mi->mi_rootvp = NULL; vrele(coda_ctlvp); + coda_ctlvp = NULL; active = coda_kill(vfsp, NOT_DOWNCALL); - ASSERT_VOP_LOCKED(mi->mi_rootvp, "coda_unmount"); - mi->mi_rootvp->v_vflag &= ~VV_ROOT; error = vflush(mi->mi_vfsp, 0, FORCECLOSE, td); #ifdef CODA_VERBOSE printf("coda_unmount: active = %d, vflush active %d\n", active, error); @@ -243,7 +240,6 @@ /* No more vfsp's to hold onto */ mi->mi_vfsp = NULL; - mi->mi_rootvp = NULL; if (error) MARK_INT_FAIL(CODA_UMOUNT_STATS); @@ -375,13 +371,11 @@ return(EINVAL); } - bzero(sbp, sizeof(struct statfs)); /* XXX - what to do about f_flags, others? --bnoble */ /* Below This is what AFS does #define NB_SFS_SIZ 0x895440 */ - /* Note: Normal fs's have a bsize of 0x400 == 1024 */ - sbp->f_type = vfsp->mnt_vfc->vfc_typenum; + sbp->f_flags = 0; sbp->f_bsize = 8192; /* XXX */ sbp->f_iosize = 8192; /* XXX */ #define NB_SFS_SIZ 0x8AB75D @@ -390,9 +384,6 @@ sbp->f_bavail = NB_SFS_SIZ; sbp->f_files = NB_SFS_SIZ; sbp->f_ffree = NB_SFS_SIZ; - bcopy((caddr_t)&(vfsp->mnt_stat.f_fsid), (caddr_t)&(sbp->f_fsid), sizeof (fsid_t)); - snprintf(sbp->f_mntonname, sizeof(sbp->f_mntonname), "/coda"); - snprintf(sbp->f_fstypename, sizeof(sbp->f_fstypename), "coda"); /* MARK_INT_SAT(CODA_STATFS_STATS); */ return(0); } ==== //depot/projects/dtrace/src/sys/fs/coda/coda_vnops.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/coda/coda_vnops.c,v 1.78 2008/01/13 14:44:02 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/coda/coda_vnops.c,v 1.83 2008/01/19 17:12:44 rwatson Exp $"); #include #include @@ -106,10 +106,9 @@ /* Definition of the vnode operation vector */ struct vop_vector coda_vnodeops = { - .vop_default = VOP_PANIC, + .vop_default = &default_vnodeops, .vop_lookup = coda_lookup, /* lookup */ .vop_create = coda_create, /* create */ - .vop_mknod = VOP_PANIC, /* mknod */ .vop_open = coda_open, /* open */ .vop_close = coda_close, /* close */ .vop_access = coda_access, /* access */ @@ -132,11 +131,9 @@ .vop_lock1 = coda_lock, /* lock */ .vop_unlock = coda_unlock, /* unlock */ .vop_bmap = coda_bmap, /* bmap */ - .vop_print = VOP_PANIC, /* print */ + .vop_print = VOP_NULL, /* print */ .vop_islocked = coda_islocked, /* islocked */ .vop_pathconf = coda_pathconf, /* pathconf */ - .vop_advlock = VOP_NULL, /* advlock */ - .vop_lease = VOP_NULL, /* lease */ .vop_poll = vop_stdpoll, .vop_getpages = vop_stdgetpages, /* pager intf.*/ .vop_putpages = vop_stdputpages, /* pager intf.*/ @@ -221,9 +218,6 @@ CODADEBUG( CODA_OPEN,myprintf(("open: vp %p result %d\n", vp, error));) - /* Keep a reference until the close comes in. */ - vref(*vpp); - /* Save the vnode pointer for the cache file. */ if (cp->c_ovp == NULL) { cp->c_ovp = vp; @@ -244,6 +238,8 @@ if (error) { printf("coda_open: VOP_OPEN on container failed %d\n", error); return (error); + } else { + (*vpp)->v_object = vp->v_object; } /* grab (above) does this when it calls newvnode unless it's in the cache*/ @@ -291,8 +287,6 @@ error = venus_close(vtomi(vp), &cp->c_fid, flag, cred, td->td_proc); else error = ENODEV; - vrele(vp); - CODADEBUG(CODA_CLOSE, myprintf(("close: result %d\n",error)); ) return(error); } @@ -747,6 +741,8 @@ CODADEBUG(CODA_INACTIVE, myprintf(("in inactive, %s, vfsp %p\n", coda_f2s(&cp->c_fid), vp->v_mount));) + + vp->v_object = NULL; /* If an array has been allocated to hold the symlink, deallocate it */ if ((coda_symlink_cache) && (VALID_SYMLINK(cp))) { @@ -1292,7 +1288,11 @@ /* Invalidate the parent's attr cache, the modification time has changed */ VTOC(dvp)->c_flags &= ~C_VATTR; - + + if ((error = VOP_LOCK(*vpp, LK_EXCLUSIVE))) { + panic("coda_create: couldn't lock child"); + } + CODADEBUG( CODA_MKDIR, myprintf(("mkdir: %s result %d\n", coda_f2s(&VFid), error)); ) } else { @@ -1552,7 +1552,7 @@ cache_purge(vp); coda_free(VTOC(vp)); vp->v_data = NULL; - vnode_destroy_vobject(vp); + vp->v_object = NULL; return (0); } ==== //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.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/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c,v 1.2 2006/06/09 06:04:05 rodrigc Exp $ + * $FreeBSD: src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c,v 1.3 2008/01/19 17:36:22 attilio Exp $ */ #include "xfs.h" @@ -86,7 +86,7 @@ bp->b_bufsize = size; bp->b_bcount = size; - KASSERT(BUF_REFCNT(bp) == 1, + KASSERT(BUF_ISLOCKED(bp), ("xfs_buf_get_empty: bp %p not locked",bp)); xfs_buf_set_target(bp, target); @@ -103,7 +103,7 @@ bp = geteblk(len); if (bp != NULL) { - KASSERT(BUF_REFCNT(bp) == 1, + KASSERT(BUF_ISLOCKED(bp), ("xfs_buf_get_empty: bp %p not locked",bp)); xfs_buf_set_target(bp, target); @@ -163,7 +163,7 @@ if ((bp->b_flags & B_ASYNC) == 0) { error = bufwait(bp); #if 0 - if (BUF_REFCNT(bp) > 1) + if (BUF_LOCKRECURSED(bp)) BUF_UNLOCK(bp); else brelse(bp); ==== //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#4 (text+ko) ==== @@ -160,7 +160,6 @@ #define XFS_BUF_HOLD(x) ((void)0) #define XFS_BUF_UNHOLD(x) ((void)0) -#define XFS_BUF_ISHOLD(x) BUF_REFCNT(x) #define XFS_BUF_READ(x) ((x)->b_iocmd = BIO_READ) #define XFS_BUF_UNREAD(x) ((x)->b_iocmd = 0) @@ -234,7 +233,7 @@ #define XFS_BUF_SET_VTYPE(bp, type) #define XFS_BUF_SET_REF(bp, ref) -#define XFS_BUF_VALUSEMA(bp) (BUF_REFCNT(bp)? 0 : 1) +#define XFS_BUF_VALUSEMA(bp) (BUF_ISLOCKED(bp) ? 0 : 1) #define XFS_BUF_CPSEMA(bp) \ (BUF_LOCK(bp, LK_EXCLUSIVE|LK_CANRECURSE | LK_SLEEPFAIL, NULL) == 0) ==== //depot/projects/dtrace/src/sys/kern/kern_shutdown.c#13 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_shutdown.c,v 1.187 2007/12/26 11:32:33 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_shutdown.c,v 1.188 2008/01/19 17:36:22 attilio Exp $"); #include "opt_ddb.h" #include "opt_kdb.h" @@ -255,7 +255,7 @@ isbufbusy(struct buf *bp) { if (((bp->b_flags & (B_INVAL | B_PERSISTENT)) == 0 && - BUF_REFCNT(bp) > 0) || + BUF_ISLOCKED(bp)) || ((bp->b_flags & (B_DELWRI | B_INVAL)) == B_DELWRI)) return (1); return (0); ==== //depot/projects/dtrace/src/sys/kern/vfs_bio.c#18 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.534 2008/01/13 14:44:09 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.535 2008/01/19 17:36:22 attilio Exp $"); #include #include @@ -658,7 +658,7 @@ { CTR3(KTR_BUF, "bremfree(%p) vp %p flags %X", bp, bp->b_vp, bp->b_flags); - KASSERT(BUF_REFCNT(bp), ("bremfree: buf must be locked.")); + KASSERT(BUF_ISLOCKED(bp), ("bremfree: buf must be locked.")); KASSERT((bp->b_flags & B_REMFREE) == 0, ("bremfree: buffer %p already marked for delayed removal.", bp)); KASSERT(bp->b_qindex != QUEUE_NONE, @@ -695,7 +695,7 @@ { CTR3(KTR_BUF, "bremfreel(%p) vp %p flags %X", bp, bp->b_vp, bp->b_flags); - KASSERT(BUF_REFCNT(bp), ("bremfreel: buffer %p not locked.", bp)); + KASSERT(BUF_ISLOCKED(bp), ("bremfreel: buffer %p not locked.", bp)); KASSERT(bp->b_qindex != QUEUE_NONE, ("bremfreel: buffer %p not on a queue.", bp)); mtx_assert(&bqlock, MA_OWNED); @@ -834,7 +834,7 @@ oldflags = bp->b_flags; - if (BUF_REFCNT(bp) == 0) + if (!BUF_ISLOCKED(bp)) panic("bufwrite: buffer is not busy???"); if (bp->b_pin_count > 0) @@ -952,7 +952,7 @@ CTR3(KTR_BUF, "bdwrite(%p) vp %p flags %X", bp, bp->b_vp, bp->b_flags); KASSERT(bp->b_bufobj != NULL, ("No b_bufobj %p", bp)); - KASSERT(BUF_REFCNT(bp) != 0, ("bdwrite: buffer is not busy")); + KASSERT(BUF_ISLOCKED(bp), ("bdwrite: buffer is not busy")); if (bp->b_flags & B_INVAL) { brelse(bp); @@ -1047,7 +1047,7 @@ CTR3(KTR_BUF, "bdirty(%p) vp %p flags %X", bp, bp->b_vp, bp->b_flags); - KASSERT(BUF_REFCNT(bp) == 1, ("bdirty: bp %p not locked",bp)); + KASSERT(BUF_ISLOCKED(bp), ("bdirty: bp %p not locked",bp)); KASSERT(bp->b_bufobj != NULL, ("No b_bufobj %p", bp)); KASSERT(bp->b_flags & B_REMFREE || bp->b_qindex == QUEUE_NONE, ("bdirty: buffer %p still on queue %d", bp, bp->b_qindex)); @@ -1081,7 +1081,7 @@ KASSERT(bp->b_bufobj != NULL, ("No b_bufobj %p", bp)); KASSERT(bp->b_flags & B_REMFREE || bp->b_qindex == QUEUE_NONE, ("bundirty: buffer %p still on queue %d", bp, bp->b_qindex)); - KASSERT(BUF_REFCNT(bp) == 1, ("bundirty: bp %p not locked",bp)); + KASSERT(BUF_ISLOCKED(bp), ("bundirty: bp %p not locked",bp)); if (bp->b_flags & B_DELWRI) { bp->b_flags &= ~B_DELWRI; @@ -1341,7 +1341,7 @@ brelvp(bp); } - if (BUF_REFCNT(bp) > 1) { + if (BUF_LOCKRECURSED(bp)) { /* do not release to free list */ BUF_UNLOCK(bp); return; @@ -1446,7 +1446,7 @@ KASSERT(!(bp->b_flags & (B_CLUSTER|B_PAGING)), ("bqrelse: inappropriate B_PAGING or B_CLUSTER bp %p", bp)); - if (BUF_REFCNT(bp) > 1) { + if (BUF_LOCKRECURSED(bp)) { /* do not release to free list */ BUF_UNLOCK(bp); return; @@ -2660,7 +2660,7 @@ bp->b_flags &= ~B_DONE; } CTR4(KTR_BUF, "getblk(%p, %ld, %d) = %p", vp, (long)blkno, size, bp); - KASSERT(BUF_REFCNT(bp) == 1, ("getblk: bp %p not locked",bp)); + KASSERT(BUF_ISLOCKED(bp), ("getblk: bp %p not locked",bp)); KASSERT(bp->b_bufobj == bo, ("bp %p wrong b_bufobj %p should be %p", bp, bp->b_bufobj, bo)); return (bp); @@ -2681,7 +2681,7 @@ continue; allocbuf(bp, size); bp->b_flags |= B_INVAL; /* b_dep cleared by getnewbuf() */ - KASSERT(BUF_REFCNT(bp) == 1, ("geteblk: bp %p not locked",bp)); + KASSERT(BUF_ISLOCKED(bp), ("geteblk: bp %p not locked",bp)); return (bp); } @@ -2707,7 +2707,7 @@ int newbsize, mbsize; int i; - if (BUF_REFCNT(bp) == 0) + if (!BUF_ISLOCKED(bp)) panic("allocbuf: buffer not busy"); if (bp->b_kvasize < size) @@ -3150,8 +3150,7 @@ CTR3(KTR_BUF, "bufdone(%p) vp %p flags %X", bp, bp->b_vp, bp->b_flags); dropobj = NULL; - KASSERT(BUF_REFCNT(bp) > 0, ("biodone: bp %p not busy %d", bp, - BUF_REFCNT(bp))); + KASSERT(BUF_ISLOCKED(bp), ("biodone: bp %p not busy", bp)); KASSERT(!(bp->b_flags & B_DONE), ("biodone: bp %p already done", bp)); runningbufwakeup(bp); @@ -3176,8 +3175,7 @@ void bufdone_finish(struct buf *bp) { - KASSERT(BUF_REFCNT(bp) > 0, ("biodone: bp %p not busy %d", bp, - BUF_REFCNT(bp))); + KASSERT(BUF_ISLOCKED(bp), ("biodone: bp %p not busy", bp)); if (!LIST_EMPTY(&bp->b_dep)) buf_complete(bp); @@ -3943,7 +3941,7 @@ for (i = 0; i < nbuf; i++) { bp = &buf[i]; - if (lockcount(&bp->b_lock)) { + if (BUF_ISLOCKED(bp)) { db_show_buffer((uintptr_t)bp, 1, 0, NULL); db_printf("\n"); } ==== //depot/projects/dtrace/src/sys/kern/vfs_subr.c#28 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.715 2008/01/13 14:44:10 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.716 2008/01/19 17:36:22 attilio Exp $"); #include "opt_ddb.h" #include "opt_mac.h" @@ -3570,7 +3570,7 @@ if ((bp->b_flags & B_CLUSTER) != 0) return; - if (BUF_REFCNT(bp) < 1) { + if (!BUF_ISLOCKED(bp)) { if (vfs_badlock_print) printf( "VOP_STRATEGY: bp is not locked but should be\n"); ==== //depot/projects/dtrace/src/sys/nfs4client/nfs4_vnops.c#9 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfs4client/nfs4_vnops.c,v 1.39 2008/01/13 14:44:11 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/nfs4client/nfs4_vnops.c,v 1.40 2008/01/19 17:36:23 attilio Exp $"); /* * vnode op calls for Sun NFS version 2 and 3 @@ -2446,8 +2446,9 @@ struct ucred *cr; int error = 0; - KASSERT(!(bp->b_flags & B_DONE), ("nfs4_strategy: buffer %p unexpectedly marked B_DONE", bp)); - KASSERT(BUF_REFCNT(bp) > 0, ("nfs4_strategy: buffer %p not locked", bp)); + KASSERT(!(bp->b_flags & B_DONE), + ("nfs4_strategy: buffer %p unexpectedly marked B_DONE", bp)); + KASSERT(BUF_ISLOCKED(bp), ("nfs4_strategy: buffer %p not locked", bp)); if (bp->b_iocmd == BIO_READ) cr = bp->b_rcred; @@ -2525,7 +2526,7 @@ bveccount = 0; VI_LOCK(vp); TAILQ_FOREACH_SAFE(bp, &vp->v_bufobj.bo_dirty.bv_hd, b_bobufs, nbp) { - if (BUF_REFCNT(bp) == 0 && + if (!BUF_ISLOCKED(bp) && (bp->b_flags & (B_DELWRI | B_NEEDCOMMIT)) == (B_DELWRI | B_NEEDCOMMIT)) bveccount++; @@ -2807,7 +2808,7 @@ off_t off; #endif - if (BUF_REFCNT(bp) == 0) + if (!BUF_ISLOCKED(bp)) panic("bwrite: buffer is not locked???"); if (bp->b_flags & B_INVAL) { ==== //depot/projects/dtrace/src/sys/nfsclient/nfs_subs.c#10 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_subs.c,v 1.149 2008/01/13 14:44:12 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_subs.c,v 1.150 2008/01/19 17:36:23 attilio Exp $"); /* * These functions support the macros and help fiddle mbuf chains for @@ -918,7 +918,7 @@ } MNT_IUNLOCK(mp); TAILQ_FOREACH_SAFE(bp, &vp->v_bufobj.bo_dirty.bv_hd, b_bobufs, nbp) { - if (BUF_REFCNT(bp) == 0 && + if (!BUF_ISLOCKED(bp) && (bp->b_flags & (B_DELWRI | B_NEEDCOMMIT)) == (B_DELWRI | B_NEEDCOMMIT)) bp->b_flags &= ~(B_NEEDCOMMIT | B_CLUSTEROK); ==== //depot/projects/dtrace/src/sys/nfsclient/nfs_vnops.c#13 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vnops.c,v 1.279 2008/01/13 14:44:12 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vnops.c,v 1.280 2008/01/19 17:36:23 attilio Exp $"); /* * vnode op calls for Sun NFS version 2 and 3 @@ -2692,8 +2692,9 @@ struct buf *bp = ap->a_bp; struct ucred *cr; - KASSERT(!(bp->b_flags & B_DONE), ("nfs_strategy: buffer %p unexpectedly marked B_DONE", bp)); - KASSERT(BUF_REFCNT(bp) > 0, ("nfs_strategy: buffer %p not locked", bp)); + KASSERT(!(bp->b_flags & B_DONE), + ("nfs_strategy: buffer %p unexpectedly marked B_DONE", bp)); + KASSERT(BUF_ISLOCKED(bp), ("nfs_strategy: buffer %p not locked", bp)); if (bp->b_iocmd == BIO_READ) cr = bp->b_rcred; @@ -2771,7 +2772,7 @@ bveccount = 0; VI_LOCK(vp); TAILQ_FOREACH_SAFE(bp, &vp->v_bufobj.bo_dirty.bv_hd, b_bobufs, nbp) { - if (BUF_REFCNT(bp) == 0 && + if (!BUF_ISLOCKED(bp) && (bp->b_flags & (B_DELWRI | B_NEEDCOMMIT)) == (B_DELWRI | B_NEEDCOMMIT)) bveccount++; @@ -3087,7 +3088,7 @@ off_t off; #endif - if (BUF_REFCNT(bp) == 0) + if (!BUF_ISLOCKED(bp)) panic("bwrite: buffer is not locked???"); if (bp->b_flags & B_INVAL) { ==== //depot/projects/dtrace/src/sys/sys/buf.h#7 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)buf.h 8.9 (Berkeley) 3/30/95 - * $FreeBSD: src/sys/sys/buf.h,v 1.197 2008/01/08 23:48:31 attilio Exp $ + * $FreeBSD: src/sys/sys/buf.h,v 1.198 2008/01/19 17:36:23 attilio Exp $ */ #ifndef _SYS_BUF_H_ @@ -320,11 +320,22 @@ } /* + * Check if a buffer lock is recursed. + */ +#define BUF_LOCKRECURSED(bp) \ + (lockmgr_recursed(&(bp)->b_lock)) + +/* + * Check if a buffer lock is currently held. + */ +#define BUF_ISLOCKED(bp) \ + (lockstatus(&(bp)->b_lock, curthread)) +/* * Free a buffer lock. */ #define BUF_LOCKFREE(bp) \ do { \ - if (BUF_REFCNT(bp) > 0) \ + if (BUF_ISLOCKED(bp)) \ panic("free locked buf"); \ lockdestroy(&(bp)->b_lock); \ } while (0) @@ -344,29 +355,6 @@ lockmgr_disown(&bp->b_lock); } #endif -/* - * Find out the number of references to a lock. - */ -static __inline int BUF_REFCNT(struct buf *); -static __inline int -BUF_REFCNT(struct buf *bp) -{ - int s, ret; - - /* - * When the system is panicing, the lock manager grants all lock - * requests whether or not the lock is available. To avoid "unlocked - * buffer" panics after a crash, we just claim that all buffers - * are locked when cleaning up after a system panic. - */ - if (panicstr != NULL) - return (1); - s = splbio(); - ret = lockcount(&(bp)->b_lock); - splx(s); - return ret; -} - /* * Find out the number of waiters on a lock. ==== //depot/projects/dtrace/src/sys/sys/lockmgr.h#11 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lock.h 8.12 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/lockmgr.h,v 1.56 2008/01/08 23:48:31 attilio Exp $ + * $FreeBSD: src/sys/sys/lockmgr.h,v 1.57 2008/01/19 17:36:23 attilio Exp $ */ #ifndef _SYS_LOCKMGR_H_ @@ -204,6 +204,8 @@ int lockwaiters(struct lock *); #define lockmgr(lock, flags, mtx, td) _lockmgr((lock), (flags), (mtx), (td), __FILE__, __LINE__) +#define lockmgr_recursed(lkp) \ + ((lkp)->lk_exclusivecount > 1) #ifdef DDB int lockmgr_chain(struct thread *td, struct thread **ownerp); #endif ==== //depot/projects/dtrace/src/sys/sys/param.h#33 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.3 (Berkeley) 4/4/95 - * $FreeBSD: src/sys/sys/param.h,v 1.325 2008/01/13 14:48:51 attilio Exp $ + * $FreeBSD: src/sys/sys/param.h,v 1.326 2008/01/19 17:39:25 attilio Exp $ */ #ifndef _SYS_PARAM_H_ @@ -57,7 +57,7 @@ * is created, otherwise 1. */ #undef __FreeBSD_version -#define __FreeBSD_version 800011 /* Master, propagated to newvers */ +#define __FreeBSD_version 800012 /* Master, propagated to newvers */ #ifndef LOCORE #include ==== //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vfsops.c#19 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.333 2008/01/13 14:44:14 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.334 2008/01/19 17:36:23 attilio Exp $"); #include "opt_mac.h" #include "opt_quota.h" @@ -1718,7 +1718,7 @@ oldflags = bp->b_flags; - if (BUF_REFCNT(bp) == 0) + if (!BUF_ISLOCKED(bp)) panic("bufwrite: buffer is not busy???"); s = splbio(); /* ==== //depot/projects/dtrace/www/share/sgml/news.xml#35 (text+ko) ==== @@ -20,7 +20,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.137 2008/01/18 18:56:02 bmah Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.138 2008/01/19 20:20:00 jkois Exp $ @@ -36,14 +36,14 @@ FreeBSD 6.3-RELEASE Available -

      FreeBSD +

      FreeBSD 6.3-RELEASE is now available. Please be sure to check the release errata + href="&enbase;/releases/6.3R/errata.html">release errata before installation for any late-breaking news and/or issues with 6.3. More information about FreeBSD releases can be found on the Release Information + href="&enbase;/releases/index.html">Release Information page.

       @@ -183,7 +183,7 @@ the 7.0-BETA4 ISO images for Tier-1 architectures are now available for download on most + href="&enbase;/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html"> &os; mirror sites. We ask our users to report any outstanding bugs, as this will presumably be the last BETA release before the first RC release.

      @@ -217,7 +217,7 @@ the 7.0-BETA3 ISO images for Tier-1 architectures are now available for download on most + href="&enbase;/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html"> &os; mirror sites. We ask our users to report any outstanding bugs.

      @@ -232,7 +232,7 @@ the 7.0-BETA2 ISO images for Tier-1 architectures are now available for download on most + href="&enbase;/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html"> &os; mirror sites. We ask our users to report any outstanding bugs, as this will presumably be the last BETA >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 19 21:56:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2402216A420; Sat, 19 Jan 2008 21:56:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C51ED16A41A for ; Sat, 19 Jan 2008 21:56:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C613613C4D3 for ; Sat, 19 Jan 2008 21:56:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0JLuW41096564 for ; Sat, 19 Jan 2008 21:56:32 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0JLuUCc096561 for perforce@freebsd.org; Sat, 19 Jan 2008 21:56:30 GMT (envelope-from jb@freebsd.org) Date: Sat, 19 Jan 2008 21:56:30 GMT Message-Id: <200801192156.m0JLuUCc096561@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133681 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 21:56:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=133681 Change 133681 by jb@jb_freebsd1 on 2008/01/19 21:56:06 Reset to match CVS. Affected files ... .. //depot/projects/dtrace/src/sys/sparc64/include/asi.h#6 edit .. //depot/projects/dtrace/src/sys/sparc64/include/asm.h#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/sparc64/include/asi.h#6 (text+ko) ==== @@ -49,11 +49,6 @@ #define ASI_SL 0x89 #define ASI_PNFL 0x8a #define ASI_SNFL 0x8b - -/* - * Mnemonic asis - */ -#define ASI_USER ASI_AIUS /* * UltraSPARC extensions. ASIs limited to a certain family are annotated. ==== //depot/projects/dtrace/src/sys/sparc64/include/asm.h#5 (text+ko) ==== @@ -93,16 +93,8 @@ CNAME(x): #define ENTRY(x) _ENTRY(x) -#define ENTRY_NP(x) _ENTRY(x) #define END(x) .size x, . - x -#define STACK_ALIGN 16 -#define SET_SIZE(x) END(x) -#define SA(X) (((X)+(STACK_ALIGN-1)) & ~(STACK_ALIGN-1)) -#define WINDOWSIZE64 (16*8) -#define WINDOWSIZE WINDOWSIZE64 -#define MINFRAME64 (WINDOWSIZE64 + 48) -#define MINFRAME MINFRAME64 /* * Kernel RCS ID tag and copyright macros */ From owner-p4-projects@FreeBSD.ORG Sat Jan 19 23:01:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E60B416A41B; Sat, 19 Jan 2008 23:01:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9358416A419 for ; Sat, 19 Jan 2008 23:01:41 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8BCA713C45B for ; Sat, 19 Jan 2008 23:01:41 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0JN1fdl001816 for ; Sat, 19 Jan 2008 23:01:41 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0JN1fdF001813 for perforce@freebsd.org; Sat, 19 Jan 2008 23:01:41 GMT (envelope-from imp@freebsd.org) Date: Sat, 19 Jan 2008 23:01:41 GMT Message-Id: <200801192301.m0JN1fdF001813@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133684 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 23:01:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=133684 Change 133684 by imp@imp_lighthouse on 2008/01/19 23:01:26 Remove my hack, and the stray .set at which was the real problem. Juli suggested that I didn't want to do my hack because at would be corrupted potentially by the assembler using it. She suggested I wanted to use the whole thing as 'set noat'. Submitted by: jmallet Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#5 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#5 (text+ko) ==== @@ -421,7 +421,6 @@ SAVE_U_PCB_REG(a3, PC, k1) sw a3, STAND_RA_OFFSET(sp) # for debugging la gp, _C_LABEL(_gp) # switch to kernel GP - .set at # Turn off fpu and enter kernel mode and t0, a0, ~(SR_COP_1_BIT | SR_EXL | SR_KSU_MASK | SR_INT_ENAB) mtc0 t0, COP_0_STATUS_REG @@ -453,10 +452,7 @@ mtlo t0 mthi t1 RESTORE_U_PCB_REG(a0, PC, a1) - .set push - .set noat RESTORE_U_PCB_REG(AT, AST, a1) - .set pop RESTORE_U_PCB_REG(v0, V0, a1) dmtc0 a0, COP_0_EXC_PC # set return address From owner-p4-projects@FreeBSD.ORG Sat Jan 19 23:30:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E8BD916A41B; Sat, 19 Jan 2008 23:30:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9327716A417 for ; Sat, 19 Jan 2008 23:30:12 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 879A613C43E for ; Sat, 19 Jan 2008 23:30:12 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0JNUC8M004926 for ; Sat, 19 Jan 2008 23:30:12 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0JNUCuw004914 for perforce@freebsd.org; Sat, 19 Jan 2008 23:30:12 GMT (envelope-from imp@freebsd.org) Date: Sat, 19 Jan 2008 23:30:12 GMT Message-Id: <200801192330.m0JNUCuw004914@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133686 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 23:30:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=133686 Change 133686 by imp@imp_paco-paco on 2008/01/19 23:29:58 Juniper vendor branch grew gdb when I wasn't looking. Someone should look into this and merge. Add it to the list so we don't forget. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/TODO#7 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/TODO#7 (text+ko) ==== @@ -1,6 +1,6 @@ o Sort out MIPS_COP_0_STATUS (defined as _(12)) vs COP_0_STATUS_REG (defined as $12) This is cpu.h vs cpureg.h or a 'netbsd' vs 'openbsd' argument. - See Mips Run uses the latter. + See Mips Run uses the latter and seems like a reasonable thing to pick... o Can we remove PDP_ENDIAN? o Can we remove a.out junk o Can we remove pre-ansi stuff @@ -31,3 +31,5 @@ not audited things to make sure that's really sane. o Double check last merge from mips2 -> cavium code. Something seems wrong in one of the edits. +o In the juniper vendor tree, gdb support just showed up. Merge it into + mips2-jnpr. From owner-p4-projects@FreeBSD.ORG Sat Jan 19 23:33:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66CE916A468; Sat, 19 Jan 2008 23:33:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 136EC16A418 for ; Sat, 19 Jan 2008 23:33:16 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 05BD513C461 for ; Sat, 19 Jan 2008 23:33:16 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0JNXFgI005049 for ; Sat, 19 Jan 2008 23:33:15 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0JNXFrh005046 for perforce@freebsd.org; Sat, 19 Jan 2008 23:33:15 GMT (envelope-from imp@freebsd.org) Date: Sat, 19 Jan 2008 23:33:15 GMT Message-Id: <200801192333.m0JNXFrh005046@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133687 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 23:33:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=133687 Change 133687 by imp@imp_paco-paco on 2008/01/19 23:33:06 Make it possible to disable libmagic. Like kerberos, it has to run stuff to build, and we haven't built the right binaries to allow that to happen. Affected files ... .. //depot/projects/mips2/src/lib/Makefile#10 edit .. //depot/projects/mips2/src/share/mk/bsd.own.mk#7 edit Differences ... ==== //depot/projects/mips2/src/lib/Makefile#10 (text+ko) ==== @@ -32,7 +32,7 @@ libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libedit libexpat libfetch libftpio libgeom ${_libgpib} \ ${_libgssapi} libipsec \ - ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ + ${_libipx} libkiconv ${_libmagic} libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ @@ -70,6 +70,10 @@ _libipx= libipx .endif +.if ${MK_MAGIC} != "no" +_libmagic= libmagic +.endif + .if ${MACHINE_ARCH} == "i386" .if ${MK_NCP} != "no" _libncp= libncp ==== //depot/projects/mips2/src/share/mk/bsd.own.mk#7 (text+ko) ==== @@ -334,6 +334,7 @@ LIBTHR \ LOCALES \ LPR \ + MAGIC \ MAILWRAPPER \ MAN \ NCP \ From owner-p4-projects@FreeBSD.ORG Sat Jan 19 23:34:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5ABE716A421; Sat, 19 Jan 2008 23:34:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2070E16A418 for ; Sat, 19 Jan 2008 23:34:17 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F07F013C461 for ; Sat, 19 Jan 2008 23:34:16 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0JNYGum005108 for ; Sat, 19 Jan 2008 23:34:16 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0JNYGpR005105 for perforce@freebsd.org; Sat, 19 Jan 2008 23:34:16 GMT (envelope-from imp@freebsd.org) Date: Sat, 19 Jan 2008 23:34:16 GMT Message-Id: <200801192334.m0JNYGpR005105@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133688 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 23:34:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=133688 Change 133688 by imp@imp_paco-paco on 2008/01/19 23:33:28 NOFUN WITHOUT_MAGIC. Truer words never spoken. :-) Affected files ... .. //depot/projects/mips2/src/Makefile.inc1#13 edit Differences ... ==== //depot/projects/mips2/src/Makefile.inc1#13 (text+ko) ==== @@ -1267,7 +1267,8 @@ .if defined(XDEV) && defined(XDEV_ARCH) NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \ - -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE -DWITHOUT_KERBEROS + -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE -DWITHOUT_KERBEROS \ + -DWITHOUT_MAGIC XDDIR=${XDEV}-freebsd XDTP=/usr/${XDDIR} From owner-p4-projects@FreeBSD.ORG Sat Jan 19 23:37:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF47816A418; Sat, 19 Jan 2008 23:37:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7365C16A41A for ; Sat, 19 Jan 2008 23:37:21 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 658BA13C45A for ; Sat, 19 Jan 2008 23:37:21 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0JNbLB3005255 for ; Sat, 19 Jan 2008 23:37:21 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0JNbKZe005252 for perforce@freebsd.org; Sat, 19 Jan 2008 23:37:20 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 19 Jan 2008 23:37:20 GMT Message-Id: <200801192337.m0JNbKZe005252@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133689 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 23:37:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=133689 Change 133689 by kmacy@kmacy:storage:toehead on 2008/01/19 23:36:24 IFC 133683 Affected files ... .. //depot/projects/toehead/contrib/gdb/FREEBSD-diffs#1 branch .. //depot/projects/toehead/contrib/top/display.c#2 integrate .. //depot/projects/toehead/contrib/top/layout.h#2 integrate .. //depot/projects/toehead/contrib/top/machine.h#2 integrate .. //depot/projects/toehead/contrib/top/top.c#3 integrate .. //depot/projects/toehead/contrib/top/top.h#2 integrate .. //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/kgdb.h#2 integrate .. //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/kthr.c#2 integrate .. //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/main.c#2 integrate .. //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/trgt.c#2 integrate .. //depot/projects/toehead/include/unistd.h#3 integrate .. //depot/projects/toehead/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/toehead/lib/libarchive/archive_write_disk.c#3 integrate .. //depot/projects/toehead/lib/libarchive/test/Makefile#3 integrate .. //depot/projects/toehead/lib/libarchive/test/test_write_disk.c#2 integrate .. //depot/projects/toehead/lib/libarchive/test/test_write_disk_hardlink.c#1 branch .. //depot/projects/toehead/lib/libc/sparc64/_fpmath.h#2 integrate .. //depot/projects/toehead/lib/libthr/Makefile#2 integrate .. //depot/projects/toehead/lib/msun/Makefile#4 integrate .. //depot/projects/toehead/lib/msun/Symbol.map#4 integrate .. //depot/projects/toehead/lib/msun/ld128/s_exp2l.c#1 branch .. //depot/projects/toehead/lib/msun/ld80/s_exp2l.c#1 branch .. //depot/projects/toehead/lib/msun/man/exp.3#2 integrate .. //depot/projects/toehead/lib/msun/man/log.3#1 branch .. //depot/projects/toehead/lib/msun/src/e_expf.c#2 integrate .. //depot/projects/toehead/lib/msun/src/k_rem_pio2.c#2 integrate .. //depot/projects/toehead/lib/msun/src/k_rem_pio2f.c#2 integrate .. //depot/projects/toehead/lib/msun/src/math.h#5 integrate .. //depot/projects/toehead/lib/msun/src/math_private.h#4 integrate .. //depot/projects/toehead/lib/msun/src/s_exp2.c#2 integrate .. //depot/projects/toehead/lib/msun/src/s_exp2f.c#2 integrate .. //depot/projects/toehead/lib/msun/src/s_log1p.c#2 integrate .. //depot/projects/toehead/lib/msun/src/s_log1pf.c#2 integrate .. //depot/projects/toehead/lib/msun/src/s_rint.c#3 integrate .. //depot/projects/toehead/lib/msun/src/s_rintf.c#2 integrate .. //depot/projects/toehead/share/man/man4/pcib.4#2 integrate .. //depot/projects/toehead/share/man/man7/clocks.7#2 integrate .. //depot/projects/toehead/share/man/man9/VOP_LOCK.9#3 integrate .. //depot/projects/toehead/share/misc/bsd-family-tree#3 integrate .. //depot/projects/toehead/share/mk/bsd.own.mk#4 integrate .. //depot/projects/toehead/share/zoneinfo/leapseconds#2 integrate .. //depot/projects/toehead/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/toehead/sys/dev/an/if_an.c#2 integrate .. //depot/projects/toehead/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/toehead/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/toehead/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/toehead/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/toehead/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/toehead/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/toehead/sys/dev/cxgb/sys/cxgb_support.c#3 integrate .. //depot/projects/toehead/sys/dev/cxgb/sys/mvec.h#4 integrate .. //depot/projects/toehead/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/toehead/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/toehead/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/toehead/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/toehead/sys/dev/re/if_re.c#3 integrate .. //depot/projects/toehead/sys/dev/stge/if_stge.c#3 integrate .. //depot/projects/toehead/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/toehead/sys/fs/coda/cnode.h#2 integrate .. //depot/projects/toehead/sys/fs/coda/coda_namecache.h#2 integrate .. //depot/projects/toehead/sys/fs/coda/coda_psdev.c#2 integrate .. //depot/projects/toehead/sys/fs/coda/coda_vfsops.c#3 integrate .. //depot/projects/toehead/sys/fs/coda/coda_vnops.c#3 integrate .. //depot/projects/toehead/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/toehead/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#2 integrate .. //depot/projects/toehead/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#2 integrate .. //depot/projects/toehead/sys/kern/genassym.sh#2 integrate .. //depot/projects/toehead/sys/kern/kern_mib.c#3 integrate .. //depot/projects/toehead/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/toehead/sys/kern/kern_time.c#2 integrate .. //depot/projects/toehead/sys/kern/tty_pty.c#2 integrate .. //depot/projects/toehead/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/toehead/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/toehead/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/toehead/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/toehead/sys/net/if_bridge.c#4 integrate .. //depot/projects/toehead/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/toehead/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/toehead/sys/nfsclient/nfs_subs.c#3 integrate .. //depot/projects/toehead/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/toehead/sys/nfsserver/nfs_srvsubs.c#3 integrate .. //depot/projects/toehead/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/toehead/sys/sys/buf.h#3 integrate .. //depot/projects/toehead/sys/sys/lockmgr.h#3 integrate .. //depot/projects/toehead/sys/sys/mbuf.h#3 integrate .. //depot/projects/toehead/sys/sys/param.h#3 integrate .. //depot/projects/toehead/sys/sys/signal.h#2 integrate .. //depot/projects/toehead/sys/sys/time.h#2 integrate .. //depot/projects/toehead/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/toehead/tools/build/mk/OptionalObsoleteFiles.inc#2 integrate .. //depot/projects/toehead/tools/regression/lib/msun/Makefile#3 integrate .. //depot/projects/toehead/tools/regression/lib/msun/test-exponential.c#1 branch .. //depot/projects/toehead/tools/regression/lib/msun/test-exponential.t#1 branch .. //depot/projects/toehead/usr.bin/top/machine.c#3 integrate .. //depot/projects/toehead/usr.bin/vmstat/vmstat.c#3 integrate Differences ... ==== //depot/projects/toehead/contrib/top/display.c#2 (text+ko) ==== @@ -8,7 +8,7 @@ * Copyright (c) 1984, 1989, William LeFebvre, Rice University * Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University * - * $FreeBSD: src/contrib/top/display.c,v 1.9 2005/05/19 13:34:19 keramida Exp $ + * $FreeBSD: src/contrib/top/display.c,v 1.10 2008/01/18 01:43:13 peter Exp $ */ /* @@ -78,8 +78,10 @@ static int *lmemory; static int *lswap; +static int num_cpus; static int *cpustate_columns; static int cpustate_total_length; +static int cpustates_column; static enum { OFF, ON, ERASE } header_status = ON; @@ -87,6 +89,29 @@ static void summary_format(); static void line_update(); +int x_lastpid = 10; +int y_lastpid = 0; +int x_loadave = 33; +int x_loadave_nompid = 15; +int y_loadave = 0; +int x_procstate = 0; +int y_procstate = 1; +int x_brkdn = 15; +int y_brkdn = 1; +int x_mem = 5; +int y_mem = 3; +int x_swap = 6; +int y_swap = 4; +int y_message = 5; +int x_header = 0; +int y_header = 6; +int x_idlecursor = 0; +int y_idlecursor = 5; +int y_procs = 7; + +int y_cpustates = 2; +int Header_lines = 7; + int display_resize() { @@ -138,6 +163,12 @@ /* call resize to do the dirty work */ lines = display_resize(); + num_cpus = statics->ncpus; + cpustates_column = 5; /* CPU: */ + if (num_cpus != 1) + cpustates_column += 2; /* CPU 0: */ + for (i = num_cpus; i > 9; i /= 10) + cpustates_column++; /* only do the rest if we need to */ if (lines > -1) @@ -153,7 +184,7 @@ num_swap = string_count(swap_names); lswap = (int *)malloc(num_swap * sizeof(int)); num_cpustates = string_count(cpustate_names); - lcpustates = (int *)malloc(num_cpustates * sizeof(int)); + lcpustates = (int *)malloc(num_cpustates * sizeof(int) * num_cpus); cpustate_columns = (int *)malloc(num_cpustates * sizeof(int)); memory_names = statics->memory_names; @@ -365,14 +396,13 @@ } } +#ifdef no_more /* * *_cpustates(states, names) - print the cpu state percentages * * Assumptions: cursor is on the PREVIOUS line */ -static int cpustates_column; - /* cpustates_tag() calculates the correct tag to use to label the line */ char *cpustates_tag() @@ -398,6 +428,7 @@ cpustates_column = strlen(use); return(use); } +#endif i_cpustates(states) @@ -406,11 +437,18 @@ { register int i = 0; register int value; - register char **names = cpustate_names; + register char **names; register char *thisname; + int cpu; + +for (cpu = 0; cpu < num_cpus; cpu++) { + names = cpustate_names; /* print tag and bump lastline */ - printf("\n%s", cpustates_tag()); + if (num_cpus == 1) + printf("\nCPU: "); + else + printf("\nCPU %d: ", cpu); lastline++; /* now walk thru the names and print the line */ @@ -423,14 +461,15 @@ /* if percentage is >= 1000, print it as 100% */ printf((value >= 1000 ? "%s%4.0f%% %s" : "%s%4.1f%% %s"), - i++ == 0 ? "" : ", ", + (i++ % num_cpustates) == 0 ? "" : ", ", ((float)value)/10., thisname); } } +} /* copy over values into "last" array */ - memcpy(lcpustates, states, num_cpustates * sizeof(int)); + memcpy(lcpustates, states, num_cpustates * sizeof(int) * num_cpus); } u_cpustates(states) @@ -439,14 +478,18 @@ { register int value; - register char **names = cpustate_names; + register char **names; register char *thisname; register int *lp; register int *colp; + int cpu; + +for (cpu = 0; cpu < num_cpus; cpu++) { + names = cpustate_names; - Move_to(cpustates_column, y_cpustates); - lastline = y_cpustates; - lp = lcpustates; + Move_to(cpustates_column, y_cpustates + cpu); + lastline = y_cpustates + cpu; + lp = lcpustates + (cpu * num_cpustates); colp = cpustate_columns; /* we could be much more optimal about this */ @@ -458,8 +501,8 @@ if (*lp != *states) { /* yes, move and change */ - Move_to(cpustates_column + *colp, y_cpustates); - lastline = y_cpustates; + Move_to(cpustates_column + *colp, y_cpustates + cpu); + lastline = y_cpustates + cpu; /* retrieve value and remember it */ value = *states; @@ -479,30 +522,39 @@ colp++; } } +} z_cpustates() { register int i = 0; - register char **names = cpustate_names; + register char **names; register char *thisname; register int *lp; + int cpu; + +for (cpu = 0; cpu < num_cpus; cpu++) { + names = cpustate_names; /* show tag and bump lastline */ - printf("\n%s", cpustates_tag()); + if (num_cpus == 1) + printf("\nCPU: "); + else + printf("\nCPU %d: ", cpu); lastline++; while ((thisname = *names++) != NULL) { if (*thisname != '\0') { - printf("%s %% %s", i++ == 0 ? "" : ", ", thisname); + printf("%s %% %s", (i++ % num_cpustates) == 0 ? "" : ", ", thisname); } } +} /* fill the "last" array with all -1s, to insure correct updating */ lp = lcpustates; - i = num_cpustates; + i = num_cpustates * num_cpus; while (--i >= 0) { *lp++ = -1; ==== //depot/projects/toehead/contrib/top/layout.h#2 (text+ko) ==== @@ -4,26 +4,28 @@ * This file defines the locations on tne screen for various parts of the * display. These definitions are used by the routines in "display.c" for * cursor addressing. + * + * $FreeBSD: src/contrib/top/layout.h,v 1.3 2008/01/18 01:43:13 peter Exp $ */ -#define x_lastpid 10 -#define y_lastpid 0 -#define x_loadave 33 -#define x_loadave_nompid 15 -#define y_loadave 0 -#define x_procstate 0 -#define y_procstate 1 -#define x_brkdn 15 -#define y_brkdn 1 -#define x_mem 5 -#define y_mem 3 -#define x_swap 6 -#define y_swap 4 -#define y_message 5 -#define x_header 0 -#define y_header 6 -#define x_idlecursor 0 -#define y_idlecursor 5 -#define y_procs 7 +extern int x_lastpid; /* 10 */ +extern int y_lastpid; /* 0 */ +extern int x_loadave; /* 33 */ +extern int x_loadave_nompid; /* 15 */ +extern int y_loadave; /* 0 */ +extern int x_procstate; /* 0 */ +extern int y_procstate; /* 1 */ +extern int x_brkdn; /* 15 */ +extern int y_brkdn; /* 1 */ +extern int x_mem; /* 5 */ +extern int y_mem; /* 3 */ +extern int x_swap; /* 6 */ +extern int y_swap; /* 4 */ +extern int y_message; /* 5 */ +extern int x_header; /* 0 */ +extern int y_header; /* 6 */ +extern int x_idlecursor; /* 0 */ +extern int y_idlecursor; /* 5 */ +extern int y_procs; /* 7 */ -#define y_cpustates 2 +extern int y_cpustates; /* 2 */ ==== //depot/projects/toehead/contrib/top/machine.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/contrib/top/machine.h,v 1.9 2007/05/04 15:42:58 rafan Exp $ + * $FreeBSD: src/contrib/top/machine.h,v 1.10 2008/01/18 01:43:13 peter Exp $ */ /* @@ -20,6 +20,7 @@ #ifdef ORDER char **order_names; #endif + int ncpus; }; /* @@ -43,6 +44,8 @@ int *memory; int *swap; struct timeval boottime; + unsigned long cpumask; /* bitfield of cpu states represented */ + int ncpus; }; /* cpu_states is an array of percentages * 10. For example, ==== //depot/projects/toehead/contrib/top/top.c#3 (text+ko) ==== @@ -13,7 +13,7 @@ * Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory * Copyright (c) 1996, William LeFebvre, Group sys Consulting * - * $FreeBSD: src/contrib/top/top.c,v 1.24 2008/01/09 18:06:24 obrien Exp $ + * $FreeBSD: src/contrib/top/top.c,v 1.25 2008/01/18 01:43:13 peter Exp $ */ /* @@ -66,6 +66,7 @@ extern int overstrike; static int fmt_flags = 0; +int pcpu_stats = No; /* signal handling routines */ sigret_t leave(); @@ -282,7 +283,7 @@ optind = 1; } - while ((i = getopt(ac, av, "CSIHabijnquvs:d:U:m:o:t")) != EOF) + while ((i = getopt(ac, av, "CSIHPabijnpquvs:d:U:m:o:t")) != EOF) { switch(i) { @@ -407,6 +408,14 @@ ps.jail = !ps.jail; break; + case 'P': + pcpu_stats = Yes; + break; + + case 'p': + pcpu_stats = No; + break; + default: fprintf(stderr, "Top version %s\n" ==== //depot/projects/toehead/contrib/top/top.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/contrib/top/top.h,v 1.4 2007/04/14 10:16:51 stas Exp $ + * $FreeBSD: src/contrib/top/top.h,v 1.5 2008/01/18 01:43:13 peter Exp $ */ /* * Top - a top users display for Berkeley Unix @@ -11,7 +11,7 @@ #define VERSION 3 /* Number of lines of header information on the standard screen */ -#define Header_lines 7 +extern int Header_lines; /* 7 */ /* Maximum number of columns allowed for display */ #define MAX_COLS 128 @@ -45,3 +45,5 @@ #define FMT_SHOWARGS 0x00000001 extern enum displaymodes displaymode; + +extern int pcpu_stats; ==== //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/kgdb.h#2 (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/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.6 2007/11/16 22:17:37 jhb Exp $ + * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.7 2008/01/17 21:43:12 jhb Exp $ */ #ifndef _KGDB_H_ @@ -32,6 +32,7 @@ struct thread_info; extern kvm_t *kvm; +extern char *kernel; struct kthr { struct kthr *next; @@ -63,5 +64,6 @@ char *kgdb_thr_extra_thread_info(int); uintptr_t kgdb_lookup(const char *sym); +CORE_ADDR kgdb_parse(const char *exp); #endif /* _KGDB_H_ */ ==== //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/kthr.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.8 2007/11/16 22:17:37 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.9 2008/01/18 18:57:27 emaste Exp $"); #include #include @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -204,17 +205,26 @@ char * kgdb_thr_extra_thread_info(int tid) { + char comm[MAXCOMLEN + 1]; + char td_name[MAXCOMLEN + 1]; struct kthr *kt; struct proc *p; - static char comm[MAXCOMLEN + 1]; + struct thread *t; + static char info[MAXCOMLEN + 1 + MAXCOMLEN + 1]; kt = kgdb_thr_lookup_tid(tid); if (kt == NULL) return (NULL); p = (struct proc *)kt->paddr; + t = (struct thread *)kt->kaddr; if (kvm_read(kvm, (uintptr_t)&p->p_comm[0], &comm, sizeof(comm)) != sizeof(comm)) return (NULL); - - return (comm); + if (kvm_read(kvm, (uintptr_t)&t->td_name[0], &td_name, + sizeof(td_name)) == sizeof(td_name) && + strcmp(comm, td_name) != 0) + snprintf(info, sizeof(info), "%s/%s", comm, td_name); + else + strlcpy(info, comm, sizeof(info)); + return (info); } ==== //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/main.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.11 2006/01/04 23:17:52 kan Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.12 2008/01/17 21:43:12 jhb Exp $"); #include #include @@ -75,7 +75,7 @@ static int verbose; static char crashdir[PATH_MAX]; -static char *kernel; +char *kernel; static char *remote; static char *vmcore; @@ -178,7 +178,7 @@ kgdb_new_objfile_chain(objfile); } -static CORE_ADDR +CORE_ADDR kgdb_parse(const char *exp) { struct cleanup *old_chain; ==== //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/trgt.c#2 (text+ko) ==== @@ -25,13 +25,16 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.5 2006/10/16 20:06:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.6 2008/01/17 21:43:12 jhb Exp $"); #include #include +#include #include #include +#include #include +#include #include #include @@ -40,6 +43,9 @@ #include #include #include +#include +#include +#include #include "kgdb.h" @@ -199,6 +205,268 @@ kgdb_switch_to_thread(thr); } +static int +kld_ok (char *path) +{ + struct stat sb; + + if (stat(path, &sb) == 0 && S_ISREG(sb.st_mode)) + return (1); + return (0); +} + +/* + * Look for a matching file in the following order: + * - filename + ".symbols" (e.g. foo.ko.symbols) + * - filename + ".debug" (e.g. foo.ko.debug) + * - filename (e.g. foo.ko) + * - dirname(kernel) + filename + ".symbols" (e.g. /boot/kernel/foo.ko.symbols) + * - dirname(kernel) + filename + ".debug" (e.g. /boot/kernel/foo.ko.debug) + * - dirname(kernel) + filename (e.g. /boot/kernel/foo.ko) + * - iterate over each path in the module path looking for: + * - dir + filename + ".symbols" (e.g. /boot/modules/foo.ko.symbols) + * - dir + filename + ".debug" (e.g. /boot/modules/foo.ko.debug) + * - dir + filename (e.g. /boot/modules/foo.ko) + */ +static int +find_kld_path (char *filename, char *path, size_t path_size) +{ + CORE_ADDR module_path_addr; + char module_path[PATH_MAX]; + char *kernel_dir, *module_dir, *cp; + + snprintf(path, path_size, "%s.symbols", filename); + if (kld_ok(path)) + return (1); + snprintf(path, path_size, "%s.debug", filename); + if (kld_ok(path)) + return (1); + snprintf(path, path_size, "%s", filename); + if (kld_ok(path)) + return (1); + kernel_dir = dirname(kernel); + if (kernel_dir != NULL) { + snprintf(path, path_size, "%s/%s.symbols", kernel_dir, + filename); + if (kld_ok(path)) + return (1); + snprintf(path, path_size, "%s/%s.debug", kernel_dir, filename); + if (kld_ok(path)) + return (1); + snprintf(path, path_size, "%s/%s", kernel_dir, filename); + if (kld_ok(path)) + return (1); + } + module_path_addr = kgdb_parse("linker_path"); + if (module_path_addr != 0 && + kvm_read(kvm, module_path_addr, module_path, sizeof(module_path)) == + sizeof(module_path)) { + module_path[PATH_MAX - 1] = '\0'; + cp = module_path; + while ((module_dir = strsep(&cp, ";")) != NULL) { + snprintf(path, path_size, "%s/%s.symbols", module_dir, + filename); + if (kld_ok(path)) + return (1); + snprintf(path, path_size, "%s/%s.debug", module_dir, + filename); + if (kld_ok(path)) + return (1); + snprintf(path, path_size, "%s/%s", module_dir, + filename); + if (kld_ok(path)) + return (1); + } + } + return (0); +} + +/* + * Read a kernel pointer given a KVA in 'address'. + */ +static CORE_ADDR +read_pointer (CORE_ADDR address) +{ + union { + uint32_t d32; + uint64_t d64; + } val; + + switch (TARGET_PTR_BIT) { + case 32: + if (kvm_read(kvm, address, &val.d32, sizeof(val.d32)) != + sizeof(val.d32)) + return (0); + return (val.d32); + case 64: + if (kvm_read(kvm, address, &val.d64, sizeof(val.d64)) != + sizeof(val.d64)) + return (0); + return (val.d64); + default: + return (0); + } +} + +/* + * Try to find this kld in the kernel linker's list of linker files. + */ +static int +find_kld_address (char *arg, CORE_ADDR *address) +{ + CORE_ADDR kld, filename_addr; + CORE_ADDR off_address, off_filename, off_next; + char kld_filename[PATH_MAX]; + char *filename; + size_t filelen; + + /* Compute offsets of relevant members in struct linker_file. */ + off_address = kgdb_parse("&((struct linker_file *)0)->address"); + off_filename = kgdb_parse("&((struct linker_file *)0)->filename"); + off_next = kgdb_parse("&((struct linker_file *)0)->link.tqe_next"); + if (off_address == 0 || off_filename == 0 || off_next == 0) + return (0); + + filename = basename(arg); + filelen = strlen(filename) + 1; + kld = kgdb_parse("linker_files.tqh_first"); + while (kld != 0) { + /* Try to read this linker file's filename. */ + filename_addr = read_pointer(kld + off_filename); + if (filename_addr == 0) + goto next_kld; + if (kvm_read(kvm, filename_addr, kld_filename, filelen) != + filelen) + goto next_kld; + + /* Compare this kld's filename against our passed in name. */ + if (kld_filename[filelen - 1] != '\0') + goto next_kld; + if (strcmp(kld_filename, filename) != 0) + goto next_kld; + + /* + * We found a match, use its address as the base + * address if we can read it. + */ + *address = read_pointer(kld + off_address); + if (*address == 0) + return (0); + return (1); + + next_kld: + kld = read_pointer(kld + off_next); + } + return (0); +} + +static void +add_section(struct section_addr_info *section_addrs, int *sect_indexp, + char *name, CORE_ADDR address) +{ + int sect_index; + + sect_index = *sect_indexp; + section_addrs->other[sect_index].name = name; + section_addrs->other[sect_index].addr = address; + printf_unfiltered("\t%s_addr = %s\n", name, + local_hex_string(address)); + sect_index++; + *sect_indexp = sect_index; +} + +static void +kgdb_add_kld_cmd (char *arg, int from_tty) +{ + struct section_addr_info *section_addrs; + struct cleanup *cleanup; + char path[PATH_MAX]; + asection *sect; + CORE_ADDR base_addr; + bfd *bfd; + CORE_ADDR text_addr, data_addr, bss_addr, rodata_addr; + int sect_count, sect_index; + + if (!find_kld_path(arg, path, sizeof(path))) { + error("unable to locate kld"); + return; + } + + if (!find_kld_address(arg, &base_addr)) { + error("unable to find kld in kernel"); + return; + } + + /* Open the kld and find the offsets of the various sections. */ + bfd = bfd_openr(path, gnutarget); + if (bfd == NULL) { + error("\"%s\": can't open: %s", path, + bfd_errmsg(bfd_get_error())); + return; + } + cleanup = make_cleanup_bfd_close(bfd); + + if (!bfd_check_format(bfd, bfd_object)) { + do_cleanups(cleanup); + error("\%s\": not an object file", path); + return; + } + + data_addr = bss_addr = rodata_addr = 0; + sect = bfd_get_section_by_name (bfd, ".text"); + if (sect == NULL) { + do_cleanups(cleanup); + error("\"%s\": can't find text section", path); + return; + } + text_addr = bfd_get_section_vma(bfd, sect); + sect_count = 1; + + /* Save the offsets of relevant sections. */ + sect = bfd_get_section_by_name (bfd, ".data"); + if (sect != NULL) { + data_addr = bfd_get_section_vma(bfd, sect); + sect_count++; + } + + sect = bfd_get_section_by_name (bfd, ".bss"); + if (sect != NULL) { + bss_addr = bfd_get_section_vma(bfd, sect); + sect_count++; + } + + sect = bfd_get_section_by_name (bfd, ".rodata"); + if (sect != NULL) { + rodata_addr = bfd_get_section_vma(bfd, sect); + sect_count++; + } + + do_cleanups(cleanup); + + printf_unfiltered("add symbol table from file \"%s\" at\n", path); + + /* Build a section table for symbol_file_add(). */ + section_addrs = alloc_section_addr_info(sect_count); + cleanup = make_cleanup(xfree, section_addrs); + sect_index = 0; + add_section(section_addrs, §_index, ".text", base_addr + text_addr); + if (data_addr != 0) + add_section(section_addrs, §_index, ".data", + base_addr + data_addr); + if (bss_addr != 0) + add_section(section_addrs, §_index, ".bss", + base_addr + bss_addr); + if (rodata_addr != 0) + add_section(section_addrs, §_index, ".rodata", + base_addr + rodata_addr); + + symbol_file_add(path, from_tty, section_addrs, 0, OBJF_USERLOADED); + + reinit_frame_cache(); + + do_cleanups(cleanup); +} + void kgdb_target(void) { @@ -236,4 +504,7 @@ "Set current process context"); add_com ("tid", class_obscure, kgdb_set_tid_cmd, "Set current thread context"); + add_com ("add-kld", class_files, kgdb_add_kld_cmd, + "Usage: add-kld FILE\n\ +Load the symbols from the kernel loadable module FILE."); } ==== //depot/projects/toehead/include/unistd.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.81 2008/01/10 22:11:20 jhb Exp $ + * $FreeBSD: src/include/unistd.h,v 1.82 2008/01/18 08:48:32 davidxu Exp $ */ #ifndef _UNISTD_H_ @@ -111,7 +111,7 @@ #define _POSIX_SPIN_LOCKS 200112L #define _POSIX_THREAD_ATTR_STACKADDR 200112L #define _POSIX_THREAD_ATTR_STACKSIZE 200112L -#define _POSIX_THREAD_CPUTIME -1 +#define _POSIX_THREAD_CPUTIME 200112L #define _POSIX_THREAD_PRIO_INHERIT 200112L #define _POSIX_THREAD_PRIO_PROTECT 200112L #define _POSIX_THREAD_PRIORITY_SCHEDULING 200112L ==== //depot/projects/toehead/lib/libarchive/archive_read_extract.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.59 2007/05/29 01:00:18 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.60 2008/01/18 04:53:45 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -67,6 +67,7 @@ archive_set_error(&a->archive, ENOMEM, "Can't extract"); return (NULL); } + memset(a->extract, 0, sizeof(*a->extract)); a->extract->ad = archive_write_disk_new(); if (a->extract->ad == NULL) { archive_set_error(&a->archive, ENOMEM, "Can't extract"); @@ -130,11 +131,13 @@ static int copy_data(struct archive *ar, struct archive *aw) { - int r; + off_t offset; const void *buff; + struct extract *extract; size_t size; - off_t offset; + int r; + extract = get_extract((struct archive_read *)ar); for (;;) { r = archive_read_data_block(ar, &buff, &size, &offset); if (r == ARCHIVE_EOF) @@ -149,6 +152,9 @@ "%s", archive_error_string(aw)); return (r); } + if (extract->extract_progress) + (extract->extract_progress) + (extract->extract_progress_user_data); } } ==== //depot/projects/toehead/lib/libarchive/archive_write_disk.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.18 2007/12/30 04:58:21 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.21 2008/01/18 06:16:08 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -171,6 +171,8 @@ int fd; /* Current offset for writing data to the file. */ off_t offset; + /* Maximum size of file. */ + off_t filesize; /* Dir we were in before this restore; only for deep paths. */ int restore_pwd; /* Mode we should use for this entry; affected by _PERM and umask. */ @@ -302,6 +304,7 @@ a->offset = 0; a->uid = a->user_uid; a->mode = archive_entry_mode(a->entry); + a->filesize = archive_entry_size(a->entry); archive_strcpy(&(a->_name_data), archive_entry_pathname(a->entry)); a->name = a->_name_data.s; archive_clear_error(&a->archive); @@ -425,8 +428,10 @@ * If it's not open, tell our client not to try writing. * In particular, dirs, links, etc, don't get written to. */ - if (a->fd < 0) + if (a->fd < 0) { archive_entry_set_size(entry, 0); + a->filesize = 0; + } done: /* Restore the user's umask before returning. */ umask(a->user_umask); @@ -451,6 +456,7 @@ { struct archive_write_disk *a = (struct archive_write_disk *)_a; ssize_t bytes_written = 0; + int r = ARCHIVE_OK; __archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC, ARCHIVE_STATE_DATA, "archive_write_disk_block"); @@ -470,7 +476,13 @@ } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 19 23:42:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF92516A421; Sat, 19 Jan 2008 23:42:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9D20716A41B for ; Sat, 19 Jan 2008 23:42:27 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 904E913C459 for ; Sat, 19 Jan 2008 23:42:27 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0JNgRpF005515 for ; Sat, 19 Jan 2008 23:42:27 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0JNgR03005512 for perforce@freebsd.org; Sat, 19 Jan 2008 23:42:27 GMT (envelope-from imp@freebsd.org) Date: Sat, 19 Jan 2008 23:42:27 GMT Message-Id: <200801192342.m0JNgR03005512@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133691 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 23:42:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=133691 Change 133691 by imp@imp_paco-paco on 2008/01/19 23:41:50 Remove extra junk that is left over from the great Mac OS X experiment. Affected files ... .. //depot/projects/mips2-jnpr/src/Makefile#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/Makefile#3 (text+ko) ==== @@ -166,7 +166,7 @@ # ${TGTS}: - ${_+_}cd ${.CURDIR}; \ + ${_+_}@cd ${.CURDIR}; \ ${_MAKE} ${.TARGET} # Set a reasonable default @@ -246,7 +246,6 @@ # MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \ DESTDIR= \ - LIBC= \ INSTALL="sh ${.CURDIR}/tools/install.sh" MMAKE= ${MMAKEENV} ${MAKE} \ -D_UPGRADING \ From owner-p4-projects@FreeBSD.ORG Sat Jan 19 23:49:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD35716A41B; Sat, 19 Jan 2008 23:49:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7AE6916A419 for ; Sat, 19 Jan 2008 23:49:35 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6D84113C447 for ; Sat, 19 Jan 2008 23:49:35 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0JNnZ6r005753 for ; Sat, 19 Jan 2008 23:49:35 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0JNnYT4005750 for perforce@freebsd.org; Sat, 19 Jan 2008 23:49:34 GMT (envelope-from imp@freebsd.org) Date: Sat, 19 Jan 2008 23:49:34 GMT Message-Id: <200801192349.m0JNnYT4005750@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 133692 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2008 23:49:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=133692 Change 133692 by imp@imp_paco-paco on 2008/01/19 23:49:25 Add note about a better, slightly more standard way to do this sort of thing. However, doing it like ports requires changes to the base tree. Affected files ... .. //depot/projects/mips2-jnpr/src/Makefile.inc1#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/Makefile.inc1#4 (text+ko) ==== @@ -1338,6 +1338,12 @@ ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 libraries \ DESTDIR=${XDDESTDIR} +# We should look at a way to do this the same way that all of the ports +# we have do it. It install things into ${BASE}/${XDDIR}/bin with the +# ${XDDIR}- prefix on all the binaries. These targets install things into +# ${BASE}/${XDDIR}/usr/bin without the ${XDDIR}- prefixes. I think the +# ports way is better, but haven't had a chance to change this to do that +# since that requires changes to the base system. _xi-links: ${_+_}cd ${XDDESTDIR}/usr/bin; \ for i in *; do \