From owner-p4-projects@FreeBSD.ORG Sun Oct 30 13:23:22 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19C1C16A421; Sun, 30 Oct 2005 13:23:22 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CC2E016A41F for ; Sun, 30 Oct 2005 13:23:21 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0407E43D48 for ; Sun, 30 Oct 2005 13:23:21 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9UDNKuv040304 for ; Sun, 30 Oct 2005 13:23:20 GMT (envelope-from soc-victor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9UDNKY8040301 for perforce@freebsd.org; Sun, 30 Oct 2005 13:23:20 GMT (envelope-from soc-victor@freebsd.org) Date: Sun, 30 Oct 2005 13:23:20 GMT Message-Id: <200510301323.j9UDNKY8040301@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-victor@freebsd.org using -f From: Victor Cruceru To: Perforce Change Reviews Cc: Subject: PERFORCE change 86066 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, 30 Oct 2005 13:23:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=86066 Change 86066 by soc-victor@soc-victor_Pentium4 on 2005/10/30 13:23:01 Branch for working at RFC 2789 - Mail Monitoring MIB Affected files ... .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/FREEBSD-Xlist#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/FREEBSD-upgrade#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/NEWS#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/README#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/TODO#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/VERSION#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/gensnmpdef/gensnmpdef.1#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/gensnmpdef/gensnmpdef.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/gensnmptree/gensnmptree.1#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/gensnmptree/gensnmptree.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/lib/asn1.3#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/lib/asn1.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/lib/asn1.h#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/lib/bsnmpagent.3#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/lib/bsnmpclient.3#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/lib/bsnmplib.3#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/lib/snmp.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/lib/snmp.h#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/lib/snmpagent.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/lib/snmpagent.h#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/lib/snmpclient.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/lib/snmpclient.h#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/lib/snmppriv.h#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/lib/support.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/lib/support.h#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/oid-list#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmp_mibII/mibII.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmp_mibII/mibII.h#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmp_mibII/mibII_ifmib.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmp_mibII/mibII_ifstack.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmp_mibII/mibII_ip.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmp_mibII/mibII_nettomedia.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmp_mibII/mibII_rcvaddr.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmp_mibII/mibII_route.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmp_mibII/mibII_tcp.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmp_mibII/mibII_tree.def#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmp_mibII/mibII_udp.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmp_mibII/snmp_mibII.3#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmp_mibII/snmp_mibII.h#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmp_ntp/NTP-MIB.txt#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmp_ntp/NTP-PROXY-MIB.txt#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmp_ntp/ntp_tree.def#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmp_ntp/snmp_ntp.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmpd/BEGEMOT-MIB.txt#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmpd/FOKUS-MIB.txt#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmpd/action.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmpd/bsnmpd.1#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmpd/config.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmpd/export.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmpd/main.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmpd/snmpd.config#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmpd/snmpd.h#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmpd/snmpd.sh#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmpd/snmpmod.3#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmpd/snmpmod.h#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmpd/trans_lsock.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmpd/trans_lsock.h#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmpd/trans_udp.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmpd/trans_udp.h#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmpd/trap.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmpd/tree.def#1 branch .. //depot/projects/soc2005/mta_bsnmp/lib/libbegemot/Makefile#1 branch .. //depot/projects/soc2005/mta_bsnmp/lib/libbsnmp/Makefile#1 branch .. //depot/projects/soc2005/mta_bsnmp/lib/libbsnmp/Makefile.inc#1 branch .. //depot/projects/soc2005/mta_bsnmp/lib/libbsnmp/libbsnmp/Makefile#1 branch .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/Makefile#1 branch .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/Makefile.inc#1 branch .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/bsnmpd/Makefile#1 branch .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/gensnmptree/Makefile#1 branch .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/Makefile#1 branch .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/Makefile.inc#1 branch .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt#1 branch .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_atm/Makefile#1 branch .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def#1 branch .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_atm/atm_sys.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#1 branch .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt#1 branch .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile#1 branch .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def#1 branch .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3#1 branch .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.h#1 branch .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt#1 branch .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_pf/Makefile#1 branch .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#1 branch .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Oct 30 13:52:58 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A91D16A422; Sun, 30 Oct 2005 13:52:58 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D7CA16A41F for ; Sun, 30 Oct 2005 13:52:58 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 02C5E43D46 for ; Sun, 30 Oct 2005 13:52:58 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9UDqv22041255 for ; Sun, 30 Oct 2005 13:52:57 GMT (envelope-from soc-saturnero@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9UDqvKe041252 for perforce@freebsd.org; Sun, 30 Oct 2005 13:52:57 GMT (envelope-from soc-saturnero@freebsd.org) Date: Sun, 30 Oct 2005 13:52:57 GMT Message-Id: <200510301352.j9UDqvKe041252@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-saturnero@freebsd.org using -f From: soc-saturnero To: Perforce Change Reviews Cc: Subject: PERFORCE change 86067 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, 30 Oct 2005 13:52:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=86067 Change 86067 by soc-saturnero@soc-saturnero_sberta on 2005/10/30 13:52:25 Merge from FreeSBIE CVS: comment fixes Affected files ... .. //depot/projects/soc2005/freesbie/conf/freesbie.defaults.conf#14 edit .. //depot/projects/soc2005/freesbie/scripts/launch.sh#9 edit Differences ... ==== //depot/projects/soc2005/freesbie/conf/freesbie.defaults.conf#14 (text+ko) ==== @@ -7,9 +7,11 @@ # See COPYING for license terms. # # $FreeBSD$ -# $Id$ +# $Id: freesbie.defaults.conf,v 1.4 2005/10/30 13:53:53 saturnero Exp $ # -# Don't modify it, create your own freesbie.conf instead. +# Don't modify it, create your own conf/freesbie.conf instead, or set +# an environment variable called FREESBIE_CONF to the absolute path of +# your configuration file. # Variables ==== //depot/projects/soc2005/freesbie/scripts/launch.sh#9 (text+ko) ==== @@ -7,7 +7,7 @@ # See COPYING for license terms. # # $FreeBSD$ -# $Id$ +# $Id: launch.sh,v 1.3 2005/10/29 18:46:07 drizzt Exp $ # # Usage: launch.sh ${TARGET} [ ${LOGFILE} ] @@ -60,7 +60,7 @@ # - scripts/custom/${ARCH}/${TARGET}.sh # - scripts/custom/${TARGET}.sh # - scripts/${ARCH}/${TARGET}.sh -# - scripts/custom/${ARCH}/${TARGET}.sh +# - scripts/${TARGET}.sh if [ -f "${LOCALDIR}/scripts/custom/${ARCH}/${TARGET}.sh" ]; then . ${LOCALDIR}/scripts/custom/${ARCH}/${TARGET}.sh From owner-p4-projects@FreeBSD.ORG Sun Oct 30 14:11:22 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B368316A421; Sun, 30 Oct 2005 14:11:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 807BC16A41F for ; Sun, 30 Oct 2005 14:11:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3181B43D46 for ; Sun, 30 Oct 2005 14:11:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9UEBKhx042726 for ; Sun, 30 Oct 2005 14:11:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9UEBK2f042723 for perforce@freebsd.org; Sun, 30 Oct 2005 14:11:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 30 Oct 2005 14:11:20 GMT Message-Id: <200510301411.j9UEBK2f042723@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 86068 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, 30 Oct 2005 14:11:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=86068 Change 86068 by rwatson@rwatson_zoo on 2005/10/30 14:10:56 First cut at breaking out mbuf copyin/etc code from sosend() into sosend_copyin(). Compiles. Affected files ... .. //depot/projects/netsmp/src/sys/kern/uipc_socket.c#14 edit Differences ... ==== //depot/projects/netsmp/src/sys/kern/uipc_socket.c#14 (text+ko) ==== @@ -569,6 +569,131 @@ return (error); } +/* + * sosend_copyin() accepts a uio and prepares an mbuf chain holding part or + * all of the data referenced by the uio. If desired, it uses zero-copy. + * *space will be updated to reflect data copied in. + * + * NB: If atomic I/O is requested, the caller must already have checked that + * space can hold resid bytes. + * + * NB: In the event of an error, the caller may need to free the partial + * chain pointed to by *mpp. The contents of both *uio and *space may be + * modified even in the case of an error. + */ +static int +sosend_copyin(struct uio *uio, struct mbuf **retmp, int atomic, long *space, + int flags) +{ + struct mbuf *m, **mp, *top; + long len, resid; + int error; +#ifdef ZERO_COPY_SOCKETS + int cow_send; +#endif + + *retmp = top = NULL; + mp = ⊤ + len = 0; + resid = uio->uio_resid; + error = 0; + do { +#ifdef ZERO_COPY_SOCKETS + cow_send = 0; +#endif /* ZERO_COPY_SOCKETS */ + if (resid >= MINCLSIZE) { +#ifdef ZERO_COPY_SOCKETS + if (top == NULL) { + MGETHDR(m, M_TRYWAIT, MT_DATA); + if (m == NULL) { + error = ENOBUFS; + goto out; + } + m->m_pkthdr.len = 0; + m->m_pkthdr.rcvif = NULL; + } else { + MGET(m, M_TRYWAIT, MT_DATA); + if (m == NULL) { + error = ENOBUFS; + goto out; + } + } + if (so_zero_copy_send && + resid>=PAGE_SIZE && + *space>=PAGE_SIZE && + uio->uio_iov->iov_len>=PAGE_SIZE) { + so_zerocp_stats.size_ok++; + so_zerocp_stats.align_ok++; + cow_send = socow_setup(m, uio); + len = cow_send; + } + if (!cow_send) { + MCLGET(m, M_TRYWAIT); + if ((m->m_flags & M_EXT) == 0) { + m_free(m); + m = NULL; + } else { + len = min(min(MCLBYTES, resid), + *space); + } + } +#else /* ZERO_COPY_SOCKETS */ + if (top == NULL) { + m = m_getcl(M_TRYWAIT, MT_DATA, M_PKTHDR); + m->m_pkthdr.len = 0; + m->m_pkthdr.rcvif = NULL; + } else + m = m_getcl(M_TRYWAIT, MT_DATA, 0); + len = min(min(MCLBYTES, resid), *space); +#endif /* ZERO_COPY_SOCKETS */ + } else { + if (top == NULL) { + m = m_gethdr(M_TRYWAIT, MT_DATA); + m->m_pkthdr.len = 0; + m->m_pkthdr.rcvif = NULL; + + len = min(min(MHLEN, resid), *space); + /* + * For datagram protocols, leave room + * for protocol headers in first mbuf. + */ + if (atomic && m && len < MHLEN) + MH_ALIGN(m, len); + } else { + m = m_get(M_TRYWAIT, MT_DATA); + len = min(min(MLEN, resid), *space); + } + } + if (m == NULL) { + error = ENOBUFS; + goto out; + } + + *space -= len; +#ifdef ZERO_COPY_SOCKETS + if (cow_send) + error = 0; + else +#endif /* ZERO_COPY_SOCKETS */ + error = uiomove(mtod(m, void *), (int)len, uio); + resid = uio->uio_resid; + m->m_len = len; + *mp = m; + top->m_pkthdr.len += len; + if (error) + goto out; + mp = &m->m_next; + if (resid <= 0) { + if (flags & MSG_EOR) + top->m_flags |= M_EOR; + break; + } + } while (*space > 0 && atomic); +out: + *retmp = top; + return (error); +} + #define SBLOCKWAIT(f) (((f) & MSG_DONTWAIT) ? M_NOWAIT : M_WAITOK) /* * Send on a socket. @@ -613,9 +738,7 @@ int flags; struct thread *td; { - struct mbuf **mp; - struct mbuf *m; - long space, len = 0, resid; + long space, resid; int clen = 0, error, dontroute; int atomic = sosendallatonce(so) || top; #ifdef ZERO_COPY_SOCKETS @@ -682,6 +805,7 @@ snderr(so->so_proto->pr_flags & PR_CONNREQUIRED ? ENOTCONN : EDESTADDRREQ); } + space = sbspace(&so->so_snd); if (flags & MSG_OOB) space += 1024; @@ -699,153 +823,61 @@ goto restart; } SOCKBUF_UNLOCK(&so->so_snd); - mp = ⊤ space -= clen; do { - if (uio == NULL) { - /* - * Data is prepackaged in "top". - */ - resid = 0; - if (flags & MSG_EOR) - top->m_flags |= M_EOR; - } else do { -#ifdef ZERO_COPY_SOCKETS - cow_send = 0; -#endif /* ZERO_COPY_SOCKETS */ - if (resid >= MINCLSIZE) { -#ifdef ZERO_COPY_SOCKETS - if (top == NULL) { - MGETHDR(m, M_TRYWAIT, MT_DATA); - if (m == NULL) { - error = ENOBUFS; - SOCKBUF_LOCK(&so->so_snd); - goto release; - } - m->m_pkthdr.len = 0; - m->m_pkthdr.rcvif = NULL; - } else { - MGET(m, M_TRYWAIT, MT_DATA); - if (m == NULL) { - error = ENOBUFS; - SOCKBUF_LOCK(&so->so_snd); - goto release; - } - } - if (so_zero_copy_send && - resid>=PAGE_SIZE && - space>=PAGE_SIZE && - uio->uio_iov->iov_len>=PAGE_SIZE) { - so_zerocp_stats.size_ok++; - so_zerocp_stats.align_ok++; - cow_send = socow_setup(m, uio); - len = cow_send; - } - if (!cow_send) { - MCLGET(m, M_TRYWAIT); - if ((m->m_flags & M_EXT) == 0) { - m_free(m); - m = NULL; - } else { - len = min(min(MCLBYTES, resid), space); - } - } -#else /* ZERO_COPY_SOCKETS */ - if (top == NULL) { - m = m_getcl(M_TRYWAIT, MT_DATA, M_PKTHDR); - m->m_pkthdr.len = 0; - m->m_pkthdr.rcvif = NULL; - } else - m = m_getcl(M_TRYWAIT, MT_DATA, 0); - len = min(min(MCLBYTES, resid), space); -#endif /* ZERO_COPY_SOCKETS */ + if (uio == NULL) { + resid = 0; + if (flags & MSG_EOR) + top->m_flags |= M_EOR; } else { - if (top == NULL) { - m = m_gethdr(M_TRYWAIT, MT_DATA); - m->m_pkthdr.len = 0; - m->m_pkthdr.rcvif = NULL; - - len = min(min(MHLEN, resid), space); - /* - * For datagram protocols, leave room - * for protocol headers in first mbuf. - */ - if (atomic && m && len < MHLEN) - MH_ALIGN(m, len); - } else { - m = m_get(M_TRYWAIT, MT_DATA); - len = min(min(MLEN, resid), space); + error = sosend_copyin(uio, &top, atomic, + &space, flags); + if (error != 0) { + SOCKBUF_LOCK(&so->so_snd); + goto release; } + resid = uio->uio_resid; } - if (m == NULL) { - error = ENOBUFS; - SOCKBUF_LOCK(&so->so_snd); - goto release; + if (dontroute) { + SOCK_LOCK(so); + so->so_options |= SO_DONTROUTE; + SOCK_UNLOCK(so); } - - space -= len; -#ifdef ZERO_COPY_SOCKETS - if (cow_send) - error = 0; - else -#endif /* ZERO_COPY_SOCKETS */ - error = uiomove(mtod(m, void *), (int)len, uio); - resid = uio->uio_resid; - m->m_len = len; - *mp = m; - top->m_pkthdr.len += len; - if (error) { - SOCKBUF_LOCK(&so->so_snd); - goto release; - } - mp = &m->m_next; - if (resid <= 0) { - if (flags & MSG_EOR) - top->m_flags |= M_EOR; - break; - } - } while (space > 0 && atomic); - if (dontroute) { - SOCK_LOCK(so); - so->so_options |= SO_DONTROUTE; - SOCK_UNLOCK(so); - } - /* - * XXX all the SBS_CANTSENDMORE checks previously - * done could be out of date. We could have recieved - * a reset packet in an interrupt or maybe we slept - * while doing page faults in uiomove() etc. We could - * probably recheck again inside the locking protection - * here, but there are probably other places that this - * also happens. We must rethink this. - */ - error = (*so->so_proto->pr_usrreqs->pru_send)(so, - (flags & MSG_OOB) ? PRUS_OOB : + /* + * XXX all the SBS_CANTSENDMORE checks previously + * done could be out of date. We could have recieved + * a reset packet in an interrupt or maybe we slept + * while doing page faults in uiomove() etc. We could + * probably recheck again inside the locking protection + * here, but there are probably other places that this + * also happens. We must rethink this. + */ + error = (*so->so_proto->pr_usrreqs->pru_send)(so, + (flags & MSG_OOB) ? PRUS_OOB : /* * If the user set MSG_EOF, the protocol * understands this flag and nothing left to * send then use PRU_SEND_EOF instead of PRU_SEND. */ - ((flags & MSG_EOF) && - (so->so_proto->pr_flags & PR_IMPLOPCL) && - (resid <= 0)) ? + ((flags & MSG_EOF) && + (so->so_proto->pr_flags & PR_IMPLOPCL) && + (resid <= 0)) ? PRUS_EOF : /* If there is more to send set PRUS_MORETOCOME */ - (resid > 0 && space > 0) ? PRUS_MORETOCOME : 0, - top, addr, control, td); - if (dontroute) { - SOCK_LOCK(so); - so->so_options &= ~SO_DONTROUTE; - SOCK_UNLOCK(so); - } - clen = 0; - control = NULL; - top = NULL; - mp = ⊤ - if (error) { - SOCKBUF_LOCK(&so->so_snd); - goto release; - } + (resid > 0 && space > 0) ? PRUS_MORETOCOME : 0, + top, addr, control, td); + if (dontroute) { + SOCK_LOCK(so); + so->so_options &= ~SO_DONTROUTE; + SOCK_UNLOCK(so); + } + clen = 0; + control = NULL; + top = NULL; + if (error) { + SOCKBUF_LOCK(&so->so_snd); + goto release; + } } while (resid && space > 0); SOCKBUF_LOCK(&so->so_snd); } while (resid); From owner-p4-projects@FreeBSD.ORG Sun Oct 30 15:10:34 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4717316A421; Sun, 30 Oct 2005 15:10:34 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 00E5816A420 for ; Sun, 30 Oct 2005 15:10:34 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9252443D49 for ; Sun, 30 Oct 2005 15:10:33 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9UFAX5B044915 for ; Sun, 30 Oct 2005 15:10:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9UFAW1q044912 for perforce@freebsd.org; Sun, 30 Oct 2005 15:10:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 30 Oct 2005 15:10:32 GMT Message-Id: <200510301510.j9UFAW1q044912@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 86069 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, 30 Oct 2005 15:10:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=86069 Change 86069 by rwatson@rwatson_zoo on 2005/10/30 15:10:06 Add sosend_dgram(), and optimized version of sosend() that is specific to datagram protocols. Affected files ... .. //depot/projects/netsmp/src/sys/kern/uipc_socket.c#15 edit Differences ... ==== //depot/projects/netsmp/src/sys/kern/uipc_socket.c#15 (text+ko) ==== @@ -695,6 +695,145 @@ } #define SBLOCKWAIT(f) (((f) & MSG_DONTWAIT) ? M_NOWAIT : M_WAITOK) +#define snderr(errno) { error = (errno); goto out; } + +int +sosend_dgram(so, addr, uio, top, control, flags, td) + struct socket *so; + struct sockaddr *addr; + struct uio *uio; + struct mbuf *top; + struct mbuf *control; + int flags; + struct thread *td; +{ + long space, resid; + int clen = 0, error, dontroute; + int atomic = sosendallatonce(so) || top; + + KASSERT(so->so_type == SOCK_DGRAM, ("sodgram_send: !SOCK_DGRAM")); + KASSERT(so->so_proto->pr_flags & PR_ATOMIC, + ("sodgram_send: !PR_ATOMIC")); + + if (uio != NULL) + resid = uio->uio_resid; + else + resid = top->m_pkthdr.len; + /* + * In theory resid should be unsigned. + * However, space must be signed, as it might be less than 0 + * if we over-committed, and we must use a signed comparison + * of space and resid. On the other hand, a negative resid + * causes us to loop sending 0-length segments to the protocol. + * + * Also check to make sure that MSG_EOR isn't used on SOCK_STREAM + * type sockets since that's an error. + */ + if (resid < 0) { + error = EINVAL; + goto out; + } + + dontroute = + (flags & MSG_DONTROUTE) && (so->so_options & SO_DONTROUTE) == 0; + if (td != NULL) + td->td_proc->p_stats->p_ru.ru_msgsnd++; + if (control != NULL) + clen = control->m_len; + + SOCKBUF_LOCK(&so->so_snd); + if (so->so_snd.sb_state & SBS_CANTSENDMORE) + snderr(EPIPE); + if (so->so_error) { + error = so->so_error; + so->so_error = 0; + goto out; + } + if ((so->so_state & SS_ISCONNECTED) == 0) { + /* + * `sendto' and `sendmsg' is allowed on a connection- + * based socket if it supports implied connect. + * Return ENOTCONN if not connected and no address is + * supplied. + */ + if ((so->so_proto->pr_flags & PR_CONNREQUIRED) && + (so->so_proto->pr_flags & PR_IMPLOPCL) == 0) { + if ((so->so_state & SS_ISCONFIRMING) == 0 && + !(resid == 0 && clen != 0)) + snderr(ENOTCONN); + } else if (addr == NULL) + snderr(so->so_proto->pr_flags & PR_CONNREQUIRED ? + ENOTCONN : EDESTADDRREQ); + } + + /* + * Do we need MSG_OOB support in SOCK_DGRAM? Signs here may be a + * problem and need fixing. + */ + space = sbspace(&so->so_snd); + if (flags & MSG_OOB) + space += 1024; + space -= clen; + if (resid > space) + snderr(EMSGSIZE); + SOCKBUF_UNLOCK(&so->so_snd); + if (uio == NULL) { + resid = 0; + if (flags & MSG_EOR) + top->m_flags |= M_EOR; + } else { + error = sosend_copyin(uio, &top, atomic, &space, flags); + if (error) + goto out; + resid = uio->uio_resid; + } + KASSERT(resid == 0, ("sosend_dgram: resid != 0")); + /* + * XXXRW: Frobbing SO_DONTROUTE here is even worse without sblock + * than with. + */ + if (dontroute) { + SOCK_LOCK(so); + so->so_options |= SO_DONTROUTE; + SOCK_UNLOCK(so); + } + /* + * XXX all the SBS_CANTSENDMORE checks previously + * done could be out of date. We could have recieved + * a reset packet in an interrupt or maybe we slept + * while doing page faults in uiomove() etc. We could + * probably recheck again inside the locking protection + * here, but there are probably other places that this + * also happens. We must rethink this. + */ + error = (*so->so_proto->pr_usrreqs->pru_send)(so, + (flags & MSG_OOB) ? PRUS_OOB : + /* + * If the user set MSG_EOF, the protocol + * understands this flag and nothing left to + * send then use PRU_SEND_EOF instead of PRU_SEND. + */ + ((flags & MSG_EOF) && + (so->so_proto->pr_flags & PR_IMPLOPCL) && + (resid <= 0)) ? + PRUS_EOF : 0, + top, addr, control, td); + if (dontroute) { + SOCK_LOCK(so); + so->so_options &= ~SO_DONTROUTE; + SOCK_UNLOCK(so); + } + clen = 0; + control = NULL; + top = NULL; +out: + if (top != NULL) + m_freem(top); + if (control != NULL) + m_freem(control); + return (error); +} + /* * Send on a socket. * If send must go all at once and message is larger than @@ -771,7 +910,6 @@ td->td_proc->p_stats->p_ru.ru_msgsnd++; if (control != NULL) clen = control->m_len; -#define snderr(errno) { error = (errno); goto release; } SOCKBUF_LOCK(&so->so_snd); restart: From owner-p4-projects@FreeBSD.ORG Sun Oct 30 15:12:37 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBA5716A421; Sun, 30 Oct 2005 15:12:36 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 96BEF16A41F for ; Sun, 30 Oct 2005 15:12:36 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6150B43D45 for ; Sun, 30 Oct 2005 15:12:36 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9UFCaob044976 for ; Sun, 30 Oct 2005 15:12:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9UFCakK044973 for perforce@freebsd.org; Sun, 30 Oct 2005 15:12:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 30 Oct 2005 15:12:36 GMT Message-Id: <200510301512.j9UFCakK044973@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 86070 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, 30 Oct 2005 15:12:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=86070 Change 86070 by rwatson@rwatson_zoo on 2005/10/30 15:12:12 Prototype for sosend_dgram(). Affected files ... .. //depot/projects/netsmp/src/sys/sys/socketvar.h#4 edit Differences ... ==== //depot/projects/netsmp/src/sys/sys/socketvar.h#4 (text+ko) ==== @@ -520,6 +520,9 @@ int sosend(struct socket *so, struct sockaddr *addr, struct uio *uio, struct mbuf *top, struct mbuf *control, int flags, struct thread *td); +int sosend_dgram(struct socket *so, struct sockaddr *addr, + struct uio *uio, struct mbuf *top, struct mbuf *control, + int flags, struct thread *td); int sosetopt(struct socket *so, struct sockopt *sopt); int soshutdown(struct socket *so, int how); void sotoxsocket(struct socket *so, struct xsocket *xso); From owner-p4-projects@FreeBSD.ORG Sun Oct 30 15:34:04 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7856E16A421; Sun, 30 Oct 2005 15:34:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4A0F616A41F for ; Sun, 30 Oct 2005 15:34:03 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C249843D48 for ; Sun, 30 Oct 2005 15:34:02 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9UFY2qJ045959 for ; Sun, 30 Oct 2005 15:34:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9UFY2hC045956 for perforce@freebsd.org; Sun, 30 Oct 2005 15:34:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 30 Oct 2005 15:34:02 GMT Message-Id: <200510301534.j9UFY2hC045956@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 86071 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, 30 Oct 2005 15:34:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=86071 Change 86071 by rwatson@rwatson_zoo on 2005/10/30 15:33:59 Integrate netsmp branch. Affected files ... .. //depot/projects/netsmp/src/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/netsmp/src/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/netsmp/src/sys/boot/forth/beastie.4th#2 integrate .. //depot/projects/netsmp/src/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/netsmp/src/sys/conf/Makefile.alpha#2 integrate .. //depot/projects/netsmp/src/sys/conf/Makefile.amd64#3 integrate .. //depot/projects/netsmp/src/sys/conf/Makefile.arm#3 integrate .. //depot/projects/netsmp/src/sys/conf/Makefile.i386#2 integrate .. //depot/projects/netsmp/src/sys/conf/Makefile.ia64#2 integrate .. //depot/projects/netsmp/src/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/netsmp/src/sys/conf/Makefile.powerpc#3 integrate .. //depot/projects/netsmp/src/sys/conf/Makefile.sparc64#2 integrate .. //depot/projects/netsmp/src/sys/conf/files#11 integrate .. //depot/projects/netsmp/src/sys/conf/files.i386#5 integrate .. //depot/projects/netsmp/src/sys/conf/files.sparc64#2 integrate .. //depot/projects/netsmp/src/sys/conf/kern.post.mk#4 integrate .. //depot/projects/netsmp/src/sys/conf/kmod.mk#4 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-all.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/ata/atapi-cd.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/cardbus/cardbusreg.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/cardbus/cardbusvar.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/ed/if_ed_pccard.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/en/midway.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/if_ndis/if_ndis.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/isp/isp.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/isp/ispmbox.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/nve/if_nve.c#9 integrate .. //depot/projects/netsmp/src/sys/dev/pccard/pccarddevs#5 integrate .. //depot/projects/netsmp/src/sys/dev/pccbb/pccbb.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/pci/pci.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pcm/dsp.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/txp/if_txp.c#9 integrate .. //depot/projects/netsmp/src/sys/dev/txp/if_txpreg.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/uart/uart_bus_ebus.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/uart/uart_bus_pccard.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/netsmp/src/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/netsmp/src/sys/i386/conf/DEFAULTS#1 branch .. //depot/projects/netsmp/src/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/netsmp/src/sys/i386/isa/pcf.c#2 delete .. //depot/projects/netsmp/src/sys/kern/init_sysent.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/kern_clock.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/kern_sig.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/kern_time.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/syscalls.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/syscalls.master#3 integrate .. //depot/projects/netsmp/src/sys/kern/tty.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/uipc_socket.c#16 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_aio.c#4 integrate .. //depot/projects/netsmp/src/sys/modules/Makefile#6 integrate .. //depot/projects/netsmp/src/sys/modules/i2c/controllers/pcf/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_bridge.h#2 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_ksocket.h#2 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_parse.h#2 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_pppoe.h#2 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_vlan.h#2 integrate .. //depot/projects/netsmp/src/sys/netinet/in.c#10 integrate .. //depot/projects/netsmp/src/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/netsmp/src/sys/pc98/conf/DEFAULTS#1 branch .. //depot/projects/netsmp/src/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/netsmp/src/sys/pci/if_vr.c#8 integrate .. //depot/projects/netsmp/src/sys/pci/if_vrreg.h#2 integrate .. //depot/projects/netsmp/src/sys/pci/if_wb.c#9 integrate .. //depot/projects/netsmp/src/sys/pci/if_wbreg.h#3 integrate .. //depot/projects/netsmp/src/sys/powerpc/powerpc/db_trace.c#3 integrate .. //depot/projects/netsmp/src/sys/sys/aio.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/signal.h#4 integrate .. //depot/projects/netsmp/src/sys/sys/signalvar.h#3 integrate .. //depot/projects/netsmp/src/sys/sys/syscall.h#3 integrate .. //depot/projects/netsmp/src/sys/sys/syscall.mk#3 integrate .. //depot/projects/netsmp/src/sys/sys/sysproto.h#3 integrate .. //depot/projects/netsmp/src/sys/sys/timers.h#3 integrate .. //depot/projects/netsmp/src/sys/sys/unistd.h#3 integrate .. //depot/projects/netsmp/src/tools/regression/aio/kqueue/lio/Makefile#2 integrate .. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/command1.0#1 branch .. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/command2.0#1 branch .. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/command3.0#1 branch .. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/command3.0.stdout#1 branch .. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/command4.127#1 branch .. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/command5.0#1 branch .. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/command5.0.stdout#1 branch .. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/command6.127#1 branch .. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/command6.127.stdout#1 branch .. //depot/projects/netsmp/src/tools/regression/bin/sh/regress.sh#3 integrate .. //depot/projects/netsmp/src/tools/regression/geom_gpt/gctl.t#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_gpt/test.c#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_uzip/Makefile#2 integrate .. //depot/projects/netsmp/src/tools/regression/geom_uzip/test-1.img.gz.uue#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_uzip/test-1.img.uzip.uue#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_uzip/test-1.sh#2 integrate .. //depot/projects/netsmp/src/tools/regression/geom_uzip/test-2.sh#2 integrate .. //depot/projects/netsmp/src/tools/regression/lib/libutil/Makefile#1 branch .. //depot/projects/netsmp/src/tools/regression/lib/libutil/test-trimdomain-nodomain.c#1 branch .. //depot/projects/netsmp/src/tools/regression/lib/libutil/test-trimdomain-nodomain.t#1 branch .. //depot/projects/netsmp/src/tools/regression/lib/libutil/test-trimdomain.c#1 branch .. //depot/projects/netsmp/src/tools/regression/lib/libutil/test-trimdomain.t#1 branch .. //depot/projects/netsmp/src/tools/regression/ufs/uprintf/Makefile#1 branch .. //depot/projects/netsmp/src/tools/regression/ufs/uprintf/ufs_uprintf.c#1 branch .. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/Makefile#2 integrate .. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.status.2#2 integrate .. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.status.3#1 branch .. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.status.4#1 branch .. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.status.5#1 branch .. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.stderr.2#2 integrate .. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.stderr.3#1 branch .. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.stderr.4#1 branch .. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.stderr.5#1 branch .. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.stdout.2#2 integrate .. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.stdout.3#1 branch .. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.stdout.4#1 branch .. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.stdout.5#1 branch .. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/test.t#2 integrate .. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/semi/Makefile#1 branch .. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/semi/expected.status.1#1 branch .. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/semi/expected.status.2#1 branch .. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/semi/expected.stderr.1#1 branch .. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/semi/expected.stderr.2#1 branch .. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/semi/expected.stdout.1#1 branch .. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/semi/expected.stdout.2#1 branch .. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/semi/test.t#1 branch Differences ... ==== //depot/projects/netsmp/src/sys/amd64/conf/GENERIC#4 (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.442 2005/09/08 03:29:18 scottl Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.444 2005/10/27 18:54:43 peter Exp $ machine amd64 cpu HAMMER @@ -76,15 +76,11 @@ # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel -# Workarounds for some known-to-be-broken chipsets (nVidia nForce3-Pro150) -device atpic # 8259A compatability - # Linux 32-bit ABI support options LINPROCFS # Cannot be a module yet. -# Bus support. Do not remove isa, even if you have no isa slots +# Bus support. device acpi -device isa device pci # Floppy drives @@ -234,8 +230,6 @@ # Pseudo devices. device loop # Network loopback -device mem # Memory and kernel memory devices -device io # I/O device device random # Entropy device device ether # Ethernet support device sl # Kernel SLIP ==== //depot/projects/netsmp/src/sys/boot/forth/beastie.4th#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/boot/forth/beastie.4th,v 1.10 2004/12/01 07:17:57 scottl Exp $ +\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.11 2005/10/30 05:36:23 scottl Exp $ marker task-beastie.4th @@ -50,7 +50,7 @@ 46 constant dot \ The BSD Daemon. He is 19 rows high and 34 columns wide -: technicolor-beastie ( x y -- ) +: beastie-logo ( x y -- ) 2dup at-xy ." , ," 1+ 2dup at-xy ." /( )`" 1+ 2dup at-xy ." \ \___ / |" 1+ @@ -72,7 +72,7 @@ at-xy ." `--{__________) " ; -: boring-beastie ( x y -- ) +: beastiebw-logo ( x y -- ) 2dup at-xy ." , ," 1+ 2dup at-xy ." /( )`" 1+ 2dup at-xy ." \ \___ / |" 1+ @@ -94,18 +94,51 @@ at-xy ." `--{__________)" ; -: print-beastie ( x y -- ) - s" loader_color" getenv +: fbsdbw-logo ( x y -- ) + 2dup at-xy ." ______" 1+ + 2dup at-xy ." | ____| __ ___ ___ " 1+ + 2dup at-xy ." | |__ | '__/ _ \/ _ \" 1+ + 2dup at-xy ." | __|| | | __/ __/" 1+ + 2dup at-xy ." | | | | | | |" 1+ + 2dup at-xy ." |_| |_| \___|\___|" 1+ + 2dup at-xy ." ____ _____ _____" 1+ + 2dup at-xy ." | _ \ / ____| __ \" 1+ + 2dup at-xy ." | |_) | (___ | | | |" 1+ + 2dup at-xy ." | _ < \___ \| | | |" 1+ + 2dup at-xy ." | |_) |____) | |__| |" 1+ + 2dup at-xy ." | | | |" 1+ + at-xy ." |____/|_____/|_____/" +; + +: print-logo ( x y -- ) + s" loader_logo" getenv dup -1 = if drop - boring-beastie + fbsdbw-logo + exit + then + 2dup s" fbsdbw" compare-insensitive 0= if + 2drop + fbsdbw-logo + exit + then + 2dup s" beastiebw" compare-insensitive 0= if + 2drop + beastiebw-logo + exit + then + 2dup s" beastie" compare-insensitive 0= if + 2drop + beastie-logo exit then - s" YES" compare-insensitive 0<> if - boring-beastie + 2dup s" none" compare-insensitive 0= if + 2drop + \ no logo exit then - technicolor-beastie + 2drop + fbsdbw-logo ; : acpienabled? ( -- flag ) @@ -144,7 +177,7 @@ 8 menuY ! 5 menuX ! clear - 46 4 print-beastie + 46 4 print-logo 42 20 2 2 box 13 6 at-xy ." Welcome to FreeBSD!" printmenuitem ." Boot FreeBSD [default]" bootkey ! ==== //depot/projects/netsmp/src/sys/boot/i386/loader/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.81 2005/06/01 15:32:57 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.82 2005/10/30 05:41:42 scottl Exp $ PROG= loader.sym INTERNALPROG= @@ -73,7 +73,7 @@ .PATH: ${.CURDIR}/../../forth FILES= loader loader.help loader.4th support.4th loader.conf -FILES+= screen.4th frames.4th +FILES+= screen.4th frames.4th beastie.4th # XXX INSTALLFLAGS_loader= -b FILESMODE_loader= ${BINMODE} -b FILESDIR_loader.conf= /boot/defaults ==== //depot/projects/netsmp/src/sys/conf/Makefile.alpha#2 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.alpha -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.alpha 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.135 2005/04/13 14:49:57 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.136 2005/10/27 19:27:54 jhb Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600002 +%VERSREQ= 600003 .if !defined(S) .if exists(./@/.) ==== //depot/projects/netsmp/src/sys/conf/Makefile.amd64#3 (text+ko) ==== @@ -2,7 +2,7 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 # from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49 -# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.17 2005/09/07 17:38:46 obrien Exp $ +# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.18 2005/10/27 19:27:54 jhb Exp $ # # Makefile for FreeBSD # @@ -18,7 +18,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600002 +%VERSREQ= 600003 STD8X16FONT?= iso ==== //depot/projects/netsmp/src/sys/conf/Makefile.arm#3 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.arm -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.arm,v 1.13 2005/10/17 18:31:37 cognet Exp $ +# $FreeBSD: src/sys/conf/Makefile.arm,v 1.14 2005/10/27 19:27:54 jhb Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600002 +%VERSREQ= 600003 # Temporary stuff while we're still embryonic NO_MODULES= ==== //depot/projects/netsmp/src/sys/conf/Makefile.i386#2 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.i386,v 1.265 2005/04/13 14:49:57 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.i386,v 1.266 2005/10/27 19:27:54 jhb Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600002 +%VERSREQ= 600003 STD8X16FONT?= iso ==== //depot/projects/netsmp/src/sys/conf/Makefile.ia64#2 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.ia64 -- with config changes. # Copyright 1990 W. Jolitz # from: src/sys/conf/Makefile.alpha,v 1.76 -# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.62 2005/04/13 14:49:57 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.63 2005/10/27 19:27:54 jhb Exp $ # # Makefile for FreeBSD # @@ -19,7 +19,7 @@ GCC3= you bet # Which version of config(8) is required. -%VERSREQ= 600002 +%VERSREQ= 600003 STD8X16FONT?= iso ==== //depot/projects/netsmp/src/sys/conf/Makefile.pc98#2 (text+ko) ==== @@ -3,7 +3,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.167 2005/04/13 14:49:57 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.168 2005/10/27 19:27:54 jhb Exp $ # # Makefile for FreeBSD # @@ -19,7 +19,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600002 +%VERSREQ= 600003 .if !defined(S) .if exists(./@/.) ==== //depot/projects/netsmp/src/sys/conf/Makefile.powerpc#3 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.powerpc -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.278 2005/09/07 17:38:46 obrien Exp $ +# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.279 2005/10/27 19:27:54 jhb Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600002 +%VERSREQ= 600003 STD8X16FONT?= iso ==== //depot/projects/netsmp/src/sys/conf/Makefile.sparc64#2 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.sparc64 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.33 2005/04/13 14:49:57 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.34 2005/10/27 19:27:54 jhb Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600002 +%VERSREQ= 600003 STD8X16FONT?= iso ==== //depot/projects/netsmp/src/sys/conf/files#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1060 2005/10/23 00:22:02 njl Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1061 2005/10/28 15:58:17 joerg Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -763,6 +763,7 @@ dev/pccbb/pccbb.c optional cbb dev/pccbb/pccbb_isa.c optional cbb isa dev/pccbb/pccbb_pci.c optional cbb pci +dev/pcf/pcf.c optional pcf dev/pci/eisa_pci.c optional pci eisa dev/pci/fixup_pci.c optional pci dev/pci/ignore_pci.c optional pci ==== //depot/projects/netsmp/src/sys/conf/files.i386#5 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.541 2005/09/17 03:36:46 anholt Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.542 2005/10/28 15:58:18 joerg Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -199,6 +199,7 @@ dev/mse/mse.c optional mse dev/mse/mse_isa.c optional mse isa dev/nve/if_nve.c optional nve pci +dev/pcf/pcf_isa.c optional pcf dev/ppc/ppc.c optional ppc dev/ppc/ppc_puc.c optional ppc puc pci dev/random/nehemiah.c optional random @@ -325,7 +326,6 @@ i386/isa/isa_dma.c optional isa i386/isa/nmi.c standard i386/isa/npx.c optional npx -i386/isa/pcf.c optional pcf i386/isa/pcvt/pcvt_drv.c optional vt i386/isa/pcvt/pcvt_ext.c optional vt i386/isa/pcvt/pcvt_kbd.c optional vt ==== //depot/projects/netsmp/src/sys/conf/files.sparc64#2 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.73 2005/06/12 00:47:21 marcel Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.74 2005/10/28 15:58:18 joerg Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -46,6 +46,8 @@ dev/ofw/openfirm.c standard dev/ofw/openfirmio.c standard dev/ofw/openpromio.c standard +dev/pcf/envctrl.c optional pcf +dev/pcf/pcf_ebus.c optional pcf ebus dev/sound/sbus/cs4231.c optional snd_audiocs ebus dev/sound/sbus/cs4231.c optional snd_audiocs sbus dev/syscons/scgfbrndr.c optional sc ==== //depot/projects/netsmp/src/sys/conf/kern.post.mk#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.86 2005/10/25 09:05:07 ru Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.89 2005/10/27 17:39:03 ru Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -29,11 +29,7 @@ # Handle out of tree ports .if !defined(NO_MODULES) && defined(PORTS_MODULES) -.for _dir in ${.CURDIR}/../../.. -.if !defined(SYSDIR) && exists(${_dir}/kern/) -SYSDIR= ${_dir} -.endif -.endfor +SYSDIR?= ${S:C;^[^/];${.CURDIR}/&;} PORTSMODULESENV=SYSDIR=${SYSDIR} .for __target in all install reinstall clean ${__target}: ports-${__target} @@ -67,8 +63,11 @@ FULLKERNEL= ${KERNEL_KO} .else FULLKERNEL= ${KERNEL_KO}.debug -${KERNEL_KO}: ${FULLKERNEL} - ${OBJCOPY} --strip-debug ${FULLKERNEL} ${KERNEL_KO} +${KERNEL_KO}: ${FULLKERNEL} ${KERNEL_KO}.symbols + ${OBJCOPY} --strip-debug --add-gnu-debuglink=${KERNEL_KO}.symbols\ + ${FULLKERNEL} ${.TARGET} +${KERNEL_KO}.symbols: ${FULLKERNEL} + ${OBJCOPY} --only-keep-debug ${FULLKERNEL} ${.TARGET} install.debug reinstall.debug: gdbinit cd ${.CURDIR}; ${MAKE} ${.TARGET:R} @@ -109,7 +108,8 @@ kernel-clean: rm -f *.o *.so *.So *.ko *.s eddep errs \ - ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks tags vers.c \ + ${FULLKERNEL} ${KERNEL_KO} ${KERNEL_KO}.symbols \ + linterrs makelinks tags vers.c \ vnode_if.c vnode_if.h vnode_if_newproto.h vnode_if_typedef.h \ ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \ ${CLEAN} @@ -186,7 +186,7 @@ .endif kernel-install: - @if [ ! -f ${FULLKERNEL} ] ; then \ + @if [ ! -f ${KERNEL_KO} ] ; then \ echo "You must build a kernel first." ; \ exit 1 ; \ fi @@ -205,18 +205,16 @@ fi .endif mkdir -p ${DESTDIR}${KODIR} + ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR} .if defined(DEBUG) && !defined(INSTALL_NODEBUG) - ${INSTALL} -p -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR}/${KERNEL_KO} -.else - ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR} + ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO}.symbols ${DESTDIR}${KODIR} .endif kernel-reinstall: @-chflags -R noschg ${DESTDIR}${KODIR} + ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR} .if defined(DEBUG) && !defined(INSTALL_NODEBUG) - ${INSTALL} -p -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR}/${KERNEL_KO} -.else - ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR} + ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO}.symbols ${DESTDIR}${KODIR} .endif config.o env.o hints.o vers.o vnode_if.o: ==== //depot/projects/netsmp/src/sys/conf/kmod.mk#4 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.197 2005/10/25 09:05:07 ru Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.199 2005/10/27 17:39:03 ru Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -143,8 +143,11 @@ FULLPROG= ${PROG} .else FULLPROG= ${PROG}.debug -${PROG}: ${FULLPROG} - ${OBJCOPY} --strip-debug ${FULLPROG} ${PROG} +${PROG}: ${FULLPROG} ${PROG}.symbols + ${OBJCOPY} --strip-debug --add-gnu-debuglink=${PROG}.symbols\ + ${FULLPROG} ${.TARGET} +${PROG}.symbols: ${FULLPROG} + ${OBJCOPY} --only-keep-debug ${FULLPROG} ${.TARGET} .endif .if ${MACHINE_ARCH} != amd64 @@ -226,7 +229,7 @@ CLEANFILES+= ${PROG} ${KMOD}.kld ${OBJS} ${_ILINKS} .if defined(DEBUG_FLAGS) -CLEANFILES+= ${FULLPROG} +CLEANFILES+= ${FULLPROG} ${PROG}.symbols .endif .if !target(install) @@ -240,12 +243,11 @@ realinstall: _kmodinstall .ORDER: beforeinstall _kmodinstall _kmodinstall: + ${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ + ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR} .if defined(DEBUG_FLAGS) && !defined(INSTALL_NODEBUG) ${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ - ${_INSTALLFLAGS} ${FULLPROG} ${DESTDIR}${KMODDIR}/${PROG} -.else - ${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR} + ${_INSTALLFLAGS} ${PROG}.symbols ${DESTDIR}${KMODDIR} .endif .include ==== //depot/projects/netsmp/src/sys/dev/ata/ata-all.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.257 2005/09/14 12:45:06 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.258 2005/10/27 16:32:39 sos Exp $"); #include "opt_ata.h" #include @@ -533,12 +533,7 @@ struct ata_channel *ch; int ctlr; - /* release the hook that got us here, only needed during boot */ - if (ata_delayed_attach) { - config_intrhook_disestablish(ata_delayed_attach); - free(ata_delayed_attach, M_TEMP); - ata_delayed_attach = NULL; - } + mtx_lock(&Giant); /* newbus suckage it needs Giant */ /* kick of probe and attach on all channels */ for (ctlr = 0; ctlr < devclass_get_maxunit(ata_devclass); ctlr++) { @@ -546,6 +541,15 @@ ata_identify(ch->dev); } } + + /* release the hook that got us here, we are only needed once during boot */ + if (ata_delayed_attach) { + config_intrhook_disestablish(ata_delayed_attach); + ata_delayed_attach = NULL; + free(ata_delayed_attach, M_TEMP); + } + + mtx_unlock(&Giant); /* newbus suckage dealt with, release Giant */ } ==== //depot/projects/netsmp/src/sys/dev/ata/atapi-cd.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.182 2005/10/10 19:13:27 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.183 2005/10/28 21:41:42 sos Exp $"); #include "opt_ata.h" #include @@ -337,9 +337,11 @@ bcopy(&cdp->toc, toc, sizeof(struct toc)); entry = toc->tab + (toc->hdr.ending_track + 1 - toc->hdr.starting_track) + 1; - while (--entry >= toc->tab) + while (--entry >= toc->tab) { lba2msf(ntohl(entry->addr.lba), &entry->addr.msf.minute, &entry->addr.msf.second, &entry->addr.msf.frame); + entry->addr_type = CD_MSF_FORMAT; + } } error = copyout(toc->tab + starting_track - toc->hdr.starting_track, te->data, len); @@ -940,17 +942,17 @@ int8_t ccb[16]; int track, ntracks, len; - if (acd_test_ready(dev)) - return; - if (!(atadev->flags & ATA_D_MEDIA_CHANGED)) return; atadev->flags &= ~ATA_D_MEDIA_CHANGED; bzero(&cdp->toc, sizeof(cdp->toc)); - bzero(ccb, sizeof(ccb)); cdp->disk_size = -1; /* hack for GEOM SOS */ + if (acd_test_ready(dev)) + return; + + bzero(ccb, sizeof(ccb)); len = sizeof(struct ioc_toc_header) + sizeof(struct cd_toc_entry); ccb[0] = ATAPI_READ_TOC; ccb[7] = len>>8; ==== //depot/projects/netsmp/src/sys/dev/cardbus/cardbus.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.53 2005/09/27 13:33:46 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.54 2005/10/28 06:03:53 imp Exp $"); #include #include @@ -112,8 +112,8 @@ return; } - if (reg == CARDBUS_ROM_REG) - testval = CARDBUS_ROM_ADDRMASK; + if (reg == PCIR_BIOS) + testval = PCIM_BIOS_ADDR_MASK; else testval = ~0; @@ -435,50 +435,48 @@ device_t child; int cardattached = 0; int bus, slot, func; + int cardbusfunchigh = 0; cardbus_detach_card(cbdev); /* detach existing cards */ POWER_ENABLE_SOCKET(brdev, cbdev); bus = pcib_get_bus(cbdev); + slot = 0; /* For each function, set it up and try to attach a driver to it */ - for (slot = 0; slot <= CARDBUS_SLOTMAX; slot++) { - int cardbusfunchigh = 0; - for (func = 0; func <= cardbusfunchigh; func++) { - struct cardbus_devinfo *dinfo; + for (func = 0; func <= cardbusfunchigh; func++) { + struct cardbus_devinfo *dinfo; - dinfo = (struct cardbus_devinfo *) - pci_read_device(brdev, bus, slot, func, - sizeof(struct cardbus_devinfo)); - if (dinfo == NULL) - continue; - if (dinfo->pci.cfg.mfdev) - cardbusfunchigh = CARDBUS_FUNCMAX; + dinfo = (struct cardbus_devinfo *) + pci_read_device(brdev, bus, slot, func, + sizeof(struct cardbus_devinfo)); + if (dinfo == NULL) + continue; + if (dinfo->pci.cfg.mfdev) + cardbusfunchigh = PCI_FUNCMAX; - cardbus_device_setup_regs(brdev, bus, slot, func, - &dinfo->pci.cfg); - child = device_add_child(cbdev, NULL, -1); - if (child == NULL) { - DEVPRINTF((cbdev, "Cannot add child!\n")); - pci_freecfg((struct pci_devinfo *)dinfo); - continue; - } - dinfo->pci.cfg.dev = child; - resource_list_init(&dinfo->pci.resources); - device_set_ivars(child, dinfo); - if (cardbus_do_cis(cbdev, child) != 0) { - DEVPRINTF((cbdev, "Can't parse cis\n")); - pci_freecfg((struct pci_devinfo *)dinfo); - continue; - } - cardbus_pickup_maps(cbdev, child); - cardbus_alloc_resources(cbdev, child); - pci_print_verbose(&dinfo->pci); - if (device_probe_and_attach(child) != 0) - cardbus_release_all_resources(cbdev, dinfo); - else - cardattached++; + cardbus_device_setup_regs(brdev, bus, slot, func, + &dinfo->pci.cfg); + child = device_add_child(cbdev, NULL, -1); + if (child == NULL) { + DEVPRINTF((cbdev, "Cannot add child!\n")); + pci_freecfg((struct pci_devinfo *)dinfo); + continue; + } + dinfo->pci.cfg.dev = child; + resource_list_init(&dinfo->pci.resources); + device_set_ivars(child, dinfo); + if (cardbus_do_cis(cbdev, child) != 0) { + DEVPRINTF((cbdev, "Can't parse cis\n")); + pci_freecfg((struct pci_devinfo *)dinfo); + continue; } + cardbus_pickup_maps(cbdev, child); + cardbus_alloc_resources(cbdev, child); + pci_print_verbose(&dinfo->pci); + if (device_probe_and_attach(child) != 0) + cardbus_release_all_resources(cbdev, dinfo); + else + cardattached++; } - if (cardattached > 0) return (0); POWER_DISABLE_SOCKET(brdev, cbdev); ==== //depot/projects/netsmp/src/sys/dev/cardbus/cardbus_cis.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.50 2005/02/20 20:36:16 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.52 2005/10/28 05:55:52 imp Exp $"); /* * CIS Handling for the Cardbus Bus @@ -325,7 +325,7 @@ } /* Convert from BAR type to BAR offset */ - bar = CARDBUS_BASE0_REG + (bar - 1) * 4; + bar = PCIR_BAR(bar - 1); if (type == SYS_RES_MEMORY) { if (reg & TPL_BAR_REG_PREFETCHABLE) @@ -491,32 +491,27 @@ uint32_t testval; uint32_t size; struct resource *res; + uint32_t space; - switch (CARDBUS_CIS_SPACE(*start)) { - case CARDBUS_CIS_ASI_TUPLE: + space = *start & PCIM_CIS_ASI_MASK; + switch (space) { + case PCIM_CIS_ASI_TUPLE: /* CIS in PCI config space need no initialization */ return ((struct resource*)~0UL); - case CARDBUS_CIS_ASI_BAR0: - case CARDBUS_CIS_ASI_BAR1: - case CARDBUS_CIS_ASI_BAR2: - case CARDBUS_CIS_ASI_BAR3: - case CARDBUS_CIS_ASI_BAR4: - case CARDBUS_CIS_ASI_BAR5: - *rid = CARDBUS_BASE0_REG + (CARDBUS_CIS_SPACE(*start) - 1) * 4; + case PCIM_CIS_ASI_BAR0: + case PCIM_CIS_ASI_BAR1: + case PCIM_CIS_ASI_BAR2: + case PCIM_CIS_ASI_BAR3: + case PCIM_CIS_ASI_BAR4: + case PCIM_CIS_ASI_BAR5: + *rid = PCIR_BAR(space - PCIM_CIS_ASI_BAR0); break; - case CARDBUS_CIS_ASI_ROM: - *rid = CARDBUS_ROM_REG; -#if 0 - /* - * This mask doesn't contain the bit that actually enables - * the Option ROM. - */ - pci_write_config(child, *rid, CARDBUS_ROM_ADDRMASK, 4); -#endif + case PCIM_CIS_ASI_ROM: + *rid = PCIR_BIOS; break; default: device_printf(cbdev, "Unable to read CIS: Unknown space: %d\n", - CARDBUS_CIS_SPACE(*start)); + space); return (NULL); } @@ -528,7 +523,7 @@ * This bit has a different meaning depending if we are dealing * with a normal BAR or an Option ROM BAR. */ - if (((testval & 0x1) == 0x1) && (*rid != CARDBUS_ROM_REG)) { + if (((testval & 0x1) == 0x1) && (*rid != PCIR_BIOS)) { device_printf(cbdev, "CIS Space is IO, expecting memory.\n"); return (NULL); } @@ -546,13 +541,12 @@ return (NULL); } pci_write_config(child, *rid, - rman_get_start(res) | ((*rid == CARDBUS_ROM_REG)? - CARDBUS_ROM_ENABLE : 0), + rman_get_start(res) | ((*rid == PCIR_BIOS) ? PCIM_BIOS_ENABLE : 0), 4); PCI_ENABLE_IO(cbdev, child, SYS_RES_MEMORY); /* Flip to the right ROM image if CIS is in ROM */ - if (CARDBUS_CIS_SPACE(*start) == CARDBUS_CIS_ASI_ROM) { + if (space == PCIM_CIS_ASI_ROM) { bus_space_tag_t bt; bus_space_handle_t bh; uint32_t imagesize; @@ -565,7 +559,7 @@ bt = rman_get_bustag(res); bh = rman_get_bushandle(res); - imagenum = CARDBUS_CIS_ASI_ROM_IMAGE(*start); + imagenum = (*start & PCIM_CIS_ROM_MASK) >> 28; for (romnum = 0;; romnum++) { romsig = bus_space_read_2(bt, bh, imagebase + CARDBUS_EXROM_SIGNATURE); @@ -617,9 +611,9 @@ } imagebase += imagesize; } - *start = imagebase + CARDBUS_CIS_ADDR(*start); + *start = imagebase + (*start & PCIM_CIS_ADDR_MASK); } else { - *start = CARDBUS_CIS_ADDR(*start); + *start = *start & PCIM_CIS_ADDR_MASK; } return (res); @@ -658,7 +652,7 @@ bzero(tupledata, MAXTUPLESIZE); expect_linktarget = TRUE; - if ((start = pci_read_config(child, CARDBUS_CIS_REG, 4)) == 0) { + if ((start = pci_read_config(child, PCIR_CIS, 4)) == 0) { device_printf(cbdev, "CIS pointer is 0!\n"); return (ENXIO); } ==== //depot/projects/netsmp/src/sys/dev/cardbus/cardbusreg.h#2 (text+ko) ==== @@ -23,40 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/cardbus/cardbusreg.h,v 1.8 2005/01/13 19:12:10 imp Exp $ + * $FreeBSD: src/sys/dev/cardbus/cardbusreg.h,v 1.11 2005/10/28 06:03:53 imp Exp $ */ /* * Register definitions for the Cardbus Bus */ - -/* Cardbus bus constants */ -#define CARDBUS_SLOTMAX 0 -#define CARDBUS_FUNCMAX 7 - -/* Cardbus configuration header registers */ -#define CARDBUS_BASE0_REG 0x10 -#define CARDBUS_BASE1_REG 0x14 -#define CARDBUS_BASE2_REG 0x18 -#define CARDBUS_BASE3_REG 0x1C -#define CARDBUS_BASE4_REG 0x20 -#define CARDBUS_BASE5_REG 0x24 -#define CARDBUS_CIS_REG 0x28 -# define CARDBUS_CIS_ASIMASK 0x07 -# define CARDBUS_CIS_ADDRMASK 0x0ffffff8 -# define CARDBUS_CIS_ASI_TUPLE 0x00 -# define CARDBUS_CIS_ASI_BAR0 0x01 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 30 15:38:09 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1C6316A421; Sun, 30 Oct 2005 15:38:08 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 772E016A41F for ; Sun, 30 Oct 2005 15:38:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 413DD43D45 for ; Sun, 30 Oct 2005 15:38:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9UFc837046178 for ; Sun, 30 Oct 2005 15:38:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9UFc8Nw046175 for perforce@freebsd.org; Sun, 30 Oct 2005 15:38:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 30 Oct 2005 15:38:08 GMT Message-Id: <200510301538.j9UFc8Nw046175@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 86072 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, 30 Oct 2005 15:38:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=86072 Change 86072 by rwatson@rwatson_zoo on 2005/10/30 15:37:09 Revert local change relating to interface teardown and multicast: this has been merged to CVS slightly differently, resulting in a p4 mismerge. Affected files ... .. //depot/projects/netsmp/src/sys/netinet/in.c#11 integrate Differences ... ==== //depot/projects/netsmp/src/sys/netinet/in.c#11 (text+ko) ==== @@ -1064,15 +1064,3 @@ in_pcbpurgeif0(&ripcbinfo, ifp); in_pcbpurgeif0(&udbinfo, ifp); } - -/* - * On interface removal, clean up IPv4 data structures hung off of the ifnet. - */ -void -in_ifdetach(ifp) - struct ifnet *ifp; -{ - - in_pcbpurgeif0(&ripcbinfo, ifp); - in_pcbpurgeif0(&udbinfo, ifp); -} From owner-p4-projects@FreeBSD.ORG Sun Oct 30 19:50:24 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CB5F16A42F; Sun, 30 Oct 2005 19:50:24 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D7C6516A42C for ; Sun, 30 Oct 2005 19:50:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6DF9F43D4C for ; Sun, 30 Oct 2005 19:50:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9UJoNkE064918 for ; Sun, 30 Oct 2005 19:50:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9UJoNrW064915 for perforce@freebsd.org; Sun, 30 Oct 2005 19:50:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 30 Oct 2005 19:50:23 GMT Message-Id: <200510301950.j9UJoNrW064915@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 86080 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, 30 Oct 2005 19:50:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=86080 Change 86080 by rwatson@rwatson_zoo on 2005/10/30 19:50:08 Integrate netsmp; loop back solisten() change to pass new backlog to protocol. Affected files ... .. //depot/projects/netsmp/src/sys/boot/pc98/loader/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/interrupt.c#5 integrate .. //depot/projects/netsmp/src/sys/kern/uipc_socket.c#17 integrate .. //depot/projects/netsmp/src/sys/kern/uipc_socket2.c#6 integrate .. //depot/projects/netsmp/src/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/netsmp/src/sys/netatm/atm_aal5.c#3 integrate .. //depot/projects/netsmp/src/sys/netatm/atm_cm.c#3 integrate .. //depot/projects/netsmp/src/sys/netatm/atm_socket.c#3 integrate .. //depot/projects/netsmp/src/sys/netatm/atm_var.h#3 integrate .. //depot/projects/netsmp/src/sys/netatm/ipatm/ipatm_load.c#3 integrate .. //depot/projects/netsmp/src/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#3 integrate .. //depot/projects/netsmp/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#3 integrate .. //depot/projects/netsmp/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/netsmp/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/netsmp/src/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/netsmp/src/sys/netipx/spx_usrreq.c#3 integrate .. //depot/projects/netsmp/src/sys/sys/param.h#6 integrate .. //depot/projects/netsmp/src/sys/sys/protosw.h#4 integrate .. //depot/projects/netsmp/src/sys/sys/socketvar.h#5 integrate Differences ... ==== //depot/projects/netsmp/src/sys/boot/pc98/loader/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.38 2005/05/08 14:17:28 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.39 2005/10/30 15:59:08 nyan Exp $ PROG= loader.sym INTERNALPROG= @@ -75,13 +75,13 @@ .PATH: ${.CURDIR}/../../forth FILES= loader loader.help loader.4th support.4th loader.conf -FILES+= screen.4th frames.4th +FILES+= screen.4th frames.4th beastie.4th # XXX INSTALLFLAGS_loader= -b FILESMODE_loader= ${BINMODE} -b FILESDIR_loader.conf= /boot/defaults .if !exists(${DESTDIR}/boot/loader.rc) -FILES+= loader.rc +FILES+= ${.CURDIR}/../../i386/loader/loader.rc .endif # XXX crt0.o needs to be first for pxeboot(8) to work ==== //depot/projects/netsmp/src/sys/ia64/ia64/interrupt.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.52 2005/10/25 19:48:47 jhb Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.53 2005/10/30 17:23:01 marcel Exp $ */ /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */ /*- @@ -391,7 +391,6 @@ CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__, ih->ih_handler, ih->ih_argument, ih->ih_name); ih->ih_handler(ih->ih_argument); - return; } critical_exit(); ==== //depot/projects/netsmp/src/sys/kern/uipc_socket.c#17 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.250 2005/10/27 04:26:35 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.251 2005/10/30 19:44:38 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" ==== //depot/projects/netsmp/src/sys/kern/uipc_socket2.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.148 2005/09/18 10:30:10 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.149 2005/10/30 19:44:39 rwatson Exp $"); #include "opt_mac.h" #include "opt_param.h" ==== //depot/projects/netsmp/src/sys/kern/uipc_usrreq.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.156 2005/09/23 12:41:06 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.157 2005/10/30 19:44:39 rwatson Exp $"); #include "opt_mac.h" ==== //depot/projects/netsmp/src/sys/netatm/atm_aal5.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netatm/atm_aal5.c,v 1.21 2005/01/07 01:45:36 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/netatm/atm_aal5.c,v 1.22 2005/10/30 19:44:39 rwatson Exp $"); #include #include ==== //depot/projects/netsmp/src/sys/netatm/atm_cm.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netatm/atm_cm.c,v 1.33 2005/02/21 21:58:16 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netatm/atm_cm.c,v 1.34 2005/10/30 19:44:39 rwatson Exp $"); #include #include ==== //depot/projects/netsmp/src/sys/netatm/atm_socket.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netatm/atm_socket.c,v 1.24 2005/06/10 16:49:20 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/netatm/atm_socket.c,v 1.25 2005/10/30 19:44:39 rwatson Exp $"); #include #include ==== //depot/projects/netsmp/src/sys/netatm/atm_var.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/netatm/atm_var.h,v 1.26 2005/02/21 21:58:16 rwatson Exp $ + * @(#) $FreeBSD: src/sys/netatm/atm_var.h,v 1.27 2005/10/30 19:44:39 rwatson Exp $ * */ ==== //depot/projects/netsmp/src/sys/netatm/ipatm/ipatm_load.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netatm/ipatm/ipatm_load.c,v 1.22 2005/06/10 16:49:20 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/netatm/ipatm/ipatm_load.c,v 1.23 2005/10/30 19:44:39 rwatson Exp $"); #ifndef ATM_IP_MODULE #include "opt_atm.h" ==== //depot/projects/netsmp/src/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_l2cap.h,v 1.4 2003/03/25 23:53:33 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h,v 1.4 2005/01/07 01:45:43 imp Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h,v 1.5 2005/10/30 19:44:39 rwatson Exp $ */ #ifndef _NETGRAPH_BTSOCKET_L2CAP_H_ ==== //depot/projects/netsmp/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_rfcomm.h,v 1.10 2003/03/29 22:27:42 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h,v 1.4 2005/01/11 01:39:53 emax Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h,v 1.5 2005/10/30 19:44:39 rwatson Exp $ */ #ifndef _NETGRAPH_BTSOCKET_RFCOMM_H_ ==== //depot/projects/netsmp/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_l2cap.c,v 1.16 2003/09/14 23:29:06 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c,v 1.16 2005/02/21 21:58:16 rwatson Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c,v 1.17 2005/10/30 19:44:40 rwatson Exp $ */ #include ==== //depot/projects/netsmp/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_rfcomm.c,v 1.28 2003/09/14 23:29:06 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c,v 1.17 2005/04/06 18:55:58 emax Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c,v 1.18 2005/10/30 19:44:40 rwatson Exp $ */ #include ==== //depot/projects/netsmp/src/sys/netinet/tcp_usrreq.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * From: @(#)tcp_usrreq.c 8.2 (Berkeley) 1/3/94 - * $FreeBSD: src/sys/netinet/tcp_usrreq.c,v 1.126 2005/08/23 14:42:40 andre Exp $ + * $FreeBSD: src/sys/netinet/tcp_usrreq.c,v 1.127 2005/10/30 19:44:40 rwatson Exp $ */ #include "opt_inet.h" ==== //depot/projects/netsmp/src/sys/netipx/spx_usrreq.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.62 2005/02/21 21:58:17 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.63 2005/10/30 19:44:40 rwatson Exp $"); #include #include ==== //depot/projects/netsmp/src/sys/sys/param.h#6 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.3 (Berkeley) 4/4/95 - * $FreeBSD: src/sys/sys/param.h,v 1.249 2005/10/05 23:36:19 imp Exp $ + * $FreeBSD: src/sys/sys/param.h,v 1.250 2005/10/30 19:44:40 rwatson Exp $ */ #ifndef _SYS_PARAM_H_ @@ -57,7 +57,7 @@ * is created, otherwise 1. */ #undef __FreeBSD_version -#define __FreeBSD_version 700003 /* Master, propagated to newvers */ +#define __FreeBSD_version 700004 /* Master, propagated to newvers */ #ifndef LOCORE #include ==== //depot/projects/netsmp/src/sys/sys/protosw.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)protosw.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/sys/sys/protosw.h,v 1.47 2005/08/11 15:35:58 obrien Exp $ + * $FreeBSD: src/sys/sys/protosw.h,v 1.48 2005/10/30 19:44:40 rwatson Exp $ */ #ifndef _SYS_PROTOSW_H_ ==== //depot/projects/netsmp/src/sys/sys/socketvar.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)socketvar.h 8.3 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/socketvar.h,v 1.141 2005/07/09 12:24:40 jhb Exp $ + * $FreeBSD: src/sys/sys/socketvar.h,v 1.142 2005/10/30 19:44:40 rwatson Exp $ */ #ifndef _SYS_SOCKETVAR_H_ From owner-p4-projects@FreeBSD.ORG Sun Oct 30 19:56:32 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E172216A421; Sun, 30 Oct 2005 19:56:31 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA88216A41F for ; Sun, 30 Oct 2005 19:56:31 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 76F1443D46 for ; Sun, 30 Oct 2005 19:56:31 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9UJuVXo065147 for ; Sun, 30 Oct 2005 19:56:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9UJuVDi065144 for perforce@freebsd.org; Sun, 30 Oct 2005 19:56:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 30 Oct 2005 19:56:31 GMT Message-Id: <200510301956.j9UJuVDi065144@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 86081 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, 30 Oct 2005 19:56:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=86081 Change 86081 by rwatson@rwatson_zoo on 2005/10/30 19:56:18 Re-inline socket buffer sleep lock assertions, since I'm not currently using them. Affected files ... .. //depot/projects/netsmp/src/sys/kern/uipc_socket.c#18 edit .. //depot/projects/netsmp/src/sys/kern/uipc_socket2.c#7 edit .. //depot/projects/netsmp/src/sys/sys/socketvar.h#6 edit Differences ... ==== //depot/projects/netsmp/src/sys/kern/uipc_socket.c#18 (text+ko) ==== @@ -391,7 +391,6 @@ SOCKBUF_LOCK(&so->so_snd); so->so_snd.sb_flags |= SB_NOINTR; (void)sblock(&so->so_snd, M_WAITOK); - sb_lock_assert(&so->so_snd); /* * socantsendmore_locked() drops the socket buffer mutex so that it * can safely perform wakeups. Re-acquire the mutex before @@ -924,7 +923,6 @@ error = sblock(&so->so_snd, SBLOCKWAIT(flags)); if (error) goto out_locked; - sb_lock_assert(&so->so_snd); do { SOCKBUF_LOCK_ASSERT(&so->so_snd); if (so->so_snd.sb_state & SBS_CANTSENDMORE) @@ -950,7 +948,6 @@ snderr(so->so_proto->pr_flags & PR_CONNREQUIRED ? ENOTCONN : EDESTADDRREQ); } - space = sbspace(&so->so_snd); if (flags & MSG_OOB) space += 1024; @@ -1184,7 +1181,6 @@ error = sblock(&so->so_rcv, SBLOCKWAIT(flags)); if (error) goto out; - sb_lock_assert(&so->so_rcv); m = so->so_rcv.sb_mb; /* @@ -1423,15 +1419,10 @@ error = uiomoveco(mtod(m, char *) + moff, (int)len, uio, disposable); - SOCKBUF_LOCK(&so->so_rcv); } else #endif /* ZERO_COPY_SOCKETS */ - { - sb_lock_assert(&so->so_rcv); error = uiomove(mtod(m, char *) + moff, (int)len, uio); SOCKBUF_LOCK(&so->so_rcv); - sb_lock_assert(&so->so_rcv); - } if (error) goto release; } else @@ -1627,7 +1618,6 @@ SOCKBUF_LOCK(sb); sb->sb_flags |= SB_NOINTR; (void) sblock(sb, M_WAITOK); - sb_lock_assert(sb); /* * socantrcvmore_locked() drops the socket buffer mutex so that it * can safely perform wakeups. Re-acquire the mutex before ==== //depot/projects/netsmp/src/sys/kern/uipc_socket2.c#7 (text+ko) ==== @@ -353,8 +353,6 @@ /* * Lock a sockbuf already known to be locked; * return any error returned from sleep (EINTR). - * - * XXXRW: Isn't a bit silly that we repeatedly clear and re-set SB_WANT? */ int sb_lock(sb) @@ -372,70 +370,11 @@ if (error) return (error); } - KASSERT(sb->sb_lock_owner == NULL, ("sb_lock: sb_lock_owner %p", - sb->sb_lock_owner)); sb->sb_flags |= SB_LOCK; - sb->sb_lock_owner = curthread; return (0); } /* - * Un-inlined sblock() macro. - */ -int -sblock(sb, wf) - struct sockbuf *sb; - int wf; -{ - - SOCKBUF_LOCK_ASSERT(sb); - - if (sb->sb_flags & SB_LOCK) { - if (wf == M_WAITOK) - return (sb_lock(sb)); - else - return (EWOULDBLOCK); - } - sb->sb_flags |= SB_LOCK; - sb->sb_lock_owner = curthread; - return (0); -} - -/* - * Un-inlined sbunlock() macro. - */ -void -sbunlock(sb) - struct sockbuf *sb; -{ - - SOCKBUF_LOCK_ASSERT(sb); - KASSERT(sb->sb_flags & SB_LOCK, ("sbunlock: !SB_LOCK")); - KASSERT(sb->sb_lock_owner == curthread, ("sbunlock: !curthread")); - - sb->sb_flags &= ~SB_LOCK; - sb->sb_lock_owner = NULL; - if (sb->sb_flags & SB_WANT) { - sb->sb_flags &= ~SB_WANT; - wakeup(&sb->sb_flags); - } -} - - -/* - * We can't assert that the current thread owns the socket buffer sleep lock, - * but we can at least assert that it is held. - */ -void -sb_lock_assert(sb) - struct sockbuf *sb; -{ - - KASSERT(sb->sb_flags & SB_LOCK, ("sb_lock_assert: failed")); - KASSERT(sb->sb_lock_owner == curthread, ("sb_lock_assert: !curthread")); -} - -/* * Wakeup processes waiting on a socket buffer. Do asynchronous * notification via SIGIO if the socket has the SS_ASYNC flag set. * ==== //depot/projects/netsmp/src/sys/sys/socketvar.h#6 (text+ko) ==== @@ -111,7 +111,6 @@ int sb_lowat; /* (c/d) low water mark */ int sb_timeo; /* (c/d) timeout for read/write */ short sb_flags; /* (c/d) flags, see below */ - struct thread *sb_lock_owner; /* (c/d), sb_lock owner */ } so_rcv, so_snd; /* * Constants for sb_flags field of struct sockbuf. @@ -318,6 +317,25 @@ } /* + * Set lock on sockbuf sb; sleep if lock is already held. + * Unless SB_NOINTR is set on sockbuf, sleep is interruptible. + * Returns error without lock if sleep is interrupted. + */ +#define sblock(sb, wf) ((sb)->sb_flags & SB_LOCK ? \ + (((wf) == M_WAITOK) ? sb_lock(sb) : EWOULDBLOCK) : \ + ((sb)->sb_flags |= SB_LOCK), 0) + +/* release lock on sockbuf sb */ +#define sbunlock(sb) do { \ + SOCKBUF_LOCK_ASSERT(sb); \ + (sb)->sb_flags &= ~SB_LOCK; \ + if ((sb)->sb_flags & SB_WANT) { \ + (sb)->sb_flags &= ~SB_WANT; \ + wakeup(&(sb)->sb_flags); \ + } \ +} while (0) + +/* * soref()/sorele() ref-count the socket structure. Note that you must * still explicitly close the socket, but the last ref count will free * the structure. @@ -469,10 +487,7 @@ struct thread *td); void sbtoxsockbuf(struct sockbuf *sb, struct xsockbuf *xsb); int sbwait(struct sockbuf *sb); -int sblock(struct sockbuf *sb, int wf); int sb_lock(struct sockbuf *sb); -void sb_lock_assert(struct sockbuf *sb); -void sbunlock(struct sockbuf *sb); int soabort(struct socket *so); int soaccept(struct socket *so, struct sockaddr **nam); struct socket *soalloc(int mflags); From owner-p4-projects@FreeBSD.ORG Sun Oct 30 19:57:34 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A824D16A421; Sun, 30 Oct 2005 19:57:33 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6B15216A41F for ; Sun, 30 Oct 2005 19:57:33 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3537D43D46 for ; Sun, 30 Oct 2005 19:57:33 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9UJvXOx065192 for ; Sun, 30 Oct 2005 19:57:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9UJvWqZ065189 for perforce@freebsd.org; Sun, 30 Oct 2005 19:57:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 30 Oct 2005 19:57:32 GMT Message-Id: <200510301957.j9UJvWqZ065189@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 86082 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, 30 Oct 2005 19:57:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=86082 Change 86082 by rwatson@rwatson_zoo on 2005/10/30 19:57:26 sosend() no longer needs zero-copy variables, as that's now safely hidden in sosend_copyin(). Affected files ... .. //depot/projects/netsmp/src/sys/kern/uipc_socket.c#19 edit Differences ... ==== //depot/projects/netsmp/src/sys/kern/uipc_socket.c#19 (text+ko) ==== @@ -886,9 +886,6 @@ long space, resid; int clen = 0, error, dontroute; int atomic = sosendallatonce(so) || top; -#ifdef ZERO_COPY_SOCKETS - int cow_send; -#endif /* ZERO_COPY_SOCKETS */ if (uio != NULL) resid = uio->uio_resid; From owner-p4-projects@FreeBSD.ORG Sun Oct 30 21:49:51 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AEC816A421; Sun, 30 Oct 2005 21:49:51 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 11AF416A41F for ; Sun, 30 Oct 2005 21:49:51 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF36043D45 for ; Sun, 30 Oct 2005 21:49:50 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9ULnoRN078012 for ; Sun, 30 Oct 2005 21:49:50 GMT (envelope-from soc-victor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9ULnota078009 for perforce@freebsd.org; Sun, 30 Oct 2005 21:49:50 GMT (envelope-from soc-victor@freebsd.org) Date: Sun, 30 Oct 2005 21:49:50 GMT Message-Id: <200510302149.j9ULnota078009@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-victor@freebsd.org using -f From: Victor Cruceru To: Perforce Change Reviews Cc: Subject: PERFORCE change 86088 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, 30 Oct 2005 21:49:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=86088 Change 86088 by soc-victor@soc-victor_Pentium4 on 2005/10/30 21:49:29 Started the SNMP instrumentation for MTA-MIB for BSNMP. Added the MIB, the .def file, etc. Affected files ... .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/Makefile#2 edit .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_mta/MTA-MIB.txt#1 add .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_mta/Makefile#1 add .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_mta/mta_snmp.c#1 add .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_mta/mta_tree.def#1 add .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_mta/rfc2789.txt#1 add Differences ... ==== //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/Makefile#2 (text+ko) ==== @@ -8,6 +8,7 @@ SUBDIR= ${_snmp_atm} \ snmp_mibII \ + snmp_mta \ snmp_netgraph \ snmp_pf From owner-p4-projects@FreeBSD.ORG Sun Oct 30 23:19:09 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4010E16A421; Sun, 30 Oct 2005 23:19:09 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E674C16A41F for ; Sun, 30 Oct 2005 23:19:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ADFF443D45 for ; Sun, 30 Oct 2005 23:19:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9UNJ8v2081547 for ; Sun, 30 Oct 2005 23:19:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9UNJ8qv081544 for perforce@freebsd.org; Sun, 30 Oct 2005 23:19:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 30 Oct 2005 23:19:08 GMT Message-Id: <200510302319.j9UNJ8qv081544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 86090 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, 30 Oct 2005 23:19:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=86090 Change 86090 by rwatson@rwatson_zoo on 2005/10/30 23:18:31 Modify UDP so it uses sosend_dgram(), although only for consumers that properly call pru_sosend() rather than sosend() (i.e., user space, but probably not all kernel consumers, which may assume sosend()). A sysctl allows this to be changed at run-time, using sosend() as the default. Affected files ... .. //depot/projects/netsmp/src/sys/netinet/udp_usrreq.c#4 edit Differences ... ==== //depot/projects/netsmp/src/sys/netinet/udp_usrreq.c#4 (text+ko) ==== @@ -1114,5 +1114,32 @@ .pru_send = udp_send, .pru_shutdown = udp_shutdown, .pru_sockaddr = udp_sockaddr, + .pru_sosend = sosend, .pru_sosetlabel = in_pcbsosetlabel }; + +static int +sysctl_net_inet_udp_sosend_dgram(SYSCTL_HANDLER_ARGS) +{ + int error, mode; + + if (udp_usrreqs.pru_sosend == sosend_dgram) + mode = 1; + else + mode = 0; + + error = sysctl_handle_int(oidp, &mode, 0, req); + if (error || !req->newptr) + return (error); + + if (mode) + udp_usrreqs.pru_sosend = sosend_dgram; + else + udp_usrreqs.pru_sosend = sosend; + + return (0); +} + +SYSCTL_PROC(_net_inet_udp, OID_AUTO, sosend_dgram, CTLTYPE_INT | + CTLFLAG_RW, 0, 0, sysctl_net_inet_udp_sosend_dgram, "I", + "Use optimized sosend_dgram instead of sosend for UDP"); From owner-p4-projects@FreeBSD.ORG Sun Oct 30 23:46:43 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5D5A16A421; Sun, 30 Oct 2005 23:46:42 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AC8CA16A41F for ; Sun, 30 Oct 2005 23:46:42 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 543F743D4C for ; Sun, 30 Oct 2005 23:46:42 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9UNkgCN082641 for ; Sun, 30 Oct 2005 23:46:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9UNkfrK082638 for perforce@freebsd.org; Sun, 30 Oct 2005 23:46:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 30 Oct 2005 23:46:41 GMT Message-Id: <200510302346.j9UNkfrK082638@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 86091 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, 30 Oct 2005 23:46:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=86091 Change 86091 by rwatson@rwatson_peppercorn on 2005/10/30 23:45:49 Not entirely pretty hack: allow preemption by the netisr thread to be configurable separate from global preemption. Specifically, if net.isr.preempt=0, pass SWI_NOPREEMPT to swi_sched(). Implement SWI_NOPREEMPT by adding IE_FLAG_NOPREEMPT (don't preempt due to an interrupt event, only wakeup), which in turn is implemented by adding SRQ_NOPREEMPT, a flag to the scheduler run queue calls. The reason to add this is that loopback traffic is seeing a lot of context switches, and avoiding the context switches through avoiding unnecessary preemption may help illustrate if this is a performance problem, and possibly be part of a fix. This may not work, either functionally, or in its overall goal, and is an experiment. Affected files ... .. //depot/projects/netsmp/src/sys/kern/kern_intr.c#4 edit .. //depot/projects/netsmp/src/sys/kern/sched_4bsd.c#2 edit .. //depot/projects/netsmp/src/sys/kern/sched_ule.c#6 edit .. //depot/projects/netsmp/src/sys/net/netisr.c#3 edit .. //depot/projects/netsmp/src/sys/sys/interrupt.h#4 edit .. //depot/projects/netsmp/src/sys/sys/proc.h#5 edit Differences ... ==== //depot/projects/netsmp/src/sys/kern/kern_intr.c#4 (text+ko) ==== @@ -485,7 +485,7 @@ } int -intr_event_schedule_thread(struct intr_event *ie) +intr_event_schedule_thread_flags(struct intr_event *ie, int flags) { struct intr_entropy entropy; struct intr_thread *it; @@ -531,7 +531,8 @@ CTR3(KTR_INTR, "%s: schedule pid %d (%s)", __func__, p->p_pid, p->p_comm); TD_CLR_IWAIT(td); - setrunqueue(td, SRQ_INTR); + setrunqueue(td, SRQ_INTR | + (flags & IE_FLAG_NOPREEMPT ? SRQ_NOPREEMPT : 0)); } else { CTR5(KTR_INTR, "%s: pid %d (%s): it_need %d, state %d", __func__, p->p_pid, p->p_comm, it->it_need, td->td_state); @@ -541,6 +542,13 @@ return (0); } +int +intr_event_schedule_thread(struct intr_event *ie) +{ + + return (intr_event_schedule_thread_flags(ie, 0)); +} + /* * Add a software interrupt handler to a specified event. If a given event * is not specified, then a new event is created. @@ -595,7 +603,8 @@ */ atomic_store_rel_int(&ih->ih_need, 1); if (!(flags & SWI_DELAY)) { - error = intr_event_schedule_thread(ie); + error = intr_event_schedule_thread_flags(ie, + (flags & SWI_NOPREEMPT) ? IE_FLAG_NOPREEMPT : 0); KASSERT(error == 0, ("stray software interrupt")); } } ==== //depot/projects/netsmp/src/sys/kern/sched_4bsd.c#2 (text+ko) ==== @@ -1174,7 +1174,9 @@ } if (!forwarded) { - if ((flags & SRQ_YIELDING) == 0 && maybe_preempt(td)) + if ((flags & SRQ_YIELDING) == 0 && + (flags & SRQ_NOPREEMPT) == 0 && + maybe_preempt(td)) return; else maybe_resched(td); @@ -1214,7 +1216,7 @@ * OURSELF case, we are puting ourself on the run queue * which also only happens when we are about to yield. */ - if((flags & SRQ_YIELDING) == 0) { + if ((flags & SRQ_YIELDING) == 0 && (flags & SRQ_NOPREEMPT) == 0) { if (maybe_preempt(td)) return; } ==== //depot/projects/netsmp/src/sys/kern/sched_ule.c#6 (text+ko) ==== @@ -1767,7 +1767,7 @@ ke = td->td_kse; kg = td->td_ksegrp; canmigrate = 1; - preemptive = !(flags & SRQ_YIELDING); + preemptive = !(flags & SRQ_YIELDING || flags & SRQ_NOPREEMPT); class = PRI_BASE(kg->kg_pri_class); kseq = KSEQ_SELF(); if ((ke->ke_flags & KEF_INTERNAL) == 0) ==== //depot/projects/netsmp/src/sys/net/netisr.c#3 (text+ko) ==== @@ -74,6 +74,8 @@ SYSCTL_INT(_debug, OID_AUTO, mpsafenet, CTLFLAG_RD, &debug_mpsafenet, 0, "Enable/disable MPSAFE network support"); +static int netisr_preempt = 1; /* netisr will preempt when woken. */ + volatile unsigned int netisr; /* scheduling bits for network */ struct netisr { @@ -159,7 +161,8 @@ void legacy_setsoftnet(void) { - swi_sched(net_ih, 0); + + swi_sched(net_ih, netisr_preempt ? 0 : SWI_NOPREEMPT); } void @@ -219,6 +222,9 @@ SYSCTL_INT(_net_isr, OID_AUTO, swi_count, CTLFLAG_RD, &isrstat.isrs_swi_count, 0, ""); +SYSCTL_INT(_net_isr, OID_AUTO, preempt, CTLFLAG_RW, + &netisr_preempt, 0, ""); + /* * Process all packets currently present in a netisr queue. Used to * drain an existing set of packets waiting for processing when we ==== //depot/projects/netsmp/src/sys/sys/interrupt.h#4 (text+ko) ==== @@ -81,8 +81,14 @@ #define IE_ENTROPY 0x000002 /* Interrupt is an entropy source. */ #define IE_ADDING_THREAD 0x000004 /* Currently building an ithread. */ +/* + * Flags passed to intr_event_schedule_thread_flags(). + */ +#define IE_FLAG_NOPREEMPT 0x00000001 /* Schedule; don't preempt. */ + /* Flags to pass to sched_swi. */ #define SWI_DELAY 0x2 +#define SWI_NOPREEMPT 0x4 /* * Software interrupt numbers in priority order. The priority determines @@ -121,6 +127,7 @@ int intr_event_destroy(struct intr_event *ie); int intr_event_remove_handler(void *cookie); int intr_event_schedule_thread(struct intr_event *ie); +int intr_event_schedule_thread_flags(struct intr_event *ie, int flags); int swi_add(struct intr_event **eventp, const char *name, driver_intr_t handler, void *arg, int pri, enum intr_type flags, void **cookiep); ==== //depot/projects/netsmp/src/sys/sys/proc.h#5 (text+ko) ==== @@ -685,6 +685,7 @@ #define SRQ_OURSELF 0x0002 /* It is ourself (from mi_switch). */ #define SRQ_INTR 0x0004 /* It is probably urgent. */ #define SRQ_PREEMPTED 0x0008 /* has been preempted.. be kind */ +#define SRQ_NOPREEMPT 0x0010 /* Caller hints not to preempt. */ /* How values for thread_single(). */ #define SINGLE_NO_EXIT 0 From owner-p4-projects@FreeBSD.ORG Mon Oct 31 04:14:32 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E81A116A421; Mon, 31 Oct 2005 04:14:31 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 887B316A41F for ; Mon, 31 Oct 2005 04:14:31 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 70C3E43D5E for ; Mon, 31 Oct 2005 04:14:20 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9V4EKYX000443 for ; Mon, 31 Oct 2005 04:14:20 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9V4Dx5o000399 for perforce@freebsd.org; Mon, 31 Oct 2005 04:13:59 GMT (envelope-from sam@freebsd.org) Date: Mon, 31 Oct 2005 04:13:59 GMT Message-Id: <200510310413.j9V4Dx5o000399@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 86095 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, 31 Oct 2005 04:14:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=86095 Change 86095 by sam@sam_ebb on 2005/10/31 04:13:04 IFC long ago Affected files ... .. //depot/projects/wifi/ObsoleteFiles.inc#4 integrate .. //depot/projects/wifi/UPDATING#20 integrate .. //depot/projects/wifi/bin/csh/config_p.h#2 integrate .. //depot/projects/wifi/bin/rm/rm.1#6 integrate .. //depot/projects/wifi/bin/rm/rm.c#4 integrate .. //depot/projects/wifi/contrib/bc/bc/main.c#2 integrate .. //depot/projects/wifi/contrib/bsnmp/FREEBSD-Xlist#3 integrate .. //depot/projects/wifi/contrib/bsnmp/NEWS#5 integrate .. //depot/projects/wifi/contrib/bsnmp/VERSION#5 integrate .. //depot/projects/wifi/contrib/bsnmp/gensnmpdef/gensnmpdef.1#3 integrate .. //depot/projects/wifi/contrib/bsnmp/gensnmptree/gensnmptree.1#3 integrate .. //depot/projects/wifi/contrib/bsnmp/gensnmptree/gensnmptree.c#4 integrate .. //depot/projects/wifi/contrib/bsnmp/lib/asn1.3#3 integrate .. //depot/projects/wifi/contrib/bsnmp/lib/asn1.c#2 integrate .. //depot/projects/wifi/contrib/bsnmp/lib/asn1.h#2 integrate .. //depot/projects/wifi/contrib/bsnmp/lib/bsnmpagent.3#3 integrate .. //depot/projects/wifi/contrib/bsnmp/lib/bsnmpclient.3#4 integrate .. //depot/projects/wifi/contrib/bsnmp/lib/bsnmplib.3#3 integrate .. //depot/projects/wifi/contrib/bsnmp/lib/snmp.c#2 integrate .. //depot/projects/wifi/contrib/bsnmp/lib/snmpagent.c#3 integrate .. //depot/projects/wifi/contrib/bsnmp/lib/snmpclient.c#3 integrate .. //depot/projects/wifi/contrib/bsnmp/snmp_mibII/mibII.c#4 integrate .. //depot/projects/wifi/contrib/bsnmp/snmp_mibII/mibII.h#3 integrate .. //depot/projects/wifi/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#2 integrate .. //depot/projects/wifi/contrib/bsnmp/snmp_mibII/mibII_route.c#3 integrate .. //depot/projects/wifi/contrib/bsnmp/snmp_mibII/snmp_mibII.3#4 integrate .. //depot/projects/wifi/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate .. //depot/projects/wifi/contrib/bsnmp/snmp_ntp/snmp_ntp.c#3 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/.gdbinit#2 delete .. //depot/projects/wifi/contrib/bsnmp/snmpd/bsnmpd.1#3 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/config.c#2 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/main.c#5 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/snmpmod.3#4 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/snmpmod.h#3 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/trans_udp.c#2 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/trap.c#2 integrate .. //depot/projects/wifi/contrib/cpio/ABOUT-NLS#1 branch .. //depot/projects/wifi/contrib/cpio/AUTHORS#1 branch .. //depot/projects/wifi/contrib/cpio/COPYING#2 integrate .. //depot/projects/wifi/contrib/cpio/COPYING.LIB#2 delete .. //depot/projects/wifi/contrib/cpio/ChangeLog#2 integrate .. //depot/projects/wifi/contrib/cpio/FREEBSD-upgrade#2 integrate .. //depot/projects/wifi/contrib/cpio/INSTALL#1 branch .. //depot/projects/wifi/contrib/cpio/NEWS#2 integrate .. //depot/projects/wifi/contrib/cpio/README#2 integrate .. //depot/projects/wifi/contrib/cpio/THANKS#1 branch .. //depot/projects/wifi/contrib/cpio/TODO#1 branch .. //depot/projects/wifi/contrib/cpio/alloca.c#2 delete .. //depot/projects/wifi/contrib/cpio/copyin.c#2 delete .. //depot/projects/wifi/contrib/cpio/copyout.c#2 delete .. //depot/projects/wifi/contrib/cpio/copypass.c#2 delete .. //depot/projects/wifi/contrib/cpio/cpio.1#2 delete .. //depot/projects/wifi/contrib/cpio/cpio.h#2 delete .. //depot/projects/wifi/contrib/cpio/cpio.texi#2 delete .. //depot/projects/wifi/contrib/cpio/cpiohdr.h#2 delete .. //depot/projects/wifi/contrib/cpio/defer.c#2 delete .. //depot/projects/wifi/contrib/cpio/defer.h#2 delete .. //depot/projects/wifi/contrib/cpio/dirname.c#2 delete .. //depot/projects/wifi/contrib/cpio/doc/cpio.1#1 branch .. //depot/projects/wifi/contrib/cpio/doc/cpio.texi#1 branch .. //depot/projects/wifi/contrib/cpio/dstring.c#2 delete .. //depot/projects/wifi/contrib/cpio/dstring.h#2 delete .. //depot/projects/wifi/contrib/cpio/error.c#2 delete .. //depot/projects/wifi/contrib/cpio/extern.h#2 delete .. //depot/projects/wifi/contrib/cpio/filemode.c#2 delete .. //depot/projects/wifi/contrib/cpio/filetypes.h#2 delete .. //depot/projects/wifi/contrib/cpio/global.c#2 delete .. //depot/projects/wifi/contrib/cpio/idcache.c#2 delete .. //depot/projects/wifi/contrib/cpio/lib/alloca_.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/argp-ba.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/argp-eexst.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/argp-fmtstream.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/argp-fmtstream.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/argp-fs-xinl.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/argp-help.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/argp-namefrob.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/argp-parse.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/argp-pv.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/argp-pvh.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/argp-xinl.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/argp.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/basename.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/dirname.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/dirname.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/error.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/error.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/exit.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/exitfail.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/exitfail.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/full-write.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/full-write.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/getopt.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/getopt1.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/getopt_.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/getopt_int.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/gettext.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/localedir.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/mempcpy.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/mempcpy.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/rmt.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/rtapelib.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/safe-read.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/safe-read.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/safe-write.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/safe-write.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/savedir.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/savedir.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/strcase.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/strchrnul.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/strchrnul.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/stripslash.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/strndup.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/strndup.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/strnlen.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/system.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/unlocked-io.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/xalloc-die.c#1 branch .. //depot/projects/wifi/contrib/cpio/lib/xalloc.h#1 branch .. //depot/projects/wifi/contrib/cpio/lib/xmalloc.c#1 branch .. //depot/projects/wifi/contrib/cpio/main.c#2 delete .. //depot/projects/wifi/contrib/cpio/makepath.c#2 delete .. //depot/projects/wifi/contrib/cpio/rmt.h#2 delete .. //depot/projects/wifi/contrib/cpio/rtapelib.c#2 delete .. //depot/projects/wifi/contrib/cpio/safe-stat.h#2 delete .. //depot/projects/wifi/contrib/cpio/src/copyin.c#1 branch .. //depot/projects/wifi/contrib/cpio/src/copyout.c#1 branch .. //depot/projects/wifi/contrib/cpio/src/copypass.c#1 branch .. //depot/projects/wifi/contrib/cpio/src/cpio.h#1 branch .. //depot/projects/wifi/contrib/cpio/src/cpiohdr.h#1 branch .. //depot/projects/wifi/contrib/cpio/src/defer.c#1 branch .. //depot/projects/wifi/contrib/cpio/src/defer.h#1 branch .. //depot/projects/wifi/contrib/cpio/src/dstring.c#1 branch .. //depot/projects/wifi/contrib/cpio/src/dstring.h#1 branch .. //depot/projects/wifi/contrib/cpio/src/extern.h#1 branch .. //depot/projects/wifi/contrib/cpio/src/filemode.c#1 branch .. //depot/projects/wifi/contrib/cpio/src/filetypes.h#1 branch .. //depot/projects/wifi/contrib/cpio/src/global.c#1 branch .. //depot/projects/wifi/contrib/cpio/src/idcache.c#1 branch .. //depot/projects/wifi/contrib/cpio/src/main.c#1 branch .. //depot/projects/wifi/contrib/cpio/src/makepath.c#1 branch .. //depot/projects/wifi/contrib/cpio/src/safe-stat.h#1 branch .. //depot/projects/wifi/contrib/cpio/src/tar.c#1 branch .. //depot/projects/wifi/contrib/cpio/src/tar.h#1 branch .. //depot/projects/wifi/contrib/cpio/src/tarhdr.h#1 branch .. //depot/projects/wifi/contrib/cpio/src/userspec.c#1 branch .. //depot/projects/wifi/contrib/cpio/src/util.c#1 branch .. //depot/projects/wifi/contrib/cpio/stripslash.c#2 delete .. //depot/projects/wifi/contrib/cpio/system.h#2 delete .. //depot/projects/wifi/contrib/cpio/tar.c#2 delete .. //depot/projects/wifi/contrib/cpio/tar.h#2 delete .. //depot/projects/wifi/contrib/cpio/tarhdr.h#2 delete .. //depot/projects/wifi/contrib/cpio/userspec.c#2 delete .. //depot/projects/wifi/contrib/cpio/util.c#2 delete .. //depot/projects/wifi/contrib/cpio/version.c#2 delete .. //depot/projects/wifi/contrib/cpio/xmalloc.c#2 delete .. //depot/projects/wifi/contrib/cpio/xstrdup.c#2 delete .. //depot/projects/wifi/contrib/pf/man/pf.4#4 integrate .. //depot/projects/wifi/contrib/pf/man/pf.conf.5#5 integrate .. //depot/projects/wifi/contrib/pf/man/pfsync.4#6 integrate .. //depot/projects/wifi/contrib/smbfs/include/netsmb/nb_lib.h#2 integrate .. //depot/projects/wifi/contrib/smbfs/include/netsmb/smb_lib.h#2 integrate .. //depot/projects/wifi/contrib/smbfs/lib/smb/ctx.c#4 integrate .. //depot/projects/wifi/contrib/smbfs/lib/smb/mbuf.c#2 integrate .. //depot/projects/wifi/contrib/smbfs/lib/smb/nb.c#2 integrate .. //depot/projects/wifi/contrib/smbfs/lib/smb/nb_name.c#2 integrate .. //depot/projects/wifi/contrib/smbfs/lib/smb/nb_net.c#2 integrate .. //depot/projects/wifi/contrib/smbfs/lib/smb/nbns_rq.c#2 integrate .. //depot/projects/wifi/contrib/smbfs/lib/smb/rap.c#2 integrate .. //depot/projects/wifi/contrib/smbfs/mount_smbfs/mount_smbfs.8#2 integrate .. //depot/projects/wifi/contrib/smbfs/smbutil/view.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/FREEBSD-Xlist#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/driver_ndis.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/driver_ndis.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/driver_ndis_.c#1 branch .. //depot/projects/wifi/crypto/openssl/ssl/s23_srvr.c#2 integrate .. //depot/projects/wifi/etc/defaults/rc.conf#20 integrate .. //depot/projects/wifi/etc/mtree/BSD.include.dist#9 integrate .. //depot/projects/wifi/etc/pccard_ether#8 integrate .. //depot/projects/wifi/etc/rc.d/Makefile#12 integrate .. //depot/projects/wifi/etc/rc.d/archdep#2 integrate .. //depot/projects/wifi/etc/rc.d/geli#2 integrate .. //depot/projects/wifi/etc/rc.d/hcsecd#1 branch .. //depot/projects/wifi/etc/rc.d/ipsec#2 integrate .. //depot/projects/wifi/etc/rc.d/kerberos#2 integrate .. //depot/projects/wifi/etc/rc.d/localpkg#2 integrate .. //depot/projects/wifi/etc/rc.d/mountcritremote#3 integrate .. //depot/projects/wifi/etc/rc.d/mountd#2 integrate .. //depot/projects/wifi/etc/rc.d/pf#4 integrate .. //depot/projects/wifi/etc/rc.d/pflog#3 integrate .. //depot/projects/wifi/etc/rc.d/pfsync#1 branch .. //depot/projects/wifi/etc/rc.d/sdpd#1 branch .. //depot/projects/wifi/etc/rc.d/ugidfw#3 integrate .. //depot/projects/wifi/etc/rc.firewall6#2 integrate .. //depot/projects/wifi/etc/rc.subr#6 integrate .. //depot/projects/wifi/games/fortune/datfiles/fortunes#16 integrate .. //depot/projects/wifi/games/fortune/datfiles/limerick#4 integrate .. //depot/projects/wifi/gnu/lib/libstdc++/config.h#4 integrate .. //depot/projects/wifi/gnu/usr.bin/cpio/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/cpio/config.h#1 branch .. //depot/projects/wifi/gnu/usr.bin/cpio/doc/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#4 integrate .. //depot/projects/wifi/include/Makefile#17 integrate .. //depot/projects/wifi/include/pthread_np.h#2 integrate .. //depot/projects/wifi/lib/Makefile#9 integrate .. //depot/projects/wifi/lib/csu/amd64/crt1.c#2 integrate .. //depot/projects/wifi/lib/csu/i386-elf/crt1.c#3 integrate .. //depot/projects/wifi/lib/libarchive/COPYING#2 integrate .. //depot/projects/wifi/lib/libarchive/Makefile#14 integrate .. //depot/projects/wifi/lib/libarchive/Makefile.am#3 integrate .. //depot/projects/wifi/lib/libarchive/archive.h.in#6 integrate .. //depot/projects/wifi/lib/libarchive/archive_entry.c#7 integrate .. //depot/projects/wifi/lib/libarchive/archive_entry.h#5 integrate .. //depot/projects/wifi/lib/libarchive/archive_platform.h#7 integrate .. //depot/projects/wifi/lib/libarchive/archive_private.h#6 integrate .. //depot/projects/wifi/lib/libarchive/archive_read.3#8 integrate .. //depot/projects/wifi/lib/libarchive/archive_read.c#6 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_data_into_fd.c#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_open_fd.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_open_file.c#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_bzip2.c#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_cpio.c#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_iso9660.c#5 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_tar.c#9 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_zip.c#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_util.c#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_write.c#5 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_cpio.c#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_pax.c#11 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_ustar.c#3 integrate .. //depot/projects/wifi/lib/libarchive/configure.ac.in#7 integrate .. //depot/projects/wifi/lib/libbsnmp/libbsnmp/Makefile#2 integrate .. //depot/projects/wifi/lib/libc/arm/string/Makefile.inc#2 integrate .. //depot/projects/wifi/lib/libc/arm/string/strlen.S#1 branch .. //depot/projects/wifi/lib/libc/gen/getcwd.c#3 integrate .. //depot/projects/wifi/lib/libc/stdio/fgetwln.3#2 integrate .. //depot/projects/wifi/lib/libdevstat/devstat.c#3 integrate .. //depot/projects/wifi/lib/libedit/editline.3#5 integrate .. //depot/projects/wifi/lib/libedit/el.c#3 integrate .. //depot/projects/wifi/lib/libedit/makelist#3 integrate .. //depot/projects/wifi/lib/libedit/map.c#3 integrate .. //depot/projects/wifi/lib/libkvm/kvm_arm.c#3 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_exec/pam_exec.c#3 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_ssh/Makefile#3 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_ssh/pam_ssh.8#2 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_ssh/pam_ssh.c#2 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_init.c#4 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_kern.c#4 integrate .. //depot/projects/wifi/lib/libthr/pthread.map#4 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_create.c#6 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_join.c#3 integrate .. //depot/projects/wifi/lib/libufs/Makefile#3 integrate .. //depot/projects/wifi/lib/libutil/pidfile.3#2 integrate .. //depot/projects/wifi/lib/libutil/trimdomain.c#2 integrate .. //depot/projects/wifi/lib/msun/bsdsrc/b_log.c#3 integrate .. //depot/projects/wifi/lib/msun/bsdsrc/b_tgamma.c#3 integrate .. //depot/projects/wifi/lib/msun/bsdsrc/mathimpl.h#3 integrate .. //depot/projects/wifi/lib/msun/src/e_rem_pio2f.c#2 integrate .. //depot/projects/wifi/lib/msun/src/k_cosf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/k_rem_pio2f.c#3 integrate .. //depot/projects/wifi/release/Makefile#12 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#2 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#17 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#19 integrate .. //depot/projects/wifi/release/doc/share/misc/dev.archlist.txt#15 integrate .. //depot/projects/wifi/release/doc/zh_CN.GB2312/Makefile#2 integrate .. //depot/projects/wifi/release/doc/zh_CN.GB2312/early-adopter/Makefile#2 delete .. //depot/projects/wifi/release/doc/zh_CN.GB2312/early-adopter/article.sgml#2 delete .. //depot/projects/wifi/release/doc/zh_CN.GB2312/errata/article.sgml#3 integrate .. //depot/projects/wifi/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#2 integrate .. //depot/projects/wifi/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#3 integrate .. //depot/projects/wifi/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#5 integrate .. //depot/projects/wifi/release/doc/zh_CN.GB2312/hardware/common/intro.sgml#2 integrate .. //depot/projects/wifi/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#3 integrate .. //depot/projects/wifi/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#2 integrate .. //depot/projects/wifi/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#3 integrate .. //depot/projects/wifi/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml#2 integrate .. //depot/projects/wifi/release/doc/zh_CN.GB2312/readme/article.sgml#2 integrate .. //depot/projects/wifi/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#6 integrate .. //depot/projects/wifi/release/pc98/boot_crunch.conf#2 integrate .. //depot/projects/wifi/release/picobsd/bridge/PICOBSD#3 integrate .. //depot/projects/wifi/release/picobsd/tinyware/ns/ns.c#2 integrate .. //depot/projects/wifi/sbin/Makefile#9 integrate .. //depot/projects/wifi/sbin/bsdlabel/bsdlabel.8#3 integrate .. //depot/projects/wifi/sbin/devd/devd.cc#6 integrate .. //depot/projects/wifi/sbin/fdisk/fdisk.c#6 integrate .. //depot/projects/wifi/sbin/fdisk_pc98/fdisk.c#5 integrate .. //depot/projects/wifi/sbin/fsck_ffs/fsck_ffs.8#4 integrate .. //depot/projects/wifi/sbin/geom/class/mirror/gmirror.8#9 integrate .. //depot/projects/wifi/sbin/ifconfig/ifbridge.c#2 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.8#11 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.c#15 integrate .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#48 integrate .. //depot/projects/wifi/sbin/ifconfig/ifvlan.c#9 integrate .. //depot/projects/wifi/sbin/ipfw/ipfw.8#14 integrate .. //depot/projects/wifi/sbin/kldstat/kldstat.8#4 integrate .. //depot/projects/wifi/sbin/kldstat/kldstat.c#4 integrate .. //depot/projects/wifi/sbin/mount/Makefile#2 integrate .. //depot/projects/wifi/sbin/mount/extern.h#2 integrate .. //depot/projects/wifi/sbin/mount/getmntopts.c#3 integrate .. //depot/projects/wifi/sbin/mount/mount.c#5 integrate .. //depot/projects/wifi/sbin/mount/mount_ufs.c#3 integrate .. //depot/projects/wifi/sbin/mount_cd9660/mount_cd9660.8#5 integrate .. //depot/projects/wifi/sbin/reboot/boot_i386.8#6 integrate .. //depot/projects/wifi/sbin/route/keywords#2 integrate .. //depot/projects/wifi/sbin/route/route.8#6 integrate .. //depot/projects/wifi/sbin/route/route.c#3 integrate .. //depot/projects/wifi/sbin/savecore/savecore.c#7 integrate .. //depot/projects/wifi/sbin/setkey/Makefile#1 branch .. //depot/projects/wifi/sbin/setkey/parse.y#1 branch .. //depot/projects/wifi/sbin/setkey/sample.cf#1 branch .. //depot/projects/wifi/sbin/setkey/scriptdump.pl#1 branch .. //depot/projects/wifi/sbin/setkey/setkey.8#1 branch .. //depot/projects/wifi/sbin/setkey/setkey.c#1 branch .. //depot/projects/wifi/sbin/setkey/test-pfkey.c#1 branch .. //depot/projects/wifi/sbin/setkey/test-policy.c#1 branch .. //depot/projects/wifi/sbin/setkey/token.l#1 branch .. //depot/projects/wifi/sbin/setkey/vchar.h#1 branch .. //depot/projects/wifi/share/man/man4/Makefile#25 integrate .. //depot/projects/wifi/share/man/man4/altq.4#11 integrate .. //depot/projects/wifi/share/man/man4/an.4#4 integrate .. //depot/projects/wifi/share/man/man4/ata.4#9 integrate .. //depot/projects/wifi/share/man/man4/ath.4#13 integrate .. //depot/projects/wifi/share/man/man4/aue.4#5 integrate .. //depot/projects/wifi/share/man/man4/awi.4#6 integrate .. //depot/projects/wifi/share/man/man4/axe.4#5 integrate .. //depot/projects/wifi/share/man/man4/bfe.4#4 integrate .. //depot/projects/wifi/share/man/man4/bge.4#6 integrate .. //depot/projects/wifi/share/man/man4/bridge.4#3 delete .. //depot/projects/wifi/share/man/man4/cardbus.4#2 integrate .. //depot/projects/wifi/share/man/man4/cdce.4#6 integrate .. //depot/projects/wifi/share/man/man4/cm.4#5 integrate .. //depot/projects/wifi/share/man/man4/cue.4#4 integrate .. //depot/projects/wifi/share/man/man4/dc.4#7 integrate .. //depot/projects/wifi/share/man/man4/dcons.4#3 integrate .. //depot/projects/wifi/share/man/man4/de.4#5 integrate .. //depot/projects/wifi/share/man/man4/dummynet.4#3 integrate .. //depot/projects/wifi/share/man/man4/ed.4#9 integrate .. //depot/projects/wifi/share/man/man4/em.4#10 integrate .. //depot/projects/wifi/share/man/man4/en.4#4 integrate .. //depot/projects/wifi/share/man/man4/esp.4#2 integrate .. //depot/projects/wifi/share/man/man4/fwe.4#6 integrate .. //depot/projects/wifi/share/man/man4/fwip.4#6 integrate .. //depot/projects/wifi/share/man/man4/fxp.4#6 integrate .. //depot/projects/wifi/share/man/man4/hme.4#4 integrate .. //depot/projects/wifi/share/man/man4/hptmv.4#4 integrate .. //depot/projects/wifi/share/man/man4/hwpmc.4#8 integrate .. //depot/projects/wifi/share/man/man4/ip.4#6 integrate .. //depot/projects/wifi/share/man/man4/ipw.4#5 integrate .. //depot/projects/wifi/share/man/man4/iwi.4#7 integrate .. //depot/projects/wifi/share/man/man4/kue.4#4 integrate .. //depot/projects/wifi/share/man/man4/lge.4#4 integrate .. //depot/projects/wifi/share/man/man4/lmc.4#1 branch .. //depot/projects/wifi/share/man/man4/mac_seeotheruids.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/arl.4#4 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/cp.4#5 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/cs.4#5 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/cx.4#4 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/ep.4#11 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/ex.4#5 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/fe.4#6 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/ie.4#4 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/lnc.4#6 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/ray.4#7 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/vx.4#5 integrate .. //depot/projects/wifi/share/man/man4/my.4#4 integrate .. //depot/projects/wifi/share/man/man4/ng_bridge.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_iface.4#3 integrate .. //depot/projects/wifi/share/man/man4/nge.4#6 integrate .. //depot/projects/wifi/share/man/man4/nve.4#6 integrate .. //depot/projects/wifi/share/man/man4/pccard.4#2 integrate .. //depot/projects/wifi/share/man/man4/pccbb.4#3 integrate .. //depot/projects/wifi/share/man/man4/pcm.4#5 integrate .. //depot/projects/wifi/share/man/man4/pcn.4#5 integrate .. //depot/projects/wifi/share/man/man4/polling.4#6 integrate .. //depot/projects/wifi/share/man/man4/ral.4#5 integrate .. //depot/projects/wifi/share/man/man4/re.4#7 integrate .. //depot/projects/wifi/share/man/man4/rl.4#8 integrate .. //depot/projects/wifi/share/man/man4/rue.4#4 integrate .. //depot/projects/wifi/share/man/man4/sf.4#5 integrate .. //depot/projects/wifi/share/man/man4/sis.4#5 integrate .. //depot/projects/wifi/share/man/man4/sk.4#7 integrate .. //depot/projects/wifi/share/man/man4/sn.4#7 integrate .. //depot/projects/wifi/share/man/man4/snd_mss.4#1 branch .. //depot/projects/wifi/share/man/man4/snp.4#3 integrate .. //depot/projects/wifi/share/man/man4/ste.4#7 integrate .. //depot/projects/wifi/share/man/man4/ti.4#5 integrate .. //depot/projects/wifi/share/man/man4/tl.4#4 integrate .. //depot/projects/wifi/share/man/man4/tx.4#5 integrate .. //depot/projects/wifi/share/man/man4/txp.4#6 integrate .. //depot/projects/wifi/share/man/man4/udav.4#5 integrate .. //depot/projects/wifi/share/man/man4/ural.4#5 integrate .. //depot/projects/wifi/share/man/man4/vge.4#6 integrate .. //depot/projects/wifi/share/man/man4/vlan.4#9 integrate .. //depot/projects/wifi/share/man/man4/vr.4#6 integrate .. //depot/projects/wifi/share/man/man4/wb.4#5 integrate .. //depot/projects/wifi/share/man/man4/wi.4#7 integrate .. //depot/projects/wifi/share/man/man4/xe.4#6 integrate .. //depot/projects/wifi/share/man/man4/xl.4#9 integrate .. //depot/projects/wifi/share/man/man5/Makefile#6 integrate .. //depot/projects/wifi/share/man/man5/make.conf.5#12 integrate .. //depot/projects/wifi/share/man/man5/passwd.5#4 integrate .. //depot/projects/wifi/share/man/man5/rc.conf.5#20 integrate .. //depot/projects/wifi/share/man/man5/style.Makefile.5#4 integrate .. //depot/projects/wifi/share/man/man7/build.7#5 integrate .. //depot/projects/wifi/share/man/man7/development.7#4 integrate .. //depot/projects/wifi/share/man/man7/release.7#7 integrate .. //depot/projects/wifi/share/man/man8/diskless.8#3 integrate .. //depot/projects/wifi/share/man/man9/EVENTHANDLER.9#4 integrate .. //depot/projects/wifi/share/man/man9/Makefile#14 integrate .. //depot/projects/wifi/share/man/man9/VFS_LOCK_GIANT.9#1 branch .. //depot/projects/wifi/share/man/man9/atomic.9#2 integrate .. //depot/projects/wifi/share/man/man9/critical_enter.9#2 integrate .. //depot/projects/wifi/share/man/man9/device_get_softc.9#3 integrate .. //depot/projects/wifi/share/man/man9/make_dev.9#3 integrate .. //depot/projects/wifi/share/man/man9/microtime.9#4 integrate .. //depot/projects/wifi/share/man/man9/namei.9#3 integrate .. //depot/projects/wifi/share/man/man9/pfil.9#4 integrate .. //depot/projects/wifi/share/mk/sys.mk#6 integrate .. //depot/projects/wifi/share/msgdef/Makefile#3 integrate .. //depot/projects/wifi/sys/alpha/alpha/busdma_machdep.c#7 integrate .. //depot/projects/wifi/sys/alpha/alpha/interrupt.c#6 integrate .. //depot/projects/wifi/sys/alpha/alpha/sgmap.c#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/trap.c#5 integrate .. //depot/projects/wifi/sys/alpha/conf/GENERIC#8 integrate .. //depot/projects/wifi/sys/alpha/conf/MAC#1 branch .. //depot/projects/wifi/sys/alpha/include/atomic.h#6 integrate .. //depot/projects/wifi/sys/alpha/include/chipset.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/pmap.h#3 integrate .. //depot/projects/wifi/sys/alpha/isa/isa.c#2 integrate .. //depot/projects/wifi/sys/alpha/mcbus/mcpcia.c#3 integrate .. //depot/projects/wifi/sys/alpha/osf1/osf1_ioctl.c#3 integrate .. //depot/projects/wifi/sys/alpha/osf1/osf1_misc.c#8 integrate .. //depot/projects/wifi/sys/alpha/osf1/osf1_signal.c#5 integrate .. //depot/projects/wifi/sys/alpha/pci/apecs.c#3 integrate .. //depot/projects/wifi/sys/alpha/pci/cia.c#3 integrate .. //depot/projects/wifi/sys/alpha/pci/irongate.c#2 integrate .. //depot/projects/wifi/sys/alpha/pci/lca.c#3 integrate .. //depot/projects/wifi/sys/alpha/pci/pcibus.c#3 integrate .. //depot/projects/wifi/sys/alpha/pci/t2.c#3 integrate .. //depot/projects/wifi/sys/alpha/pci/tsunami.c#2 integrate .. //depot/projects/wifi/sys/alpha/pci/tsunami_pci.c#2 integrate .. //depot/projects/wifi/sys/alpha/tlsb/dwlpx.c#3 integrate .. //depot/projects/wifi/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/gdb_machdep.c#5 integrate .. //depot/projects/wifi/sys/amd64/amd64/genassym.c#4 integrate .. //depot/projects/wifi/sys/amd64/amd64/machdep.c#12 integrate .. //depot/projects/wifi/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/nexus.c#4 integrate .. //depot/projects/wifi/sys/amd64/amd64/support.S#4 integrate .. //depot/projects/wifi/sys/amd64/amd64/trap.c#8 integrate .. //depot/projects/wifi/sys/amd64/amd64/vm_machdep.c#10 integrate .. //depot/projects/wifi/sys/amd64/conf/MAC#1 branch .. //depot/projects/wifi/sys/amd64/conf/NOTES#15 integrate .. //depot/projects/wifi/sys/amd64/ia32/ia32_reg.c#2 integrate .. //depot/projects/wifi/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/wifi/sys/amd64/include/atomic.h#8 integrate .. //depot/projects/wifi/sys/amd64/include/legacyvar.h#3 integrate .. //depot/projects/wifi/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/wifi/sys/amd64/linux32/linux32_sysvec.c#7 integrate .. //depot/projects/wifi/sys/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/wifi/sys/arm/arm/bcopy_page.S#4 integrate .. //depot/projects/wifi/sys/arm/arm/bcopyinout.S#6 integrate .. //depot/projects/wifi/sys/arm/arm/bcopyinout_xscale.S#5 integrate .. //depot/projects/wifi/sys/arm/arm/busdma_machdep.c#12 integrate .. //depot/projects/wifi/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/wifi/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/wifi/sys/arm/arm/genassym.c#5 integrate .. //depot/projects/wifi/sys/arm/arm/in_cksum.c#5 integrate .. //depot/projects/wifi/sys/arm/arm/in_cksum_arm.S#5 integrate .. //depot/projects/wifi/sys/arm/arm/inckern.S#1 branch .. //depot/projects/wifi/sys/arm/arm/intr.c#8 integrate .. //depot/projects/wifi/sys/arm/arm/locore.S#7 integrate .. //depot/projects/wifi/sys/arm/arm/machdep.c#7 integrate .. //depot/projects/wifi/sys/arm/arm/mem.c#2 integrate .. //depot/projects/wifi/sys/arm/arm/nexus.c#4 integrate .. //depot/projects/wifi/sys/arm/arm/pmap.c#15 integrate .. //depot/projects/wifi/sys/arm/arm/support.S#5 integrate .. //depot/projects/wifi/sys/arm/arm/swtch.S#11 integrate .. //depot/projects/wifi/sys/arm/arm/vm_machdep.c#10 integrate .. //depot/projects/wifi/sys/arm/conf/IQ31244#8 integrate .. //depot/projects/wifi/sys/arm/conf/SIMICS#5 integrate .. //depot/projects/wifi/sys/arm/include/atomic.h#10 integrate .. //depot/projects/wifi/sys/arm/include/in_cksum.h#3 integrate .. //depot/projects/wifi/sys/arm/include/md_var.h#2 integrate .. //depot/projects/wifi/sys/arm/include/pmap.h#8 integrate .. //depot/projects/wifi/sys/arm/sa11x0/assabet_machdep.c#5 integrate .. //depot/projects/wifi/sys/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/wifi/sys/arm/sa11x0/sa11x0_irqhandler.c#4 integrate .. //depot/projects/wifi/sys/arm/sa11x0/sa11x0_var.h#2 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/files.i80321#3 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/wifi/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/wifi/sys/arm/xscale/i80321/i80321_pci.c#5 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/i80321_timer.c#5 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/i80321var.h#3 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/iq31244_machdep.c#12 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/iq80321.c#7 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/obio.c#3 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/obiovar.h#3 integrate .. //depot/projects/wifi/sys/boot/common/help.common#4 integrate .. //depot/projects/wifi/sys/boot/common/loader.8#7 integrate .. //depot/projects/wifi/sys/boot/efi/libefi/bootinfo.c#3 integrate .. //depot/projects/wifi/sys/boot/forth/loader.conf#8 integrate .. //depot/projects/wifi/sys/boot/i386/boot2/boot2.c#5 integrate .. //depot/projects/wifi/sys/boot/i386/libi386/bootinfo.c#4 integrate .. //depot/projects/wifi/sys/boot/i386/libi386/libi386.h#3 integrate .. //depot/projects/wifi/sys/boot/i386/loader/main.c#3 integrate .. //depot/projects/wifi/sys/boot/ia64/ski/bootinfo.c#3 integrate .. //depot/projects/wifi/sys/boot/pc98/loader/main.c#5 integrate .. //depot/projects/wifi/sys/boot/powerpc/loader/metadata.c#3 integrate .. //depot/projects/wifi/sys/boot/sparc64/loader/metadata.c#4 integrate .. //depot/projects/wifi/sys/cam/cam_xpt.c#12 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_misc.c#9 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/wifi/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/wifi/sys/compat/linux/linux_socket.c#6 integrate .. //depot/projects/wifi/sys/compat/ndis/kern_ndis.c#16 integrate .. //depot/projects/wifi/sys/compat/ndis/kern_windrv.c#9 integrate .. //depot/projects/wifi/sys/compat/ndis/ndis_var.h#12 integrate .. //depot/projects/wifi/sys/compat/ndis/ntoskrnl_var.h#14 integrate .. //depot/projects/wifi/sys/compat/ndis/subr_hal.c#12 integrate .. //depot/projects/wifi/sys/compat/ndis/subr_ndis.c#16 integrate .. //depot/projects/wifi/sys/compat/ndis/subr_ntoskrnl.c#17 integrate .. //depot/projects/wifi/sys/compat/ndis/winx32_wrap.S#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_fcntl.c#4 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_ioctl.c#3 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_ipc.c#6 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_misc.c#7 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_signal.c#5 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_stat.c#4 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_stream.c#6 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_termios.c#3 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_ttold.c#3 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_util.h#4 integrate .. //depot/projects/wifi/sys/conf/Makefile.arm#8 integrate .. //depot/projects/wifi/sys/conf/NOTES#27 integrate .. //depot/projects/wifi/sys/conf/files#33 integrate .. //depot/projects/wifi/sys/conf/files.arm#6 integrate .. //depot/projects/wifi/sys/conf/files.i386#21 integrate .. //depot/projects/wifi/sys/conf/files.pc98#12 integrate .. //depot/projects/wifi/sys/conf/kern.pre.mk#10 integrate .. //depot/projects/wifi/sys/conf/kmod.mk#15 integrate .. //depot/projects/wifi/sys/contrib/dev/oltr/if_oltr.c#5 integrate .. //depot/projects/wifi/sys/contrib/dev/oltr/if_oltr_pci.c#3 integrate .. //depot/projects/wifi/sys/contrib/pf/net/if_pflog.c#6 integrate .. //depot/projects/wifi/sys/contrib/pf/net/if_pfsync.c#8 integrate .. //depot/projects/wifi/sys/ddb/db_command.c#6 integrate .. //depot/projects/wifi/sys/ddb/db_output.c#4 integrate .. //depot/projects/wifi/sys/dev/aac/aac.c#8 integrate .. //depot/projects/wifi/sys/dev/aac/aac_cam.c#6 integrate .. //depot/projects/wifi/sys/dev/aac/aac_debug.c#4 integrate .. //depot/projects/wifi/sys/dev/aac/aac_pci.c#8 integrate .. //depot/projects/wifi/sys/dev/aac/aac_tables.h#3 integrate .. //depot/projects/wifi/sys/dev/aac/aacreg.h#4 integrate .. //depot/projects/wifi/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_pcib_acpi.c#7 integrate .. //depot/projects/wifi/sys/dev/adlink/adlink.c#4 integrate .. //depot/projects/wifi/sys/dev/aic/aic_pccard.c#3 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/ahd_pci.c#4 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic79xx.c#5 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic79xx_osm.c#4 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic7xxx_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/an/if_an.c#8 integrate .. //depot/projects/wifi/sys/dev/an/if_an_pccard.c#4 integrate .. //depot/projects/wifi/sys/dev/arl/if_arl_isa.c#3 integrate .. //depot/projects/wifi/sys/dev/ata/ata-all.h#12 integrate .. //depot/projects/wifi/sys/dev/ata/ata-card.c#9 integrate .. //depot/projects/wifi/sys/dev/ata/ata-chipset.c#18 integrate .. //depot/projects/wifi/sys/dev/ata/ata-dma.c#8 integrate .. //depot/projects/wifi/sys/dev/ata/ata-lowlevel.c#16 integrate .. //depot/projects/wifi/sys/dev/ata/ata-pci.c#11 integrate .. //depot/projects/wifi/sys/dev/ata/ata-pci.h#12 integrate .. //depot/projects/wifi/sys/dev/ata/ata-raid.c#13 integrate .. //depot/projects/wifi/sys/dev/ata/atapi-cd.c#11 integrate .. //depot/projects/wifi/sys/dev/ath/if_ath.c#108 integrate .. //depot/projects/wifi/sys/dev/awi/if_awi_pccard.c#4 integrate .. //depot/projects/wifi/sys/dev/bfe/if_bfe.c#8 integrate .. //depot/projects/wifi/sys/dev/bge/if_bge.c#15 integrate .. //depot/projects/wifi/sys/dev/cardbus/cardbus.c#8 integrate .. //depot/projects/wifi/sys/dev/cm/if_cm_isa.c#4 integrate .. //depot/projects/wifi/sys/dev/cnw/if_cnw.c#5 integrate .. //depot/projects/wifi/sys/dev/cp/if_cp.c#10 integrate .. //depot/projects/wifi/sys/dev/cs/if_cs.c#7 integrate .. //depot/projects/wifi/sys/dev/cs/if_cs_pccard.c#7 integrate .. //depot/projects/wifi/sys/dev/ctau/if_ct.c#10 integrate .. //depot/projects/wifi/sys/dev/cx/if_cx.c#9 integrate .. //depot/projects/wifi/sys/dev/dc/dcphy.c#1 branch .. //depot/projects/wifi/sys/dev/dc/if_dc.c#1 branch .. //depot/projects/wifi/sys/dev/dc/if_dcreg.h#1 branch .. //depot/projects/wifi/sys/dev/dc/pnphy.c#1 branch .. //depot/projects/wifi/sys/dev/ed/ax88x90reg.h#1 branch .. //depot/projects/wifi/sys/dev/ed/dl100xxreg.h#1 branch .. //depot/projects/wifi/sys/dev/ed/if_ed.c#13 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_isa.c#7 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_pccard.c#11 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_pci.c#9 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_rtl80x9.c#1 branch .. //depot/projects/wifi/sys/dev/ed/if_edreg.h#6 integrate .. //depot/projects/wifi/sys/dev/ed/if_edvar.h#8 integrate .. //depot/projects/wifi/sys/dev/ed/rtl80x9reg.h#1 branch .. //depot/projects/wifi/sys/dev/ed/tc5299jreg.h#1 branch .. //depot/projects/wifi/sys/dev/em/if_em.c#15 integrate .. //depot/projects/wifi/sys/dev/em/if_em.h#6 integrate .. //depot/projects/wifi/sys/dev/en/if_en_pci.c#6 integrate .. //depot/projects/wifi/sys/dev/ep/if_ep.c#9 integrate .. //depot/projects/wifi/sys/dev/ex/if_ex.c#6 integrate .. //depot/projects/wifi/sys/dev/exca/exca.c#3 integrate .. //depot/projects/wifi/sys/dev/fatm/if_fatm.c#6 integrate .. //depot/projects/wifi/sys/dev/fb/creator.c#4 integrate .. //depot/projects/wifi/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/wifi/sys/dev/fb/gfb.c#4 integrate .. //depot/projects/wifi/sys/dev/fb/machfb.c#3 integrate .. //depot/projects/wifi/sys/dev/fb/s3_pci.c#4 integrate .. //depot/projects/wifi/sys/dev/fb/tga.c#4 integrate .. //depot/projects/wifi/sys/dev/fb/vga.c#4 integrate .. //depot/projects/wifi/sys/dev/fe/if_fe.c#7 integrate .. //depot/projects/wifi/sys/dev/fe/if_fe_pccard.c#6 integrate .. //depot/projects/wifi/sys/dev/firewire/00README#2 integrate .. //depot/projects/wifi/sys/dev/firewire/if_fwe.c#5 integrate .. //depot/projects/wifi/sys/dev/firewire/if_fwip.c#6 integrate .. //depot/projects/wifi/sys/dev/fxp/if_fxp.c#14 integrate .. //depot/projects/wifi/sys/dev/fxp/if_fxpvar.h#7 integrate .. //depot/projects/wifi/sys/dev/gem/if_gem.c#7 integrate .. //depot/projects/wifi/sys/dev/hatm/if_hatm.c#6 integrate .. //depot/projects/wifi/sys/dev/hatm/if_hatm_intr.c#6 integrate .. //depot/projects/wifi/sys/dev/hwpmc/hwpmc_piv.c#4 integrate .. //depot/projects/wifi/sys/dev/ie/if_ie.c#5 integrate .. //depot/projects/wifi/sys/dev/ieee488/pcii.c#3 integrate .. //depot/projects/wifi/sys/dev/ieee488/tnt4882.c#2 integrate .. //depot/projects/wifi/sys/dev/ieee488/upd7210.c#6 integrate .. //depot/projects/wifi/sys/dev/ieee488/upd7210.h#5 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis.c#21 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndisvar.h#11 integrate .. //depot/projects/wifi/sys/dev/ips/ips.c#4 integrate .. //depot/projects/wifi/sys/dev/ips/ips.h#4 integrate .. //depot/projects/wifi/sys/dev/ips/ips_commands.c#3 integrate .. //depot/projects/wifi/sys/dev/ips/ips_disk.c#3 integrate .. //depot/projects/wifi/sys/dev/ips/ips_ioctl.c#3 integrate .. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#7 integrate .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#9 integrate .. //depot/projects/wifi/sys/dev/iwi/if_iwireg.h#5 integrate .. //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#6 integrate .. //depot/projects/wifi/sys/dev/ixgb/README#2 integrate .. //depot/projects/wifi/sys/dev/ixgb/if_ixgb.c#10 integrate .. //depot/projects/wifi/sys/dev/ixgb/if_ixgb.h#7 integrate .. //depot/projects/wifi/sys/dev/joy/joy_pccard.c#2 integrate .. //depot/projects/wifi/sys/dev/lge/if_lge.c#8 integrate .. //depot/projects/wifi/sys/dev/lge/if_lgereg.h#4 integrate .. //depot/projects/wifi/sys/dev/lmc/if_lmc.c#1 branch .. //depot/projects/wifi/sys/dev/lmc/if_lmc.h#1 branch .. //depot/projects/wifi/sys/dev/lnc/if_lnc.c#5 integrate .. //depot/projects/wifi/sys/dev/md/md.c#11 integrate .. //depot/projects/wifi/sys/dev/mii/acphy.c#3 integrate .. //depot/projects/wifi/sys/dev/mii/amphy.c#3 integrate .. //depot/projects/wifi/sys/dev/mii/brgphy.c#4 integrate .. //depot/projects/wifi/sys/dev/mii/ciphy.c#3 integrate .. //depot/projects/wifi/sys/dev/mii/dcphy.c#4 integrate .. //depot/projects/wifi/sys/dev/mii/exphy.c#3 integrate .. //depot/projects/wifi/sys/dev/mii/lxtphy.c#3 integrate .. //depot/projects/wifi/sys/dev/mii/mii_physubr.c#3 integrate .. //depot/projects/wifi/sys/dev/mii/miivar.h#2 integrate .. //depot/projects/wifi/sys/dev/mii/nsgphy.c#3 integrate .. //depot/projects/wifi/sys/dev/mii/nsphy.c#3 integrate .. //depot/projects/wifi/sys/dev/mii/pnaphy.c#3 integrate .. //depot/projects/wifi/sys/dev/mii/pnphy.c#3 integrate .. //depot/projects/wifi/sys/dev/mii/qsphy.c#3 integrate .. //depot/projects/wifi/sys/dev/mii/rgephy.c#3 integrate .. //depot/projects/wifi/sys/dev/mii/rlphy.c#3 integrate .. //depot/projects/wifi/sys/dev/mii/tdkphy.c#3 integrate .. //depot/projects/wifi/sys/dev/mii/tlphy.c#3 integrate .. //depot/projects/wifi/sys/dev/mii/ukphy.c#3 integrate .. //depot/projects/wifi/sys/dev/mii/xmphy.c#3 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt.c#5 integrate .. //depot/projects/wifi/sys/dev/ncv/ncr53c500_pccard.c#5 integrate .. //depot/projects/wifi/sys/dev/nge/if_nge.c#10 integrate .. //depot/projects/wifi/sys/dev/nge/if_ngereg.h#4 integrate .. //depot/projects/wifi/sys/dev/nsp/nsp_pccard.c#5 integrate .. //depot/projects/wifi/sys/dev/nve/if_nve.c#8 integrate .. //depot/projects/wifi/sys/dev/patm/if_patm_attach.c#5 integrate .. //depot/projects/wifi/sys/dev/patm/if_patm_rx.c#4 integrate .. //depot/projects/wifi/sys/dev/pccard/card_if.m#7 integrate .. //depot/projects/wifi/sys/dev/pccard/pccard.c#11 integrate .. //depot/projects/wifi/sys/dev/pccard/pccard_cis.c#9 integrate .. //depot/projects/wifi/sys/dev/pccard/pccard_cis_quirks.c#4 integrate .. //depot/projects/wifi/sys/dev/pccard/pccard_device.c#1 branch .. //depot/projects/wifi/sys/dev/pccard/pccarddevs#11 integrate .. //depot/projects/wifi/sys/dev/pccard/pccardvar.h#6 integrate .. //depot/projects/wifi/sys/dev/pccard/pccardvarp.h#1 branch .. //depot/projects/wifi/sys/dev/pccbb/pccbb.c#7 integrate .. //depot/projects/wifi/sys/dev/pccbb/pccbb_pci.c#9 integrate .. //depot/projects/wifi/sys/dev/pccbb/pccbbdevid.h#4 integrate .. //depot/projects/wifi/sys/dev/pccbb/pccbbvar.h#5 integrate .. //depot/projects/wifi/sys/dev/pci/isa_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/pci/pci.c#18 integrate .. //depot/projects/wifi/sys/dev/puc/puc.c#4 integrate .. //depot/projects/wifi/sys/dev/ral/if_ral.c#6 integrate .. //depot/projects/wifi/sys/dev/ral/if_ral_pccard.c#4 integrate .. //depot/projects/wifi/sys/dev/ray/if_ray.c#10 integrate .. //depot/projects/wifi/sys/dev/re/if_re.c#11 integrate .. //depot/projects/wifi/sys/dev/sbsh/if_sbsh.c#6 integrate .. //depot/projects/wifi/sys/dev/sio/sio.c#4 integrate .. //depot/projects/wifi/sys/dev/sio/sio_pccard.c#4 integrate .. //depot/projects/wifi/sys/dev/sn/if_sn.c#9 integrate .. //depot/projects/wifi/sys/dev/sn/if_snreg.h#3 integrate .. //depot/projects/wifi/sys/dev/snc/if_snc_pccard.c#6 integrate .. //depot/projects/wifi/sys/dev/snp/snp.c#8 integrate .. //depot/projects/wifi/sys/dev/sound/pci/als4000.c#5 integrate .. //depot/projects/wifi/sys/dev/sound/pci/es137x.c#6 integrate .. //depot/projects/wifi/sys/dev/sound/pci/ich.c#6 integrate .. //depot/projects/wifi/sys/dev/sound/pci/via8233.c#5 integrate .. //depot/projects/wifi/sys/dev/sound/pci/via82c686.c#5 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/ac97.c#6 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/ac97.h#4 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/ac97_patch.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/ac97_patch.h#3 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/channel.c#6 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/dsp.c#8 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/feeder_volume.c#1 branch .. //depot/projects/wifi/sys/dev/sound/pcm/mixer.c#7 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/sndstat.c#5 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/sound.c#5 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/sound.h#6 integrate .. //depot/projects/wifi/sys/dev/sound/usb/uaudio.c#6 integrate .. //depot/projects/wifi/sys/dev/sound/usb/uaudio_pcm.c#7 integrate .. //depot/projects/wifi/sys/dev/stg/tmc18c30_pccard.c#4 integrate .. //depot/projects/wifi/sys/dev/syscons/scgfbrndr.c#4 integrate .. //depot/projects/wifi/sys/dev/syscons/scmouse.c#4 integrate .. //depot/projects/wifi/sys/dev/syscons/scvgarndr.c#3 integrate .. //depot/projects/wifi/sys/dev/syscons/scvidctl.c#4 integrate .. //depot/projects/wifi/sys/dev/syscons/syscons.c#7 integrate .. //depot/projects/wifi/sys/dev/syscons/syscons.h#5 integrate .. //depot/projects/wifi/sys/dev/tx/if_tx.c#6 integrate .. //depot/projects/wifi/sys/dev/txp/if_txp.c#9 integrate .. //depot/projects/wifi/sys/dev/txp/if_txpreg.h#4 integrate .. //depot/projects/wifi/sys/dev/uart/uart_bus_pccard.c#3 integrate .. //depot/projects/wifi/sys/dev/usb/ehci_pci.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/ehcireg.h#4 integrate .. //depot/projects/wifi/sys/dev/usb/ehcivar.h#6 integrate .. //depot/projects/wifi/sys/dev/usb/if_aue.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/if_axe.c#8 integrate .. //depot/projects/wifi/sys/dev/usb/if_cdce.c#4 integrate .. //depot/projects/wifi/sys/dev/usb/if_cdcereg.h#3 integrate .. //depot/projects/wifi/sys/dev/usb/if_cue.c#7 integrate .. //depot/projects/wifi/sys/dev/usb/if_kue.c#7 integrate .. //depot/projects/wifi/sys/dev/usb/if_rue.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/if_udav.c#8 integrate .. //depot/projects/wifi/sys/dev/usb/if_ural.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/slhci_pccard.c#2 integrate .. //depot/projects/wifi/sys/dev/usb/usb_port.h#5 integrate .. //depot/projects/wifi/sys/dev/usb/usbdevs#15 integrate .. //depot/projects/wifi/sys/dev/usb/uvscom.c#3 integrate .. //depot/projects/wifi/sys/dev/vge/if_vge.c#9 integrate .. //depot/projects/wifi/sys/dev/vx/if_vx.c#7 integrate .. //depot/projects/wifi/sys/dev/vx/if_vx_eisa.c#3 integrate .. //depot/projects/wifi/sys/dev/vx/if_vx_pci.c#5 integrate .. //depot/projects/wifi/sys/dev/vx/if_vxvar.h#4 integrate .. //depot/projects/wifi/sys/dev/watchdog/watchdog.c#2 integrate .. //depot/projects/wifi/sys/dev/wi/if_wi.c#19 integrate .. //depot/projects/wifi/sys/dev/wi/if_wi_pccard.c#7 integrate .. //depot/projects/wifi/sys/dev/wi/if_wivar.h#7 integrate .. //depot/projects/wifi/sys/dev/wl/if_wl.c#7 integrate .. //depot/projects/wifi/sys/dev/xe/if_xe_pccard.c#8 integrate .. //depot/projects/wifi/sys/dev/xe/if_xereg.h#2 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs.h#6 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_devs.c#9 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_int.h#2 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_rule.c#5 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_vfsops.c#12 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#27 integrate .. //depot/projects/wifi/sys/fs/fifofs/fifo_vnops.c#12 integrate .. //depot/projects/wifi/sys/fs/msdosfs/bootsect.h#3 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_vfsops.c#12 integrate .. //depot/projects/wifi/sys/fs/nwfs/nwfs_vfsops.c#7 integrate .. //depot/projects/wifi/sys/fs/udf/udf_vfsops.c#9 integrate .. //depot/projects/wifi/sys/geom/geom_ctl.c#5 integrate .. //depot/projects/wifi/sys/geom/geom_disk.c#6 integrate .. //depot/projects/wifi/sys/geom/geom_gpt.c#4 integrate .. //depot/projects/wifi/sys/geom/uzip/g_uzip.c#3 integrate .. //depot/projects/wifi/sys/gnu/fs/ext2fs/ext2_alloc.c#2 integrate .. //depot/projects/wifi/sys/i386/conf/MAC#1 branch .. //depot/projects/wifi/sys/i386/conf/NOTES#20 integrate .. //depot/projects/wifi/sys/i386/i386/apic_vector.s#4 integrate .. //depot/projects/wifi/sys/i386/i386/local_apic.c#10 integrate .. //depot/projects/wifi/sys/i386/i386/mp_machdep.c#13 integrate .. //depot/projects/wifi/sys/i386/i386/mptable_pci.c#2 integrate .. //depot/projects/wifi/sys/i386/i386/trap.c#7 integrate .. //depot/projects/wifi/sys/i386/i386/vm86.c#3 integrate .. //depot/projects/wifi/sys/i386/i386/vm_machdep.c#16 integrate .. //depot/projects/wifi/sys/i386/include/atomic.h#7 integrate .. //depot/projects/wifi/sys/i386/include/legacyvar.h#3 integrate .. //depot/projects/wifi/sys/i386/include/smptests.h#3 integrate .. //depot/projects/wifi/sys/i386/isa/isa.c#4 integrate .. //depot/projects/wifi/sys/i386/isa/vesa.c#4 integrate .. //depot/projects/wifi/sys/i386/pci/pci_bus.c#5 integrate .. //depot/projects/wifi/sys/ia64/conf/MAC#1 branch .. //depot/projects/wifi/sys/ia64/ia32/ia32_signal.c#3 integrate .. //depot/projects/wifi/sys/ia64/ia64/nexus.c#4 integrate .. //depot/projects/wifi/sys/ia64/ia64/unaligned.c#4 integrate .. //depot/projects/wifi/sys/ia64/include/atomic.h#3 integrate .. //depot/projects/wifi/sys/isa/pnp.c#3 integrate .. //depot/projects/wifi/sys/kern/imgact_elf.c#9 integrate .. //depot/projects/wifi/sys/kern/init_main.c#10 integrate .. //depot/projects/wifi/sys/kern/init_sysent.c#12 integrate .. //depot/projects/wifi/sys/kern/kern_acct.c#4 integrate .. //depot/projects/wifi/sys/kern/kern_acl.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_clock.c#4 integrate .. //depot/projects/wifi/sys/kern/kern_conf.c#13 integrate .. //depot/projects/wifi/sys/kern/kern_cpu.c#7 integrate .. //depot/projects/wifi/sys/kern/kern_descrip.c#17 integrate .. //depot/projects/wifi/sys/kern/kern_environment.c#8 integrate .. //depot/projects/wifi/sys/kern/kern_event.c#10 integrate .. //depot/projects/wifi/sys/kern/kern_exec.c#15 integrate .. //depot/projects/wifi/sys/kern/kern_jail.c#7 integrate .. //depot/projects/wifi/sys/kern/kern_kse.c#10 integrate .. //depot/projects/wifi/sys/kern/kern_lock.c#13 integrate .. //depot/projects/wifi/sys/kern/kern_mac.c#7 integrate .. //depot/projects/wifi/sys/kern/kern_mbuf.c#7 integrate .. //depot/projects/wifi/sys/kern/kern_poll.c#5 integrate .. //depot/projects/wifi/sys/kern/kern_proc.c#9 integrate .. //depot/projects/wifi/sys/kern/kern_prot.c#9 integrate .. //depot/projects/wifi/sys/kern/kern_resource.c#4 integrate .. //depot/projects/wifi/sys/kern/kern_shutdown.c#6 integrate .. //depot/projects/wifi/sys/kern/kern_tc.c#4 integrate .. //depot/projects/wifi/sys/kern/kern_thread.c#10 integrate .. //depot/projects/wifi/sys/kern/kern_uuid.c#3 integrate .. //depot/projects/wifi/sys/kern/sched_ule.c#16 integrate .. //depot/projects/wifi/sys/kern/subr_bus.c#17 integrate .. //depot/projects/wifi/sys/kern/subr_kdb.c#5 integrate .. //depot/projects/wifi/sys/kern/subr_pcpu.c#3 integrate .. //depot/projects/wifi/sys/kern/subr_prf.c#6 integrate .. //depot/projects/wifi/sys/kern/subr_rman.c#6 integrate .. //depot/projects/wifi/sys/kern/subr_turnstile.c#4 integrate .. //depot/projects/wifi/sys/kern/subr_witness.c#15 integrate .. //depot/projects/wifi/sys/kern/syscalls.c#12 integrate .. //depot/projects/wifi/sys/kern/syscalls.master#13 integrate .. //depot/projects/wifi/sys/kern/sysv_shm.c#8 integrate .. //depot/projects/wifi/sys/kern/uipc_socket.c#18 integrate .. //depot/projects/wifi/sys/kern/uipc_socket2.c#8 integrate .. //depot/projects/wifi/sys/kern/uipc_usrreq.c#11 integrate .. //depot/projects/wifi/sys/kern/vfs_aio.c#11 integrate .. //depot/projects/wifi/sys/kern/vfs_bio.c#15 integrate .. //depot/projects/wifi/sys/kern/vfs_export.c#7 integrate .. //depot/projects/wifi/sys/kern/vfs_lookup.c#14 integrate .. //depot/projects/wifi/sys/kern/vfs_subr.c#32 integrate .. //depot/projects/wifi/sys/kern/vfs_syscalls.c#15 integrate .. //depot/projects/wifi/sys/modules/Makefile#28 integrate .. //depot/projects/wifi/sys/modules/agp/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/ath/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/ath_rate_amrr/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/ath_rate_onoe/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/ath_rate_sample/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/aue/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/axe/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/bfe/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/bge/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/bridge/Makefile#2 delete .. //depot/projects/wifi/sys/modules/cdce/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/cue/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/dc/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/de/Makefile#4 integrate .. //depot/projects/wifi/sys/modules/dummynet/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/ed/Makefile#4 integrate .. //depot/projects/wifi/sys/modules/em/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/fxp/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/geom/geom_bsd/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/geom/geom_uzip/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/hifn/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/if_ndis/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/ipw/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/iwi/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/ixgb/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/kue/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/lge/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/lmc/Makefile#1 branch .. //depot/projects/wifi/sys/modules/mii/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/ncv/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/ndis/Makefile#6 integrate .. //depot/projects/wifi/sys/modules/nge/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/nsp/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/pccard/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/pcn/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/ral/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/re/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/rl/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/rue/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/safe/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/sf/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/sis/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/sk/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/snc/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/snp/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/sound/sound/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/ste/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/stg/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/ti/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/tl/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/tx/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/txp/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/ubsec/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/udav/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/ural/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/vge/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/vr/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/vx/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/wb/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/xl/Makefile#2 integrate .. //depot/projects/wifi/sys/net/bpf.c#16 integrate .. //depot/projects/wifi/sys/net/bridge.c#9 delete .. //depot/projects/wifi/sys/net/bridge.h#4 delete .. //depot/projects/wifi/sys/net/bridgestp.c#5 integrate .. //depot/projects/wifi/sys/net/if.c#20 integrate .. //depot/projects/wifi/sys/net/if.h#7 integrate .. //depot/projects/wifi/sys/net/if_bridge.c#7 integrate .. //depot/projects/wifi/sys/net/if_clone.c#5 integrate .. //depot/projects/wifi/sys/net/if_disc.c#5 integrate .. //depot/projects/wifi/sys/net/if_ethersubr.c#13 integrate .. //depot/projects/wifi/sys/net/if_faith.c#6 integrate .. //depot/projects/wifi/sys/net/if_fwsubr.c#8 integrate .. //depot/projects/wifi/sys/net/if_gif.c#6 integrate .. //depot/projects/wifi/sys/net/if_gre.c#6 integrate .. //depot/projects/wifi/sys/net/if_ppp.c#7 integrate .. //depot/projects/wifi/sys/net/if_sl.c#5 integrate .. //depot/projects/wifi/sys/net/if_spppsubr.c#9 integrate .. //depot/projects/wifi/sys/net/if_stf.c#5 integrate .. //depot/projects/wifi/sys/net/if_var.h#17 integrate .. //depot/projects/wifi/sys/net/if_vlan.c#9 integrate .. //depot/projects/wifi/sys/net/netisr.c#2 integrate .. //depot/projects/wifi/sys/net/route.c#6 integrate .. //depot/projects/wifi/sys/net/rtsock.c#10 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#6 integrate .. //depot/projects/wifi/sys/netgraph/ng_base.c#17 integrate .. //depot/projects/wifi/sys/netgraph/ng_ether.c#8 integrate .. //depot/projects/wifi/sys/netgraph/ng_iface.c#10 integrate .. //depot/projects/wifi/sys/netgraph/ng_pppoe.c#8 integrate .. //depot/projects/wifi/sys/netgraph/ng_tty.c#5 integrate .. //depot/projects/wifi/sys/netinet/if_ether.c#10 integrate .. //depot/projects/wifi/sys/netinet/in.c#9 integrate .. //depot/projects/wifi/sys/netinet/in.h#5 integrate .. //depot/projects/wifi/sys/netinet/in_pcb.h#5 integrate .. //depot/projects/wifi/sys/netinet/in_rmx.c#4 integrate .. //depot/projects/wifi/sys/netinet/ip_carp.c#11 integrate .. //depot/projects/wifi/sys/netinet/ip_dummynet.c#9 integrate .. //depot/projects/wifi/sys/netinet/ip_dummynet.h#6 integrate .. //depot/projects/wifi/sys/netinet/ip_fastfwd.c#9 integrate .. //depot/projects/wifi/sys/netinet/ip_fw2.c#16 integrate .. //depot/projects/wifi/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/wifi/sys/netinet/ip_output.c#11 integrate .. //depot/projects/wifi/sys/netinet/libalias/alias_db.c#3 integrate .. //depot/projects/wifi/sys/netinet/raw_ip.c#8 integrate .. //depot/projects/wifi/sys/netinet/tcp_subr.c#19 integrate .. //depot/projects/wifi/sys/netinet/udp_usrreq.c#9 integrate .. //depot/projects/wifi/sys/netinet6/esp_aesctr.c#3 integrate .. //depot/projects/wifi/sys/netinet6/in6_rmx.c#3 integrate .. //depot/projects/wifi/sys/netinet6/nd6_nbr.c#8 integrate .. //depot/projects/wifi/sys/netipsec/ipsec_mbuf.c#2 integrate .. //depot/projects/wifi/sys/netsmb/netbios.h#3 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_diskless.c#4 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_socket.c#13 integrate .. //depot/projects/wifi/sys/nfsserver/nfs_srvsock.c#4 integrate .. //depot/projects/wifi/sys/nfsserver/nfs_srvsubs.c#7 integrate .. //depot/projects/wifi/sys/pc98/cbus/sio.c#3 integrate .. //depot/projects/wifi/sys/pc98/conf/GENERIC#10 integrate .. //depot/projects/wifi/sys/pc98/conf/GENERIC.hints#5 integrate .. //depot/projects/wifi/sys/pc98/conf/MAC#1 branch .. //depot/projects/wifi/sys/pc98/conf/NOTES#14 integrate .. //depot/projects/wifi/sys/pccard/mecia.c#3 delete .. //depot/projects/wifi/sys/pccard/pccard.c#3 delete .. //depot/projects/wifi/sys/pccard/pccard_beep.c#2 delete .. //depot/projects/wifi/sys/pccard/pccard_nbk.c#5 delete .. //depot/projects/wifi/sys/pccard/pcic.c#3 delete .. //depot/projects/wifi/sys/pccard/pcic_isa.c#3 delete .. //depot/projects/wifi/sys/pccard/pcic_pci.c#3 delete .. //depot/projects/wifi/sys/pci/agp_amd64.c#5 integrate .. //depot/projects/wifi/sys/pci/agp_ati.c#1 branch .. //depot/projects/wifi/sys/pci/agp_nvidia.c#4 integrate .. //depot/projects/wifi/sys/pci/agpreg.h#2 integrate .. //depot/projects/wifi/sys/pci/if_dc.c#11 integrate .. //depot/projects/wifi/sys/pci/if_pcn.c#10 integrate .. //depot/projects/wifi/sys/pci/if_rl.c#9 integrate .. //depot/projects/wifi/sys/pci/if_rlreg.h#6 integrate .. //depot/projects/wifi/sys/pci/if_sf.c#10 integrate .. //depot/projects/wifi/sys/pci/if_sis.c#9 integrate .. //depot/projects/wifi/sys/pci/if_sisreg.h#4 integrate .. //depot/projects/wifi/sys/pci/if_sk.c#17 integrate .. //depot/projects/wifi/sys/pci/if_ste.c#8 integrate .. //depot/projects/wifi/sys/pci/if_ti.c#11 integrate .. //depot/projects/wifi/sys/pci/if_tireg.h#5 integrate .. //depot/projects/wifi/sys/pci/if_tl.c#8 integrate .. //depot/projects/wifi/sys/pci/if_vr.c#8 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 31 04:56:13 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F4D316A421; Mon, 31 Oct 2005 04:56:12 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 63CCB16A41F for ; Mon, 31 Oct 2005 04:56:12 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C04643D45 for ; Mon, 31 Oct 2005 04:56:12 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9V4uBpn009278 for ; Mon, 31 Oct 2005 04:56:11 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9V4uBGc009275 for perforce@freebsd.org; Mon, 31 Oct 2005 04:56:11 GMT (envelope-from sam@freebsd.org) Date: Mon, 31 Oct 2005 04:56:11 GMT Message-Id: <200510310456.j9V4uBGc009275@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 86097 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, 31 Oct 2005 04:56:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=86097 Change 86097 by sam@sam_ebb on 2005/10/31 04:56:04 plug mbuf leak when sending frags Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#109 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#109 (text+ko) ==== @@ -1593,6 +1593,7 @@ DPRINTF(sc, ATH_DEBUG_XMIT, "%s: out of txfrag buffers\n", __func__); ic->ic_stats.is_tx_nobuf++; /* XXX */ + ath_freetx(m); goto bad; } } else { From owner-p4-projects@FreeBSD.ORG Mon Oct 31 19:04:03 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C01116A423; Mon, 31 Oct 2005 19:04:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E93B316A420 for ; Mon, 31 Oct 2005 19:04:02 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C8E6543D5D for ; Mon, 31 Oct 2005 19:04:01 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9VJ41ED073461 for ; Mon, 31 Oct 2005 19:04:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9VJ41Tw073458 for perforce@freebsd.org; Mon, 31 Oct 2005 19:04:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 31 Oct 2005 19:04:01 GMT Message-Id: <200510311904.j9VJ41Tw073458@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 86119 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, 31 Oct 2005 19:04:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=86119 Change 86119 by rwatson@rwatson_zoo on 2005/10/31 19:03:08 Temporarily restore more complex argument logic for pru_sosend() in the sosend_dgram() case while debugging. Affected files ... .. //depot/projects/netsmp/src/sys/kern/uipc_socket.c#20 edit Differences ... ==== //depot/projects/netsmp/src/sys/kern/uipc_socket.c#20 (text+ko) ==== @@ -822,8 +822,10 @@ ((flags & MSG_EOF) && (so->so_proto->pr_flags & PR_IMPLOPCL) && (resid <= 0)) ? - PRUS_EOF : 0, - top, addr, control, td); + PRUS_EOF : + /* If there is more to send set PRUS_MORETOCOME */ + (resid > 0 && space > 0) ? PRUS_MORETOCOME : 0, + top, addr, control, td); if (dontroute) { SOCK_LOCK(so); so->so_options &= ~SO_DONTROUTE; From owner-p4-projects@FreeBSD.ORG Mon Oct 31 19:19:23 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66B7716A421; Mon, 31 Oct 2005 19:19:22 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 39DD416A41F for ; Mon, 31 Oct 2005 19:19:22 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DAEDA43D49 for ; Mon, 31 Oct 2005 19:19:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9VJJKAl074028 for ; Mon, 31 Oct 2005 19:19:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9VJJKKs074025 for perforce@freebsd.org; Mon, 31 Oct 2005 19:19:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 31 Oct 2005 19:19:20 GMT Message-Id: <200510311919.j9VJJKKs074025@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 86120 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, 31 Oct 2005 19:19:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=86120 Change 86120 by rwatson@rwatson_zoo on 2005/10/31 19:18:39 Integrate netsmp branch. Primarily memory type renaming. Affected files ... .. //depot/projects/netsmp/src/sys/alpha/alpha/pmap.c#4 integrate .. //depot/projects/netsmp/src/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/netsmp/src/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/netsmp/src/sys/coda/coda_vfsops.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/aac/aac.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/acpica/acpi_pci_link.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-all.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-raid.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ata/atapi-cd.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/md/md.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/ofw/ofw_disk.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/twa/tw_osl_freebsd.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/netsmp/src/sys/fs/msdosfs/msdosfs_denode.c#3 integrate .. //depot/projects/netsmp/src/sys/fs/msdosfs/msdosfs_fileno.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/netsmp/src/sys/fs/ntfs/ntfs_ihash.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/ntfs/ntfs_subr.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/ntfs/ntfs_vfsops.c#4 integrate .. //depot/projects/netsmp/src/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/nullfs/null_vfsops.c#3 integrate .. //depot/projects/netsmp/src/sys/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/nwfs/nwfs_subr.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/smbfs/smbfs_subr.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/smbfs/smbfs_vfsops.c#3 integrate .. //depot/projects/netsmp/src/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/netsmp/src/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/umapfs/umap_vfsops.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/gate/g_gate.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/raid3/g_raid3.c#4 integrate .. //depot/projects/netsmp/src/sys/geom/shsec/g_shsec.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/stripe/g_stripe.c#3 integrate .. //depot/projects/netsmp/src/sys/geom/uzip/g_uzip.c#3 integrate .. //depot/projects/netsmp/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/netsmp/src/sys/gnu/fs/reiserfs/reiserfs_namei.c#3 integrate .. //depot/projects/netsmp/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/netsmp/src/sys/i386/acpica/madt.c#3 integrate .. //depot/projects/netsmp/src/sys/i386/i386/io_apic.c#3 integrate .. //depot/projects/netsmp/src/sys/i386/i386/mptable.c#2 integrate .. //depot/projects/netsmp/src/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/sscdisk.c#2 integrate .. //depot/projects/netsmp/src/sys/isofs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/netsmp/src/sys/kern/inflate.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/netsmp/src/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_cluster.c#4 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_export.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_hash.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_subr.c#12 integrate .. //depot/projects/netsmp/src/sys/libkern/iconv.c#4 integrate .. //depot/projects/netsmp/src/sys/netatm/ipatm/ipatm_if.c#3 integrate .. //depot/projects/netsmp/src/sys/netgraph/atm/uni/ng_uni.c#3 integrate .. //depot/projects/netsmp/src/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/netsmp/src/sys/netinet/ip_encap.c#2 integrate .. //depot/projects/netsmp/src/sys/netkey/keydb.c#2 integrate .. //depot/projects/netsmp/src/sys/netncp/ncp_conn.c#2 integrate .. //depot/projects/netsmp/src/sys/netsmb/smb_conn.c#2 integrate .. //depot/projects/netsmp/src/sys/nfs4client/nfs4_dev.c#2 integrate .. //depot/projects/netsmp/src/sys/nfsclient/nfs_lock.c#3 integrate .. //depot/projects/netsmp/src/sys/nfsclient/nfs_nfsiod.c#2 integrate .. //depot/projects/netsmp/src/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/netsmp/src/sys/nfsserver/nfs_syscalls.c#2 integrate .. //depot/projects/netsmp/src/sys/pci/viapm.c#2 integrate .. //depot/projects/netsmp/src/sys/powerpc/powerpc/locore.S#2 integrate .. //depot/projects/netsmp/src/sys/powerpc/powerpc/ofw_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/netsmp/src/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/netsmp/src/sys/ufs/ufs/ufs_dirhash.c#3 integrate .. //depot/projects/netsmp/src/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/netsmp/src/sys/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/netsmp/src/sys/vm/vm_pager.c#3 integrate Differences ... ==== //depot/projects/netsmp/src/sys/alpha/alpha/pmap.c#4 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.180 2005/10/21 19:42:42 ade Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.181 2005/10/31 16:14:07 alc Exp $"); #include #include @@ -2172,13 +2172,6 @@ continue; } -#if defined(PMAP_DIAGNOSTIC) - if (!pv->pv_pmap) { - printf("Null pmap (cb) at va: 0x%lx\n", pv->pv_va); - continue; - } -#endif - PMAP_LOCK(pv->pv_pmap); pte = pmap_lev3pte(pv->pv_pmap, pv->pv_va); ==== //depot/projects/netsmp/src/sys/amd64/acpica/madt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.17 2005/09/11 18:39:00 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.18 2005/10/31 15:41:17 rwatson Exp $"); #include #include @@ -74,7 +74,7 @@ static vm_paddr_t madt_physaddr; static vm_offset_t madt_length; -MALLOC_DEFINE(M_MADT, "MADT Table", "ACPI MADT Table Items"); +MALLOC_DEFINE(M_MADT, "madt_table", "ACPI MADT Table Items"); static enum intr_polarity interrupt_polarity(UINT16 Polarity, UINT8 Source); static enum intr_trigger interrupt_trigger(UINT16 TriggerMode, UINT8 Source); ==== //depot/projects/netsmp/src/sys/amd64/amd64/io_apic.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.16 2005/10/26 22:32:30 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.17 2005/10/31 15:41:17 rwatson Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -65,7 +65,7 @@ #define TODO printf("%s: not implemented!\n", __func__) -static MALLOC_DEFINE(M_IOAPIC, "I/O APIC", "I/O APIC structures"); +static MALLOC_DEFINE(M_IOAPIC, "ioapic", "I/O APIC structures"); /* * New interrupt support code.. ==== //depot/projects/netsmp/src/sys/amd64/amd64/mptable.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.236 2005/04/15 18:44:53 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.237 2005/10/31 15:41:17 rwatson Exp $"); #include #include @@ -141,7 +141,7 @@ static int mptable_nioapics, mptable_nbusses, mptable_maxbusid; static int pci0 = -1; -static MALLOC_DEFINE(M_MPTABLE, "MP Table", "MP Table Items"); +static MALLOC_DEFINE(M_MPTABLE, "mptable", "MP Table Items"); static enum intr_polarity conforming_polarity(u_char src_bus, u_char src_bus_irq); ==== //depot/projects/netsmp/src/sys/amd64/amd64/pmap.c#8 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.529 2005/10/21 19:42:42 ade Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.530 2005/10/30 20:47:42 alc Exp $"); /* * Manages physical address maps. @@ -597,28 +597,8 @@ * Low level helper routines..... ***************************************************/ -#if defined(PMAP_DIAGNOSTIC) /* - * This code checks for non-writeable/modified pages. - * This should be an invalid condition. - */ -static int -pmap_nw_modified(pt_entry_t ptea) -{ - int pte; - - pte = (int) ptea; - - if ((pte & (PG_M|PG_RW)) == PG_M) - return 1; - else - return 0; -} -#endif - - -/* * this routine defines the region(s) of memory that should * not be tested for the modified bit. */ @@ -1543,13 +1523,9 @@ if (oldpte & PG_MANAGED) { m = PHYS_TO_VM_PAGE(oldpte & PG_FRAME); if (oldpte & PG_M) { -#if defined(PMAP_DIAGNOSTIC) - if (pmap_nw_modified((pt_entry_t) oldpte)) { - printf( - "pmap_remove: modified page not writable: va: 0x%lx, pte: 0x%lx\n", - va, oldpte); - } -#endif + KASSERT((oldpte & PG_RW), + ("pmap_remove_pte: modified page not writable: va: 0x%lx, pte: 0x%lx", + va, oldpte)); if (pmap_track_modified(va)) vm_page_dirty(m); } @@ -1728,13 +1704,9 @@ * Update the vm_page_t clean and reference bits. */ if (tpte & PG_M) { -#if defined(PMAP_DIAGNOSTIC) - if (pmap_nw_modified((pt_entry_t) tpte)) { - printf( - "pmap_remove_all: modified page not writable: va: 0x%lx, pte: 0x%lx\n", - pv->pv_va, tpte); - } -#endif + KASSERT((tpte & PG_RW), + ("pmap_remove_all: modified page not writable: va: 0x%lx, pte: 0x%lx", + pv->pv_va, tpte)); if (pmap_track_modified(pv->pv_va)) vm_page_dirty(m); } @@ -2021,8 +1993,8 @@ } if (origpte & PG_M) { KASSERT((origpte & PG_RW), - ("pmap_enter: modified page not writable:" - " va: 0x%lx, pte: 0x%lx", va, origpte)); + ("pmap_enter: modified page not writable: va: 0x%lx, pte: 0x%lx", + va, origpte)); if ((origpte & PG_MANAGED) && pmap_track_modified(va)) vm_page_dirty(om); ==== //depot/projects/netsmp/src/sys/arm/arm/vm_machdep.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.18 2005/10/03 14:16:41 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.19 2005/10/31 15:41:17 rwatson Exp $"); #include #include @@ -378,7 +378,7 @@ struct mtx smallalloc_mtx; -MALLOC_DEFINE(M_VMSMALLALLOC, "VM Small alloc", "VM Small alloc data"); +MALLOC_DEFINE(M_VMSMALLALLOC, "vm_small_alloc", "VM Small alloc data"); vm_offset_t alloc_curaddr; vm_offset_t alloc_firstaddr; ==== //depot/projects/netsmp/src/sys/coda/coda_vfsops.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_vfsops.c,v 1.59 2005/03/24 07:39:03 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_vfsops.c,v 1.60 2005/10/31 15:41:17 rwatson Exp $"); #include #include @@ -60,7 +60,7 @@ #include #include -MALLOC_DEFINE(M_CODA, "CODA storage", "Various Coda Structures"); +MALLOC_DEFINE(M_CODA, "coda", "Various Coda Structures"); int codadebug = 0; int coda_vfsop_print_entry = 0; ==== //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.1.1.1 2005/04/25 18:15:15 darrenr Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.2 2005/10/31 15:41:17 rwatson Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -112,7 +112,7 @@ #endif # ifdef IPFILTER_M_IPFILTER -MALLOC_DEFINE(M_IPFILTER, "IP Filter", "IP Filter packet filter data structures"); +MALLOC_DEFINE(M_IPFILTER, "ipfilter", "IP Filter packet filter data structures"); # endif ==== //depot/projects/netsmp/src/sys/dev/aac/aac.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.114 2005/10/14 16:22:45 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.115 2005/10/31 00:12:19 csjp Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -3428,6 +3428,7 @@ device_t child; int i, found, error; + mtx_lock(&sc->aac_io_lock); aac_alloc_sync_fib(sc, &fib); c_cmd = (struct aac_ctcfg *)&fib->data[0]; bzero(c_cmd, sizeof(struct aac_ctcfg)); @@ -3442,6 +3443,7 @@ device_printf(sc->aac_dev, "Error %d sending " "VM_ContainerConfig command\n", error); aac_release_sync_fib(sc); + mtx_unlock(&sc->aac_io_lock); return; } @@ -3450,6 +3452,7 @@ device_printf(sc->aac_dev, "VM_ContainerConfig returned 0x%x\n", c_resp->Status); aac_release_sync_fib(sc); + mtx_unlock(&sc->aac_io_lock); return; } @@ -3470,6 +3473,7 @@ device_printf(sc->aac_dev, "Error %d sending VMIoctl command\n", error); aac_release_sync_fib(sc); + mtx_unlock(&sc->aac_io_lock); return; } @@ -3478,11 +3482,13 @@ device_printf(sc->aac_dev, "VM_Ioctl returned %d\n", vmi_resp->Status); aac_release_sync_fib(sc); + mtx_unlock(&sc->aac_io_lock); return; } bcopy(&vmi_resp->BusInf, &businfo, sizeof(struct aac_getbusinf)); aac_release_sync_fib(sc); + mtx_unlock(&sc->aac_io_lock); found = 0; for (i = 0; i < businfo.BusCount; i++) { ==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_pci_link.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.46 2005/09/11 18:39:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.47 2005/10/31 15:41:18 rwatson Exp $"); #include "opt_acpi.h" #include @@ -119,7 +119,7 @@ int link_index; }; -MALLOC_DEFINE(M_PCI_LINK, "PCI Link", "ACPI PCI Link structures"); +MALLOC_DEFINE(M_PCI_LINK, "pci_link", "ACPI PCI Link structures"); static int pci_link_interrupt_weights[NUM_ACPI_INTERRUPTS]; static int pci_link_bios_isa_irqs; ==== //depot/projects/netsmp/src/sys/dev/ata/ata-all.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.258 2005/10/27 16:32:39 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.259 2005/10/31 15:41:18 rwatson Exp $"); #include "opt_ata.h" #include @@ -73,7 +73,7 @@ static void bpack(int8_t *, int8_t *, int); /* global vars */ -MALLOC_DEFINE(M_ATA, "ATA generic", "ATA driver generic layer"); +MALLOC_DEFINE(M_ATA, "ata_generic", "ATA driver generic layer"); int (*ata_raid_ioctl_func)(u_long cmd, caddr_t data) = NULL; devclass_t ata_devclass; uma_zone_t ata_request_zone; ==== //depot/projects/netsmp/src/sys/dev/ata/ata-disk.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.190 2005/08/17 15:00:33 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.191 2005/10/31 15:41:18 rwatson Exp $"); #include "opt_ata.h" #include @@ -65,7 +65,7 @@ static dumper_t ad_dump; /* local vars */ -static MALLOC_DEFINE(M_AD, "AD driver", "ATA disk driver"); +static MALLOC_DEFINE(M_AD, "ad_driver", "ATA disk driver"); static int ad_probe(device_t dev) ==== //depot/projects/netsmp/src/sys/dev/ata/ata-dma.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.138 2005/10/06 15:44:07 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.139 2005/10/31 15:41:18 rwatson Exp $"); #include #include @@ -54,7 +54,7 @@ static int ata_dmaunload(device_t); /* local vars */ -static MALLOC_DEFINE(M_ATADMA, "ATA DMA", "ATA driver DMA"); +static MALLOC_DEFINE(M_ATADMA, "ata_dma", "ATA driver DMA"); /* misc defines */ #define MAXTABSZ PAGE_SIZE ==== //depot/projects/netsmp/src/sys/dev/ata/ata-pci.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.106 2005/10/12 20:00:26 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.107 2005/10/31 15:41:18 rwatson Exp $"); #include "opt_ata.h" #include @@ -54,7 +54,7 @@ #include /* local vars */ -static MALLOC_DEFINE(M_ATAPCI, "ATA PCI", "ATA driver PCI"); +static MALLOC_DEFINE(M_ATAPCI, "ata_pci", "ATA driver PCI"); /* misc defines */ #define IOMASK 0xfffffffc ==== //depot/projects/netsmp/src/sys/dev/ata/ata-raid.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.102 2005/10/13 08:05:21 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.103 2005/10/31 15:41:18 rwatson Exp $"); #include "opt_ata.h" #include @@ -101,7 +101,7 @@ /* internal vars */ static struct ar_softc *ata_raid_arrays[MAX_ARRAYS]; -static MALLOC_DEFINE(M_AR, "AR driver", "ATA PseudoRAID driver"); +static MALLOC_DEFINE(M_AR, "ar_driver", "ATA PseudoRAID driver"); static devclass_t ata_raid_sub_devclass; static int testing = 0; ==== //depot/projects/netsmp/src/sys/dev/ata/atapi-cam.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.42 2005/05/16 13:07:27 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.43 2005/10/31 15:41:18 rwatson Exp $"); #include #include @@ -115,7 +115,7 @@ static void free_hcb(struct atapi_hcb *hcb); static void free_softc(struct atapi_xpt_softc *scp); -static MALLOC_DEFINE(M_ATACAM, "ATA CAM transport", "ATA driver CAM-XPT layer"); +static MALLOC_DEFINE(M_ATACAM, "ata_cam", "ATA driver CAM-XPT layer"); static device_method_t atapi_cam_methods[] = { DEVMETHOD(device_identify, atapi_cam_identify), ==== //depot/projects/netsmp/src/sys/dev/ata/atapi-cd.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.183 2005/10/28 21:41:42 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.184 2005/10/31 15:41:18 rwatson Exp $"); #include "opt_ata.h" #include @@ -94,7 +94,7 @@ static int acd_test_ready(device_t); /* internal vars */ -static MALLOC_DEFINE(M_ACD, "ACD driver", "ATAPI CD driver buffers"); +static MALLOC_DEFINE(M_ACD, "acd_driver", "ATAPI CD driver buffers"); static struct g_class acd_class = { .name = "ACD", .version = G_VERSION, ==== //depot/projects/netsmp/src/sys/dev/ata/atapi-fd.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.102 2005/05/16 13:07:27 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.103 2005/10/31 15:41:18 rwatson Exp $"); #include #include @@ -61,7 +61,7 @@ static int afd_test_ready(device_t); /* internal vars */ -static MALLOC_DEFINE(M_AFD, "AFD driver", "ATAPI floppy driver buffers"); +static MALLOC_DEFINE(M_AFD, "afd_driver", "ATAPI floppy driver buffers"); static int afd_probe(device_t dev) ==== //depot/projects/netsmp/src/sys/dev/ata/atapi-tape.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.99 2005/05/16 13:07:27 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.100 2005/10/31 15:41:18 rwatson Exp $"); #include "opt_ata.h" #include @@ -85,7 +85,7 @@ /* internal vars */ static u_int64_t ast_total = 0; -static MALLOC_DEFINE(M_AST, "AST driver", "ATAPI tape driver buffers"); +static MALLOC_DEFINE(M_AST, "ast_driver", "ATAPI tape driver buffers"); static int ast_probe(device_t dev) ==== //depot/projects/netsmp/src/sys/dev/md/md.c#6 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/md/md.c,v 1.158 2005/10/06 19:47:04 phk Exp $ + * $FreeBSD: src/sys/dev/md/md.c,v 1.159 2005/10/31 15:41:19 rwatson Exp $ * */ @@ -94,8 +94,8 @@ #define MD_NSECT (10000 * 2) #endif -static MALLOC_DEFINE(M_MD, "MD disk", "Memory Disk"); -static MALLOC_DEFINE(M_MDSECT, "MD sectors", "Memory Disk Sectors"); +static MALLOC_DEFINE(M_MD, "md_disk", "Memory Disk"); +static MALLOC_DEFINE(M_MDSECT, "md_sectors", "Memory Disk Sectors"); static int md_debug; SYSCTL_INT(_debug, OID_AUTO, mddebug, CTLFLAG_RW, &md_debug, 0, ""); ==== //depot/projects/netsmp/src/sys/dev/ofw/ofw_disk.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_disk.c,v 1.17 2005/01/06 01:43:00 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_disk.c,v 1.18 2005/10/31 03:09:38 grehan Exp $"); #include #include @@ -82,6 +82,7 @@ u_int r; r = OF_seek(sc->ofwd_instance, bp->bio_offset); + switch (bp->bio_cmd) { case BIO_READ: r = OF_read(sc->ofwd_instance, (void *)bp->bio_data, @@ -164,7 +165,7 @@ bioq_init(&sc->ofwd_bio_queue); mtx_init(&sc->ofwd_queue_mtx, "ofwd bio queue", NULL, MTX_DEF); sc->ofwd_instance = ifd; - sc->ofwd_mediasize = (off_t)2*33554432 * OFWD_BLOCKSIZE; + sc->ofwd_mediasize = (off_t)2*33554432; sc->ofwd_sectorsize = OFWD_BLOCKSIZE; sc->ofwd_fwsectors = 0; sc->ofwd_fwheads = 0; ==== //depot/projects/netsmp/src/sys/dev/tdfx/tdfx_pci.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/tdfx/tdfx_pci.c,v 1.37 2005/03/01 07:50:10 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/tdfx/tdfx_pci.c,v 1.38 2005/10/31 15:41:19 rwatson Exp $"); /* 3dfx driver for FreeBSD 4.x - Finished 11 May 2000, 12:25AM ET * @@ -96,7 +96,7 @@ { 0, 0 } }; -MALLOC_DEFINE(M_TDFX,"TDFX Driver","3DFX Graphics[/2D]/3D Accelerator(s)"); +MALLOC_DEFINE(M_TDFX,"tdfx_driver","3DFX Graphics[/2D]/3D Accelerator(s)"); #ifdef TDFX_LINUX MODULE_DEPEND(tdfx, linux, 1, 1, 1); ==== //depot/projects/netsmp/src/sys/dev/twa/tw_osl_freebsd.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twa/tw_osl_freebsd.c,v 1.2 2005/09/11 00:52:05 obrien Exp $ + * $FreeBSD: src/sys/dev/twa/tw_osl_freebsd.c,v 1.3 2005/10/31 15:41:19 rwatson Exp $ */ /* @@ -52,7 +52,7 @@ TW_INT32 TW_OSL_DEBUG_LEVEL_FOR_CL = TW_OSL_DEBUG; #endif /* TW_OSL_DEBUG */ -MALLOC_DEFINE(TW_OSLI_MALLOC_CLASS, "twa commands", "twa commands"); +MALLOC_DEFINE(TW_OSLI_MALLOC_CLASS, "twa_commands", "twa commands"); static d_open_t twa_open; ==== //depot/projects/netsmp/src/sys/dev/twe/twe_freebsd.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twe/twe_freebsd.c,v 1.42 2005/03/06 20:57:54 scottl Exp $ + * $FreeBSD: src/sys/dev/twe/twe_freebsd.c,v 1.43 2005/10/31 15:41:19 rwatson Exp $ */ /* @@ -866,7 +866,7 @@ /******************************************************************************** * Allocate a command buffer */ -MALLOC_DEFINE(TWE_MALLOC_CLASS, "twe commands", "twe commands"); +MALLOC_DEFINE(TWE_MALLOC_CLASS, "twe_commands", "twe commands"); struct twe_request * twe_allocate_request(struct twe_softc *sc, int tag) ==== //depot/projects/netsmp/src/sys/fs/fdescfs/fdesc_vfsops.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)fdesc_vfsops.c 8.4 (Berkeley) 1/21/94 * - * $FreeBSD: src/sys/fs/fdescfs/fdesc_vfsops.c,v 1.53 2005/03/24 07:36:13 jeff Exp $ + * $FreeBSD: src/sys/fs/fdescfs/fdesc_vfsops.c,v 1.54 2005/10/31 15:41:19 rwatson Exp $ */ /* @@ -52,7 +52,7 @@ #include -static MALLOC_DEFINE(M_FDESCMNT, "FDESC mount", "FDESC mount structure"); +static MALLOC_DEFINE(M_FDESCMNT, "fdesc_mount", "FDESC mount structure"); static vfs_mount_t fdesc_mount; static vfs_unmount_t fdesc_unmount; ==== //depot/projects/netsmp/src/sys/fs/hpfs/hpfs_vfsops.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/fs/hpfs/hpfs_vfsops.c,v 1.56 2005/09/03 20:23:40 ssouhlal Exp $ + * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.57 2005/10/31 15:41:20 rwatson Exp $ */ @@ -53,8 +53,8 @@ #include #include -MALLOC_DEFINE(M_HPFSMNT, "HPFS mount", "HPFS mount structure"); -MALLOC_DEFINE(M_HPFSNO, "HPFS node", "HPFS node structure"); +MALLOC_DEFINE(M_HPFSMNT, "hpfs_mount", "HPFS mount structure"); +MALLOC_DEFINE(M_HPFSNO, "hpfs_node", "HPFS node structure"); struct sockaddr; ==== //depot/projects/netsmp/src/sys/fs/msdosfs/msdosfs_denode.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_denode.c,v 1.89 2005/09/07 10:32:58 obrien Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_denode.c,v 1.90 2005/10/31 15:41:20 rwatson Exp $ */ /* $NetBSD: msdosfs_denode.c,v 1.28 1998/02/10 14:10:00 mrg Exp $ */ /*- @@ -67,7 +67,7 @@ #include #include -static MALLOC_DEFINE(M_MSDOSFSNODE, "MSDOSFS node", "MSDOSFS vnode private part"); +static MALLOC_DEFINE(M_MSDOSFSNODE, "msdosfs_node", "MSDOSFS vnode private part"); static int de_vncmpf(struct vnode *vp, void *arg) ==== //depot/projects/netsmp/src/sys/fs/msdosfs/msdosfs_fileno.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/msdosfs/msdosfs_fileno.c,v 1.1 2004/07/03 13:22:38 tjr Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/msdosfs/msdosfs_fileno.c,v 1.2 2005/10/31 15:41:20 rwatson Exp $"); #include #include @@ -59,7 +59,7 @@ #include #include -static MALLOC_DEFINE(M_MSDOSFSFILENO, "MSDOSFS fileno", "MSDOSFS fileno mapping node"); +static MALLOC_DEFINE(M_MSDOSFSFILENO, "msdosfs_fileno", "MSDOSFS fileno mapping node"); static struct mtx fileno_mtx; MTX_SYSINIT(fileno, &fileno_mtx, "MSDOSFS fileno", MTX_DEF); ==== //depot/projects/netsmp/src/sys/fs/msdosfs/msdosfs_vfsops.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.146 2005/09/29 14:09:46 peadar Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.147 2005/10/31 15:41:20 rwatson Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -99,8 +99,8 @@ #define MSDOSFS_NOCHECKSIG #endif -MALLOC_DEFINE(M_MSDOSFSMNT, "MSDOSFS mount", "MSDOSFS mount structure"); -static MALLOC_DEFINE(M_MSDOSFSFAT, "MSDOSFS FAT", "MSDOSFS file allocation table"); +MALLOC_DEFINE(M_MSDOSFSMNT, "msdosfs_mount", "MSDOSFS mount structure"); +static MALLOC_DEFINE(M_MSDOSFSFAT, "msdosfs_fat", "MSDOSFS file allocation table"); struct iconv_functions *msdosfs_iconv = NULL; ==== //depot/projects/netsmp/src/sys/fs/ntfs/ntfs_ihash.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * @(#)ufs_ihash.c 8.7 (Berkeley) 5/17/95 - * $FreeBSD: src/sys/fs/ntfs/ntfs_ihash.c,v 1.21 2005/01/06 18:10:39 imp Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs_ihash.c,v 1.22 2005/10/31 15:41:20 rwatson Exp $ */ #include @@ -45,7 +45,7 @@ #include #include -MALLOC_DEFINE(M_NTFSNTHASH, "NTFS nthash", "NTFS ntnode hash tables"); +MALLOC_DEFINE(M_NTFSNTHASH, "ntfs_nthash", "NTFS ntnode hash tables"); /* * Structures associated with inode cacheing. ==== //depot/projects/netsmp/src/sys/fs/ntfs/ntfs_subr.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ntfs/ntfs_subr.c,v 1.38 2005/05/06 00:15:57 robert Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs_subr.c,v 1.39 2005/10/31 15:41:20 rwatson Exp $ */ #include @@ -51,10 +51,10 @@ #include #include -MALLOC_DEFINE(M_NTFSNTVATTR, "NTFS vattr", "NTFS file attribute information"); -MALLOC_DEFINE(M_NTFSRDATA, "NTFS res data", "NTFS resident data"); -MALLOC_DEFINE(M_NTFSRUN, "NTFS vrun", "NTFS vrun storage"); -MALLOC_DEFINE(M_NTFSDECOMP, "NTFS decomp", "NTFS decompression temporary"); +MALLOC_DEFINE(M_NTFSNTVATTR, "ntfs_vattr", "NTFS file attribute information"); +MALLOC_DEFINE(M_NTFSRDATA, "ntfsd_resdata", "NTFS resident data"); +MALLOC_DEFINE(M_NTFSRUN, "ntfs_vrun", "NTFS vrun storage"); +MALLOC_DEFINE(M_NTFSDECOMP, "ntfs_decomp", "NTFS decompression temporary"); static int ntfs_ntlookupattr(struct ntfsmount *, const char *, int, int *, char **); static int ntfs_findvattr(struct ntfsmount *, struct ntnode *, struct ntvattr **, struct ntvattr **, u_int32_t, const char *, size_t, cn_t); ==== //depot/projects/netsmp/src/sys/fs/ntfs/ntfs_vfsops.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.81 2005/09/11 16:02:14 rodrigc Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.82 2005/10/31 15:41:20 rwatson Exp $ */ @@ -60,10 +60,10 @@ #include #include -static MALLOC_DEFINE(M_NTFSMNT, "NTFS mount", "NTFS mount structure"); -MALLOC_DEFINE(M_NTFSNTNODE,"NTFS ntnode", "NTFS ntnode information"); -MALLOC_DEFINE(M_NTFSFNODE,"NTFS fnode", "NTFS fnode information"); -MALLOC_DEFINE(M_NTFSDIR,"NTFS dir", "NTFS dir buffer"); +static MALLOC_DEFINE(M_NTFSMNT, "ntfs_mount", "NTFS mount structure"); +MALLOC_DEFINE(M_NTFSNTNODE,"ntfs_ntnode", "NTFS ntnode information"); +MALLOC_DEFINE(M_NTFSFNODE,"ntfs_fnode", "NTFS fnode information"); +MALLOC_DEFINE(M_NTFSDIR,"ntfs_dir", "NTFS dir buffer"); struct sockaddr; ==== //depot/projects/netsmp/src/sys/fs/nullfs/null_subr.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)null_subr.c 8.7 (Berkeley) 5/14/95 * - * $FreeBSD: src/sys/fs/nullfs/null_subr.c,v 1.48 2005/04/11 11:17:20 jeff Exp $ + * $FreeBSD: src/sys/fs/nullfs/null_subr.c,v 1.49 2005/10/31 15:41:20 rwatson Exp $ */ #include @@ -64,8 +64,8 @@ static u_long null_node_hash; struct mtx null_hashmtx; -static MALLOC_DEFINE(M_NULLFSHASH, "NULLFS hash", "NULLFS hash table"); -MALLOC_DEFINE(M_NULLFSNODE, "NULLFS node", "NULLFS vnode private part"); +static MALLOC_DEFINE(M_NULLFSHASH, "nullfs_hash", "NULLFS hash table"); +MALLOC_DEFINE(M_NULLFSNODE, "nullfs_node", "NULLFS vnode private part"); static struct vnode * null_hashget(struct mount *, struct vnode *); static struct vnode * null_hashins(struct mount *, struct null_node *); ==== //depot/projects/netsmp/src/sys/fs/nullfs/null_vfsops.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ * @(#)null_vfsops.c 8.2 (Berkeley) 1/21/94 * * @(#)lofs_vfsops.c 1.2 (Berkeley) 6/18/92 - * $FreeBSD: src/sys/fs/nullfs/null_vfsops.c,v 1.73 2005/10/16 21:45:25 kris Exp $ + * $FreeBSD: src/sys/fs/nullfs/null_vfsops.c,v 1.74 2005/10/31 15:41:20 rwatson Exp $ */ /* @@ -53,7 +53,7 @@ #include -static MALLOC_DEFINE(M_NULLFSMNT, "NULLFS mount", "NULLFS mount structure"); +static MALLOC_DEFINE(M_NULLFSMNT, "nullfs_mount", "NULLFS mount structure"); static vfs_fhtovp_t nullfs_fhtovp; static vfs_checkexp_t nullfs_checkexp; ==== //depot/projects/netsmp/src/sys/fs/nwfs/nwfs_node.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/nwfs/nwfs_node.c,v 1.36 2005/03/13 12:18:24 jeff Exp $ + * $FreeBSD: src/sys/fs/nwfs/nwfs_node.c,v 1.37 2005/10/31 15:41:20 rwatson Exp $ */ #include #include @@ -64,8 +64,8 @@ static u_long nwnodehash; static struct lock nwhashlock; -static MALLOC_DEFINE(M_NWNODE, "NWFS node", "NWFS vnode private part"); -static MALLOC_DEFINE(M_NWFSHASH, "NWFS hash", "NWFS has table"); +static MALLOC_DEFINE(M_NWNODE, "nwfs_node", "NWFS vnode private part"); +static MALLOC_DEFINE(M_NWFSHASH, "nwfs_hash", "NWFS has table"); static int nwfs_sysctl_vnprint(SYSCTL_HANDLER_ARGS); ==== //depot/projects/netsmp/src/sys/fs/nwfs/nwfs_subr.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/nwfs/nwfs_subr.c,v 1.13 2005/05/11 19:08:38 kan Exp $ + * $FreeBSD: src/sys/fs/nwfs/nwfs_subr.c,v 1.14 2005/10/31 15:41:20 rwatson Exp $ */ #include #include @@ -52,7 +52,7 @@ #define NCP_INFOSZ (sizeof(struct nw_entry_info) - 257) -MALLOC_DEFINE(M_NWFSDATA, "NWFS data", "NWFS private data"); +MALLOC_DEFINE(M_NWFSDATA, "nwfs_data", "NWFS private data"); static int ncp_extract_file_info(struct nwmount *nmp, struct ncp_rq *rqp, ==== //depot/projects/netsmp/src/sys/fs/portalfs/portal_vfsops.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)portal_vfsops.c 8.11 (Berkeley) 5/14/95 * - * $FreeBSD: src/sys/fs/portalfs/portal_vfsops.c,v 1.57 2005/03/24 07:36:14 jeff Exp $ + * $FreeBSD: src/sys/fs/portalfs/portal_vfsops.c,v 1.58 2005/10/31 15:41:21 rwatson Exp $ */ /* @@ -56,7 +56,7 @@ #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 31 21:30:13 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D01316A421; Mon, 31 Oct 2005 21:30:12 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A98116A41F for ; Mon, 31 Oct 2005 21:30:12 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9473A43D48 for ; Mon, 31 Oct 2005 21:30:11 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9VLUBJL087322 for ; Mon, 31 Oct 2005 21:30:11 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9VLUA4A087319 for perforce@freebsd.org; Mon, 31 Oct 2005 21:30:10 GMT (envelope-from jhb@freebsd.org) Date: Mon, 31 Oct 2005 21:30:10 GMT Message-Id: <200510312130.j9VLUA4A087319@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 86135 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, 31 Oct 2005 21:30:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=86135 Change 86135 by jhb@jhb_slimer on 2005/10/31 21:29:45 IFC @86133. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#72 integrate .. //depot/projects/smpng/sys/amd64/acpica/madt.c#8 integrate .. //depot/projects/smpng/sys/amd64/amd64/io_apic.c#9 integrate .. //depot/projects/smpng/sys/amd64/amd64/mptable.c#9 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#47 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#25 integrate .. //depot/projects/smpng/sys/arm/arm/vm_machdep.c#16 integrate .. //depot/projects/smpng/sys/boot/forth/beastie.4th#9 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#20 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/Makefile#16 integrate .. //depot/projects/smpng/sys/coda/coda_vfsops.c#24 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#28 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#52 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#30 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#75 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#53 integrate .. //depot/projects/smpng/sys/dev/ata/ata-dma.c#46 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#58 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#39 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#26 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#59 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#29 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#33 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#36 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#56 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#36 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#36 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#35 integrate .. //depot/projects/smpng/sys/dev/isp/isp_ioctl.h#12 integrate .. //depot/projects/smpng/sys/dev/isp/ispmbox.h#17 integrate .. //depot/projects/smpng/sys/dev/md/md.c#70 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_disk.c#16 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#53 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#53 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#64 integrate .. //depot/projects/smpng/sys/dev/pci/pcireg.h#12 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#29 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#19 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_freebsd.c#3 integrate .. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#24 integrate .. //depot/projects/smpng/sys/dev/txp/if_txp.c#30 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vfsops.c#20 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#30 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_denode.c#25 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_fileno.c#2 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#44 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_ihash.c#8 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#21 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#31 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_subr.c#14 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#21 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_node.c#17 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_subr.c#8 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal_vfsops.c#19 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.c#22 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_subr.c#7 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#31 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#25 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#32 integrate .. //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#23 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#28 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_work.c#15 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.c#14 integrate .. //depot/projects/smpng/sys/geom/gate/g_gate.c#13 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#21 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#18 integrate .. //depot/projects/smpng/sys/geom/shsec/g_shsec.c#3 integrate .. //depot/projects/smpng/sys/geom/stripe/g_stripe.c#14 integrate .. //depot/projects/smpng/sys/geom/uzip/g_uzip.c#6 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vfsops.c#4 integrate .. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_namei.c#3 integrate .. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/smpng/sys/i386/acpica/madt.c#14 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#110 integrate .. //depot/projects/smpng/sys/i386/i386/io_apic.c#13 integrate .. //depot/projects/smpng/sys/i386/i386/mptable.c#17 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#87 integrate .. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#33 integrate .. //depot/projects/smpng/sys/ia64/ia64/sscdisk.c#18 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#40 integrate .. //depot/projects/smpng/sys/kern/inflate.c#6 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#62 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#84 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#111 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#37 integrate .. //depot/projects/smpng/sys/kern/link_elf.c#30 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#19 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#62 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#64 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#76 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#46 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#71 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#50 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#61 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#85 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#42 integrate .. //depot/projects/smpng/sys/kern/vfs_export.c#21 integrate .. //depot/projects/smpng/sys/kern/vfs_hash.c#4 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#114 integrate .. //depot/projects/smpng/sys/libkern/iconv.c#11 integrate .. //depot/projects/smpng/sys/netatm/atm_aal5.c#13 integrate .. //depot/projects/smpng/sys/netatm/atm_cm.c#15 integrate .. //depot/projects/smpng/sys/netatm/atm_socket.c#16 integrate .. //depot/projects/smpng/sys/netatm/atm_var.h#15 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_if.c#10 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_load.c#10 integrate .. //depot/projects/smpng/sys/netgraph/atm/uni/ng_uni.c#6 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#5 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#5 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#15 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#11 integrate .. //depot/projects/smpng/sys/netgraph/netflow/netflow.c#9 integrate .. //depot/projects/smpng/sys/netinet/in.c#31 integrate .. //depot/projects/smpng/sys/netinet/ip_encap.c#14 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#45 integrate .. //depot/projects/smpng/sys/netipx/spx_usrreq.c#22 integrate .. //depot/projects/smpng/sys/netkey/keydb.c#6 integrate .. //depot/projects/smpng/sys/netncp/ncp_conn.c#12 integrate .. //depot/projects/smpng/sys/netsmb/smb_conn.c#15 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_dev.c#7 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_lock.c#31 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_nfsiod.c#17 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#51 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#26 integrate .. //depot/projects/smpng/sys/pci/viapm.c#10 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/db_trace.c#13 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/locore.S#9 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/ofw_machdep.c#11 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#29 integrate .. //depot/projects/smpng/sys/security/mac_portacl/mac_portacl.c#7 integrate .. //depot/projects/smpng/sys/sys/aio.h#6 integrate .. //depot/projects/smpng/sys/sys/param.h#88 integrate .. //depot/projects/smpng/sys/sys/protosw.h#15 integrate .. //depot/projects/smpng/sys/sys/signal.h#19 integrate .. //depot/projects/smpng/sys/sys/signalvar.h#26 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#46 integrate .. //depot/projects/smpng/sys/sys/syscall.h#61 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#61 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#24 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#63 integrate .. //depot/projects/smpng/sys/sys/timers.h#4 integrate .. //depot/projects/smpng/sys/sys/unistd.h#14 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#39 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#23 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#28 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#21 integrate .. //depot/projects/smpng/sys/vm/vm_pager.c#24 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#72 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.180 2005/10/21 19:42:42 ade Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.181 2005/10/31 16:14:07 alc Exp $"); #include #include @@ -2172,13 +2172,6 @@ continue; } -#if defined(PMAP_DIAGNOSTIC) - if (!pv->pv_pmap) { - printf("Null pmap (cb) at va: 0x%lx\n", pv->pv_va); - continue; - } -#endif - PMAP_LOCK(pv->pv_pmap); pte = pmap_lev3pte(pv->pv_pmap, pv->pv_va); ==== //depot/projects/smpng/sys/amd64/acpica/madt.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.17 2005/09/11 18:39:00 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.18 2005/10/31 15:41:17 rwatson Exp $"); #include #include @@ -74,7 +74,7 @@ static vm_paddr_t madt_physaddr; static vm_offset_t madt_length; -MALLOC_DEFINE(M_MADT, "MADT Table", "ACPI MADT Table Items"); +MALLOC_DEFINE(M_MADT, "madt_table", "ACPI MADT Table Items"); static enum intr_polarity interrupt_polarity(UINT16 Polarity, UINT8 Source); static enum intr_trigger interrupt_trigger(UINT16 TriggerMode, UINT8 Source); ==== //depot/projects/smpng/sys/amd64/amd64/io_apic.c#9 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.16 2005/10/26 22:32:30 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.17 2005/10/31 15:41:17 rwatson Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -65,7 +65,7 @@ #define TODO printf("%s: not implemented!\n", __func__) -static MALLOC_DEFINE(M_IOAPIC, "I/O APIC", "I/O APIC structures"); +static MALLOC_DEFINE(M_IOAPIC, "ioapic", "I/O APIC structures"); /* * New interrupt support code.. ==== //depot/projects/smpng/sys/amd64/amd64/mptable.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.236 2005/04/15 18:44:53 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.237 2005/10/31 15:41:17 rwatson Exp $"); #include #include @@ -141,7 +141,7 @@ static int mptable_nioapics, mptable_nbusses, mptable_maxbusid; static int pci0 = -1; -static MALLOC_DEFINE(M_MPTABLE, "MP Table", "MP Table Items"); +static MALLOC_DEFINE(M_MPTABLE, "mptable", "MP Table Items"); static enum intr_polarity conforming_polarity(u_char src_bus, u_char src_bus_irq); ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#47 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.529 2005/10/21 19:42:42 ade Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.530 2005/10/30 20:47:42 alc Exp $"); /* * Manages physical address maps. @@ -597,28 +597,8 @@ * Low level helper routines..... ***************************************************/ -#if defined(PMAP_DIAGNOSTIC) /* - * This code checks for non-writeable/modified pages. - * This should be an invalid condition. - */ -static int -pmap_nw_modified(pt_entry_t ptea) -{ - int pte; - - pte = (int) ptea; - - if ((pte & (PG_M|PG_RW)) == PG_M) - return 1; - else - return 0; -} -#endif - - -/* * this routine defines the region(s) of memory that should * not be tested for the modified bit. */ @@ -1543,13 +1523,9 @@ if (oldpte & PG_MANAGED) { m = PHYS_TO_VM_PAGE(oldpte & PG_FRAME); if (oldpte & PG_M) { -#if defined(PMAP_DIAGNOSTIC) - if (pmap_nw_modified((pt_entry_t) oldpte)) { - printf( - "pmap_remove: modified page not writable: va: 0x%lx, pte: 0x%lx\n", - va, oldpte); - } -#endif + KASSERT((oldpte & PG_RW), + ("pmap_remove_pte: modified page not writable: va: 0x%lx, pte: 0x%lx", + va, oldpte)); if (pmap_track_modified(va)) vm_page_dirty(m); } @@ -1728,13 +1704,9 @@ * Update the vm_page_t clean and reference bits. */ if (tpte & PG_M) { -#if defined(PMAP_DIAGNOSTIC) - if (pmap_nw_modified((pt_entry_t) tpte)) { - printf( - "pmap_remove_all: modified page not writable: va: 0x%lx, pte: 0x%lx\n", - pv->pv_va, tpte); - } -#endif + KASSERT((tpte & PG_RW), + ("pmap_remove_all: modified page not writable: va: 0x%lx, pte: 0x%lx", + pv->pv_va, tpte)); if (pmap_track_modified(pv->pv_va)) vm_page_dirty(m); } @@ -2021,8 +1993,8 @@ } if (origpte & PG_M) { KASSERT((origpte & PG_RW), - ("pmap_enter: modified page not writable:" - " va: 0x%lx, pte: 0x%lx", va, origpte)); + ("pmap_enter: modified page not writable: va: 0x%lx, pte: 0x%lx", + va, origpte)); if ((origpte & PG_MANAGED) && pmap_track_modified(va)) vm_page_dirty(om); ==== //depot/projects/smpng/sys/amd64/conf/NOTES#25 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.46 2005/10/24 21:04:17 jhb Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.47 2005/10/31 20:45:37 jhb Exp $ # # @@ -225,6 +225,7 @@ # (requires miibus) # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and # Am79C960) +# nve: nVidia nForce MCP on-board Ethernet Networking device ed options ED_3C503 @@ -232,6 +233,7 @@ options ED_SIC #XXX# still calls MD i386 kvtop function instead of vtophys etc #XXX#device lnc +device nve # nVidia nForce MCP on-board Ethernet Networking device ath device ath_hal # Atheros HAL (includes binary component) ==== //depot/projects/smpng/sys/arm/arm/vm_machdep.c#16 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.18 2005/10/03 14:16:41 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.19 2005/10/31 15:41:17 rwatson Exp $"); #include #include @@ -378,7 +378,7 @@ struct mtx smallalloc_mtx; -MALLOC_DEFINE(M_VMSMALLALLOC, "VM Small alloc", "VM Small alloc data"); +MALLOC_DEFINE(M_VMSMALLALLOC, "vm_small_alloc", "VM Small alloc data"); vm_offset_t alloc_curaddr; vm_offset_t alloc_firstaddr; ==== //depot/projects/smpng/sys/boot/forth/beastie.4th#9 (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/boot/forth/beastie.4th,v 1.10 2004/12/01 07:17:57 scottl Exp $ +\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.11 2005/10/30 05:36:23 scottl Exp $ marker task-beastie.4th @@ -50,7 +50,7 @@ 46 constant dot \ The BSD Daemon. He is 19 rows high and 34 columns wide -: technicolor-beastie ( x y -- ) +: beastie-logo ( x y -- ) 2dup at-xy ." , ," 1+ 2dup at-xy ." /( )`" 1+ 2dup at-xy ." \ \___ / |" 1+ @@ -72,7 +72,7 @@ at-xy ." `--{__________) " ; -: boring-beastie ( x y -- ) +: beastiebw-logo ( x y -- ) 2dup at-xy ." , ," 1+ 2dup at-xy ." /( )`" 1+ 2dup at-xy ." \ \___ / |" 1+ @@ -94,18 +94,51 @@ at-xy ." `--{__________)" ; -: print-beastie ( x y -- ) - s" loader_color" getenv +: fbsdbw-logo ( x y -- ) + 2dup at-xy ." ______" 1+ + 2dup at-xy ." | ____| __ ___ ___ " 1+ + 2dup at-xy ." | |__ | '__/ _ \/ _ \" 1+ + 2dup at-xy ." | __|| | | __/ __/" 1+ + 2dup at-xy ." | | | | | | |" 1+ + 2dup at-xy ." |_| |_| \___|\___|" 1+ + 2dup at-xy ." ____ _____ _____" 1+ + 2dup at-xy ." | _ \ / ____| __ \" 1+ + 2dup at-xy ." | |_) | (___ | | | |" 1+ + 2dup at-xy ." | _ < \___ \| | | |" 1+ + 2dup at-xy ." | |_) |____) | |__| |" 1+ + 2dup at-xy ." | | | |" 1+ + at-xy ." |____/|_____/|_____/" +; + +: print-logo ( x y -- ) + s" loader_logo" getenv dup -1 = if drop - boring-beastie + fbsdbw-logo + exit + then + 2dup s" fbsdbw" compare-insensitive 0= if + 2drop + fbsdbw-logo + exit + then + 2dup s" beastiebw" compare-insensitive 0= if + 2drop + beastiebw-logo + exit + then + 2dup s" beastie" compare-insensitive 0= if + 2drop + beastie-logo exit then - s" YES" compare-insensitive 0<> if - boring-beastie + 2dup s" none" compare-insensitive 0= if + 2drop + \ no logo exit then - technicolor-beastie + 2drop + fbsdbw-logo ; : acpienabled? ( -- flag ) @@ -144,7 +177,7 @@ 8 menuY ! 5 menuX ! clear - 46 4 print-beastie + 46 4 print-logo 42 20 2 2 box 13 6 at-xy ." Welcome to FreeBSD!" printmenuitem ." Boot FreeBSD [default]" bootkey ! ==== //depot/projects/smpng/sys/boot/i386/loader/Makefile#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.81 2005/06/01 15:32:57 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.82 2005/10/30 05:41:42 scottl Exp $ PROG= loader.sym INTERNALPROG= @@ -73,7 +73,7 @@ .PATH: ${.CURDIR}/../../forth FILES= loader loader.help loader.4th support.4th loader.conf -FILES+= screen.4th frames.4th +FILES+= screen.4th frames.4th beastie.4th # XXX INSTALLFLAGS_loader= -b FILESMODE_loader= ${BINMODE} -b FILESDIR_loader.conf= /boot/defaults ==== //depot/projects/smpng/sys/boot/pc98/loader/Makefile#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.38 2005/05/08 14:17:28 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.39 2005/10/30 15:59:08 nyan Exp $ PROG= loader.sym INTERNALPROG= @@ -75,13 +75,13 @@ .PATH: ${.CURDIR}/../../forth FILES= loader loader.help loader.4th support.4th loader.conf -FILES+= screen.4th frames.4th +FILES+= screen.4th frames.4th beastie.4th # XXX INSTALLFLAGS_loader= -b FILESMODE_loader= ${BINMODE} -b FILESDIR_loader.conf= /boot/defaults .if !exists(${DESTDIR}/boot/loader.rc) -FILES+= loader.rc +FILES+= ${.CURDIR}/../../i386/loader/loader.rc .endif # XXX crt0.o needs to be first for pxeboot(8) to work ==== //depot/projects/smpng/sys/coda/coda_vfsops.c#24 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_vfsops.c,v 1.59 2005/03/24 07:39:03 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_vfsops.c,v 1.60 2005/10/31 15:41:17 rwatson Exp $"); #include #include @@ -60,7 +60,7 @@ #include #include -MALLOC_DEFINE(M_CODA, "CODA storage", "Various Coda Structures"); +MALLOC_DEFINE(M_CODA, "coda", "Various Coda Structures"); int codadebug = 0; int coda_vfsop_print_entry = 0; ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#28 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.45 2005/10/26 22:19:51 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.46 2005/10/31 21:09:56 ps Exp $"); #include "opt_compat.h" @@ -41,6 +41,7 @@ #include #include #include /* Must come after sys/malloc.h */ +#include #include #include #include @@ -800,32 +801,52 @@ } static int -freebsd32_copyiniov(struct iovec32 *iovp, u_int iovcnt, struct iovec **iov, +freebsd32_copyiniov(struct iovec32 *iovp32, u_int iovcnt, struct iovec **iovp, int error) { struct iovec32 iov32; + struct iovec *iov; + u_int iovlen; int i; - u_int iovlen; - - *iov = NULL; + *iovp = NULL; if (iovcnt > UIO_MAXIOV) return (error); iovlen = iovcnt * sizeof(struct iovec); - *iov = malloc(iovlen, M_IOV, M_WAITOK); + iov = malloc(iovlen, M_IOV, M_WAITOK); for (i = 0; i < iovcnt; i++) { - error = copyin(&iovp[i], &iov32, sizeof(struct iovec32)); + error = copyin(&iovp32[i], &iov32, sizeof(struct iovec32)); if (error) { - free(*iov, M_IOV); - *iov = NULL; + free(iov, M_IOV); return (error); } - iov[i]->iov_base = PTRIN(iov32.iov_base); - iov[i]->iov_len = iov32.iov_len; + iov[i].iov_base = PTRIN(iov32.iov_base); + iov[i].iov_len = iov32.iov_len; + } + *iovp = iov; + return (0); +} + +static int +freebsd32_copyoutiov(struct iovec *iov, u_int iovcnt, struct iovec32 *iovp, + int error) +{ + struct iovec32 iov32; + int i; + + if (iovcnt > UIO_MAXIOV) + return (error); + for (i = 0; i < iovcnt; i++) { + iov32.iov_base = PTROUT(iov[i].iov_base); + iov32.iov_len = iov[i].iov_len; + error = copyout(&iov32, &iovp[i], sizeof(iov32)); + if (error) + return (error); } return (0); } + struct msghdr32 { u_int32_t msg_name; socklen_t msg_namelen; @@ -853,8 +874,7 @@ msg->msg_control = PTRIN(m32.msg_control); msg->msg_controllen = m32.msg_controllen; msg->msg_flags = m32.msg_flags; - return (freebsd32_copyiniov((struct iovec32 *)(uintptr_t)m32.msg_iov, m32.msg_iovlen, &msg->msg_iov, - EMSGSIZE)); + return (0); } static int @@ -874,6 +894,103 @@ return (error); } +#define FREEBSD32_ALIGNBYTES (sizeof(int) - 1) +#define FREEBSD32_ALIGN(p) \ + (((u_long)(p) + FREEBSD32_ALIGNBYTES) & ~FREEBSD32_ALIGNBYTES) +#define FREEBSD32_CMSG_SPACE(l) \ + (FREEBSD32_ALIGN(sizeof(struct cmsghdr)) + FREEBSD32_ALIGN(l)) + +#define FREEBSD32_CMSG_DATA(cmsg) ((unsigned char *)(cmsg) + \ + FREEBSD32_ALIGN(sizeof(struct cmsghdr))) +static int +freebsd32_copy_msg_out(struct msghdr *msg, struct mbuf *control) +{ + struct cmsghdr *cm; + void *data; + socklen_t clen, datalen; + int error; + caddr_t ctlbuf; + int len, maxlen, copylen; + struct mbuf *m; + error = 0; + + len = msg->msg_controllen; + maxlen = msg->msg_controllen; + msg->msg_controllen = 0; + + m = control; + ctlbuf = msg->msg_control; + + while (m && len > 0) { + cm = mtod(m, struct cmsghdr *); + clen = m->m_len; + + while (cm != NULL) { + + if (sizeof(struct cmsghdr) > clen || + cm->cmsg_len > clen) { + error = EINVAL; + break; + } + + data = CMSG_DATA(cm); + datalen = (caddr_t)cm + cm->cmsg_len - (caddr_t)data; + + /* Adjust message length */ + cm->cmsg_len = FREEBSD32_ALIGN(sizeof(struct cmsghdr)) + + datalen; + + + /* Copy cmsghdr */ + copylen = sizeof(struct cmsghdr); + if (len < copylen) { + msg->msg_flags |= MSG_CTRUNC; + copylen = len; + } + + error = copyout(cm,ctlbuf,copylen); + if (error) + goto exit; + + ctlbuf += FREEBSD32_ALIGN(copylen); + len -= FREEBSD32_ALIGN(copylen); + + if (len <= 0) + break; + + /* Copy data */ + copylen = datalen; + if (len < copylen) { + msg->msg_flags |= MSG_CTRUNC; + copylen = len; + } + + error = copyout(data,ctlbuf,copylen); + if (error) + goto exit; + + ctlbuf += FREEBSD32_ALIGN(copylen); + len -= FREEBSD32_ALIGN(copylen); + + if (CMSG_SPACE(datalen) < clen) { + clen -= CMSG_SPACE(datalen); + cm = (struct cmsghdr *) + ((caddr_t)cm + CMSG_SPACE(datalen)); + } else { + clen = 0; + cm = NULL; + } + } + m = m->m_next; + } + + msg->msg_controllen = (len <= 0) ? maxlen : ctlbuf - (caddr_t)msg->msg_control; + +exit: + return (error); + +} + int freebsd32_recvmsg(td, uap) struct thread *td; @@ -886,8 +1003,10 @@ struct msghdr msg; struct msghdr32 m32; struct iovec *uiov, *iov; + struct mbuf *control = NULL; + struct mbuf **controlp; + int error; - error = copyin(uap->msg, &m32, sizeof(m32)); if (error) return (error); @@ -901,16 +1020,71 @@ msg.msg_flags = uap->flags; uiov = msg.msg_iov; msg.msg_iov = iov; - error = kern_recvit(td, uap->s, &msg, NULL, UIO_SYSSPACE); + + controlp = (msg.msg_control != NULL) ? &control : NULL; + error = kern_recvit(td, uap->s, &msg, NULL, UIO_USERSPACE, controlp); if (error == 0) { msg.msg_iov = uiov; - error = freebsd32_copyoutmsghdr(&msg, uap->msg); + + if (control != NULL) + error = freebsd32_copy_msg_out(&msg, control); + + if (error == 0) + error = freebsd32_copyoutmsghdr(&msg, uap->msg); + + if (error == 0) + error = freebsd32_copyoutiov(iov, iov->iov_len, + (struct iovec32 *)(uintptr_t)m32.msg_iov, EMSGSIZE); } free(iov, M_IOV); - free(uiov, M_IOV); + + if (control != NULL) + m_freem(control); + + return (error); +} + + +static int +freebsd32_convert_msg_in(struct mbuf **controlp) +{ + struct mbuf *control = *controlp; + struct cmsghdr *cm = mtod(control, struct cmsghdr *); + void *data; + socklen_t clen = control->m_len, datalen; + int error; + + error = 0; + *controlp = NULL; + + while (cm != NULL) { + if (sizeof(struct cmsghdr) > clen || cm->cmsg_len > clen) { + error = EINVAL; + break; + } + + data = FREEBSD32_CMSG_DATA(cm); + datalen = (caddr_t)cm + cm->cmsg_len - (caddr_t)data; + + *controlp = sbcreatecontrol(data, datalen, cm->cmsg_type, + cm->cmsg_level); + controlp = &(*controlp)->m_next; + + if (FREEBSD32_CMSG_SPACE(datalen) < clen) { + clen -= FREEBSD32_CMSG_SPACE(datalen); + cm = (struct cmsghdr *) + ((caddr_t)cm + FREEBSD32_CMSG_SPACE(datalen)); + } else { + clen = 0; + cm = NULL; + } + } + + m_freem(control); return (error); } + int freebsd32_sendmsg(struct thread *td, struct freebsd32_sendmsg_args *uap) @@ -918,6 +1092,8 @@ struct msghdr msg; struct msghdr32 m32; struct iovec *iov; + struct mbuf *control = NULL; + struct sockaddr *to = NULL; int error; error = copyin(uap->msg, &m32, sizeof(m32)); @@ -931,8 +1107,38 @@ if (error) return (error); msg.msg_iov = iov; - error = kern_sendit(td, uap->s, &msg, uap->flags, NULL, UIO_SYSSPACE); + if (msg.msg_name != NULL) { + error = getsockaddr(&to, msg.msg_name, msg.msg_namelen); + if (error) { + to = NULL; + goto out; + } + msg.msg_name = to; + } + + if (msg.msg_control) { + if (msg.msg_controllen < sizeof(struct cmsghdr)) { + error = EINVAL; + goto out; + } + + error = sockargs(&control, msg.msg_control, + msg.msg_controllen, MT_CONTROL); + if (error) + goto out; + + error = freebsd32_convert_msg_in(&control); + if (error) + goto out; + } + + error = kern_sendit(td, uap->s, &msg, uap->flags, control, + UIO_USERSPACE); + +out: free(iov, M_IOV); + if (to) + free(to, M_SONAME); return (error); } @@ -960,7 +1166,8 @@ aiov.iov_len = uap->len; msg.msg_control = 0; msg.msg_flags = uap->flags; - error = kern_recvit(td, uap->s, &msg, (void *)(uintptr_t)uap->fromlenaddr, UIO_USERSPACE); + error = kern_recvit(td, uap->s, &msg, + (void *)(uintptr_t)uap->fromlenaddr, UIO_USERSPACE, NULL); return (error); } ==== //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.1.1.1 2005/04/25 18:15:15 darrenr Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.2 2005/10/31 15:41:17 rwatson Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -112,7 +112,7 @@ #endif # ifdef IPFILTER_M_IPFILTER -MALLOC_DEFINE(M_IPFILTER, "IP Filter", "IP Filter packet filter data structures"); +MALLOC_DEFINE(M_IPFILTER, "ipfilter", "IP Filter packet filter data structures"); # endif ==== //depot/projects/smpng/sys/dev/aac/aac.c#52 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.114 2005/10/14 16:22:45 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.115 2005/10/31 00:12:19 csjp Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -3428,6 +3428,7 @@ device_t child; int i, found, error; + mtx_lock(&sc->aac_io_lock); aac_alloc_sync_fib(sc, &fib); c_cmd = (struct aac_ctcfg *)&fib->data[0]; bzero(c_cmd, sizeof(struct aac_ctcfg)); @@ -3442,6 +3443,7 @@ device_printf(sc->aac_dev, "Error %d sending " "VM_ContainerConfig command\n", error); aac_release_sync_fib(sc); + mtx_unlock(&sc->aac_io_lock); return; } @@ -3450,6 +3452,7 @@ device_printf(sc->aac_dev, "VM_ContainerConfig returned 0x%x\n", c_resp->Status); aac_release_sync_fib(sc); + mtx_unlock(&sc->aac_io_lock); return; } @@ -3470,6 +3473,7 @@ device_printf(sc->aac_dev, "Error %d sending VMIoctl command\n", error); aac_release_sync_fib(sc); + mtx_unlock(&sc->aac_io_lock); return; } @@ -3478,11 +3482,13 @@ device_printf(sc->aac_dev, "VM_Ioctl returned %d\n", vmi_resp->Status); aac_release_sync_fib(sc); + mtx_unlock(&sc->aac_io_lock); return; } bcopy(&vmi_resp->BusInf, &businfo, sizeof(struct aac_getbusinf)); aac_release_sync_fib(sc); + mtx_unlock(&sc->aac_io_lock); found = 0; for (i = 0; i < businfo.BusCount; i++) { ==== //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#30 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.46 2005/09/11 18:39:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.47 2005/10/31 15:41:18 rwatson Exp $"); #include "opt_acpi.h" #include @@ -119,7 +119,7 @@ int link_index; }; -MALLOC_DEFINE(M_PCI_LINK, "PCI Link", "ACPI PCI Link structures"); +MALLOC_DEFINE(M_PCI_LINK, "pci_link", "ACPI PCI Link structures"); static int pci_link_interrupt_weights[NUM_ACPI_INTERRUPTS]; static int pci_link_bios_isa_irqs; ==== //depot/projects/smpng/sys/dev/ata/ata-all.c#75 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.258 2005/10/27 16:32:39 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.259 2005/10/31 15:41:18 rwatson Exp $"); #include "opt_ata.h" #include @@ -73,7 +73,7 @@ static void bpack(int8_t *, int8_t *, int); /* global vars */ -MALLOC_DEFINE(M_ATA, "ATA generic", "ATA driver generic layer"); +MALLOC_DEFINE(M_ATA, "ata_generic", "ATA driver generic layer"); int (*ata_raid_ioctl_func)(u_long cmd, caddr_t data) = NULL; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 31 21:40:27 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CE1316A44F; Mon, 31 Oct 2005 21:40:26 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0743916A446 for ; Mon, 31 Oct 2005 21:40:26 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B0F6543D45 for ; Mon, 31 Oct 2005 21:40:25 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9VLePi5087975 for ; Mon, 31 Oct 2005 21:40:25 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9VLePbh087971 for perforce@freebsd.org; Mon, 31 Oct 2005 21:40:25 GMT (envelope-from jhb@freebsd.org) Date: Mon, 31 Oct 2005 21:40:25 GMT Message-Id: <200510312140.j9VLePbh087971@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 86139 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, 31 Oct 2005 21:40:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=86139 Change 86139 by jhb@jhb_slimer on 2005/10/31 21:40:01 IFC @86136. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#48 integrate .. //depot/projects/smpng/sys/boot/i386/loader/loader.rc#4 branch .. //depot/projects/smpng/sys/i386/i386/pmap.c#88 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#48 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.530 2005/10/30 20:47:42 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.531 2005/10/31 21:25:33 alc Exp $"); /* * Manages physical address maps. @@ -203,6 +203,7 @@ static PMAP_INLINE void free_pv_entry(pv_entry_t pv); static pv_entry_t get_pv_entry(void); +static pv_entry_t pv_entry_reclaim(pmap_t locked_pmap); static void pmap_clear_ptes(vm_page_t m, long bit); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, @@ -1450,6 +1451,57 @@ return uma_zalloc(pvzone, M_NOWAIT); } +/* + * Reclaim a pv entry by removing a mapping to an inactive page. + */ +static pv_entry_t +pv_entry_reclaim(pmap_t locked_pmap) +{ + pd_entry_t ptepde; + pmap_t pmap; + pt_entry_t *pte, tpte; + pv_entry_t pv; + vm_offset_t va; + vm_page_t m; + + PMAP_LOCK_ASSERT(locked_pmap, MA_OWNED); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + TAILQ_FOREACH(m, &vm_page_queues[PQ_INACTIVE].pl, pageq) { + if (m->hold_count || m->busy || (m->flags & PG_BUSY)) + continue; + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + va = pv->pv_va; + pmap = pv->pv_pmap; + if (pmap != locked_pmap && !PMAP_TRYLOCK(pmap)) + continue; + pmap->pm_stats.resident_count--; + pte = pmap_pte_pde(pmap, va, &ptepde); + tpte = pte_load_clear(pte); + KASSERT((tpte & PG_W) == 0, + ("pv_entry_reclaim: wired pte %#lx", tpte)); + if (tpte & PG_A) + vm_page_flag_set(m, PG_REFERENCED); + if (tpte & PG_M) { + KASSERT((tpte & PG_RW), + ("pv_entry_reclaim: modified page not writable: va: %#lx, pte: %#lx", + va, tpte)); + if (pmap_track_modified(va)) + vm_page_dirty(m); + } + pmap_invalidate_page(pmap, va); + TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); + 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--; + pmap_unuse_pt(pmap, va, ptepde); + if (pmap != locked_pmap) + PMAP_UNLOCK(pmap); + return (pv); + } + } + panic("pv_entry_reclaim: increase vm.pmap.shpgperproc"); +} static void pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va) @@ -1488,8 +1540,10 @@ pv_entry_t pv; pv = get_pv_entry(); - if (pv == NULL) - panic("no pv entries: increase vm.pmap.shpgperproc"); + if (pv == NULL) { + pv_entry_count--; + pv = pv_entry_reclaim(pmap); + } pv->pv_va = va; pv->pv_pmap = pmap; @@ -1524,7 +1578,7 @@ m = PHYS_TO_VM_PAGE(oldpte & PG_FRAME); if (oldpte & PG_M) { KASSERT((oldpte & PG_RW), - ("pmap_remove_pte: modified page not writable: va: 0x%lx, pte: 0x%lx", + ("pmap_remove_pte: modified page not writable: va: %#lx, pte: %#lx", va, oldpte)); if (pmap_track_modified(va)) vm_page_dirty(m); @@ -1705,7 +1759,7 @@ */ if (tpte & PG_M) { KASSERT((tpte & PG_RW), - ("pmap_remove_all: modified page not writable: va: 0x%lx, pte: 0x%lx", + ("pmap_remove_all: modified page not writable: va: %#lx, pte: %#lx", pv->pv_va, tpte)); if (pmap_track_modified(pv->pv_va)) vm_page_dirty(m); @@ -1993,7 +2047,7 @@ } if (origpte & PG_M) { KASSERT((origpte & PG_RW), - ("pmap_enter: modified page not writable: va: 0x%lx, pte: 0x%lx", + ("pmap_enter: modified page not writable: va: %#lx, pte: %#lx", va, origpte)); if ((origpte & PG_MANAGED) && pmap_track_modified(va)) ==== //depot/projects/smpng/sys/i386/i386/pmap.c#88 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.534 2005/10/30 20:47:42 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.535 2005/10/31 21:25:33 alc Exp $"); /* * Manages physical address maps. @@ -253,6 +253,7 @@ static PMAP_INLINE void free_pv_entry(pv_entry_t pv); static pv_entry_t get_pv_entry(void); +static pv_entry_t pv_entry_reclaim(pmap_t locked_pmap); static void pmap_clear_ptes(vm_page_t m, int bit); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva); @@ -1454,7 +1455,61 @@ return uma_zalloc(pvzone, M_NOWAIT); } +/* + * Reclaim a pv entry by removing a mapping to an inactive page. + */ +static pv_entry_t +pv_entry_reclaim(pmap_t locked_pmap) +{ + pmap_t pmap; + pt_entry_t *pte, tpte; + pv_entry_t pv; + vm_offset_t va; + vm_page_t m; + PMAP_LOCK_ASSERT(locked_pmap, MA_OWNED); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + sched_pin(); + TAILQ_FOREACH(m, &vm_page_queues[PQ_INACTIVE].pl, pageq) { + if (m->hold_count || m->busy || (m->flags & PG_BUSY)) + continue; + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + va = pv->pv_va; + pmap = pv->pv_pmap; + if (pmap != locked_pmap && !PMAP_TRYLOCK(pmap)) + continue; + pmap->pm_stats.resident_count--; + pte = pmap_pte_quick(pmap, va); + tpte = pte_load_clear(pte); + KASSERT((tpte & PG_W) == 0, + ("pv_entry_reclaim: wired pte %#jx", + (uintmax_t)tpte)); + if (tpte & PG_A) + vm_page_flag_set(m, PG_REFERENCED); + if (tpte & PG_M) { + KASSERT((tpte & PG_RW), + ("pv_entry_reclaim: modified page not writable: va: %#x, pte: %#jx", + va, (uintmax_t)tpte)); + if (pmap_track_modified(va)) + vm_page_dirty(m); + } + pmap_invalidate_page(pmap, va); + TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); + 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--; + pmap_unuse_pt(pmap, va); + if (pmap != locked_pmap) + PMAP_UNLOCK(pmap); + sched_unpin(); + return (pv); + } + } + sched_unpin(); + panic("pv_entry_reclaim: increase vm.pmap.shpgperproc"); +} + static void pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va) { @@ -1492,8 +1547,10 @@ pv_entry_t pv; pv = get_pv_entry(); - if (pv == NULL) - panic("no pv entries: increase vm.pmap.shpgperproc"); + if (pv == NULL) { + pv_entry_count--; + pv = pv_entry_reclaim(pmap); + } pv->pv_va = va; pv->pv_pmap = pmap; @@ -1529,8 +1586,8 @@ m = PHYS_TO_VM_PAGE(oldpte); if (oldpte & PG_M) { KASSERT((oldpte & PG_RW), - ("pmap_remove_pte: modified page not writable: va: 0x%x, pte: 0x%x", - va, oldpte)); + ("pmap_remove_pte: modified page not writable: va: %#x, pte: %#jx", + va, (uintmax_t)oldpte)); if (pmap_track_modified(va)) vm_page_dirty(m); } @@ -1695,8 +1752,8 @@ */ if (tpte & PG_M) { KASSERT((tpte & PG_RW), - ("pmap_remove_all: modified page not writable: va: 0x%x, pte: 0x%x", - pv->pv_va, tpte)); + ("pmap_remove_all: modified page not writable: va: %#x, pte: %#jx", + pv->pv_va, (uintmax_t)tpte)); if (pmap_track_modified(pv->pv_va)) vm_page_dirty(m); } @@ -1985,8 +2042,8 @@ } if (origpte & PG_M) { KASSERT((origpte & PG_RW), - ("pmap_enter: modified page not writable: va: 0x%x, pte: 0x%x", - va, origpte)); + ("pmap_enter: modified page not writable: va: %#x, pte: %#jx", + va, (uintmax_t)origpte)); if ((origpte & PG_MANAGED) && pmap_track_modified(va)) vm_page_dirty(om); From owner-p4-projects@FreeBSD.ORG Mon Oct 31 22:08:56 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F49216A424; Mon, 31 Oct 2005 22:08:56 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E7DA716A428 for ; Mon, 31 Oct 2005 22:08:55 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A33FC43D45 for ; Mon, 31 Oct 2005 22:08:55 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9VM8tvE089691 for ; Mon, 31 Oct 2005 22:08:55 GMT (envelope-from soc-victor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9VM8t92089688 for perforce@freebsd.org; Mon, 31 Oct 2005 22:08:55 GMT (envelope-from soc-victor@freebsd.org) Date: Mon, 31 Oct 2005 22:08:55 GMT Message-Id: <200510312208.j9VM8t92089688@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-victor@freebsd.org using -f From: Victor Cruceru To: Perforce Change Reviews Cc: Subject: PERFORCE change 86145 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, 31 Oct 2005 22:08:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=86145 Change 86145 by soc-victor@soc-victor_Pentium4 on 2005/10/31 22:07:59 Added the BSNMP module stuff for MTA-MIB. Affected files ... .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_mta/mta_snmp.c#2 edit .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_mta/mta_snmp.h#1 add Differences ... ==== //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_mta/mta_snmp.c#2 (text+ko) ==== @@ -28,5 +28,173 @@ * * MTA-MIB for SNMPd: BSNMP's module related stuff */ +#include "mta_snmp.h" +#include "mta_oid.h" +#include "mta_tree.h" +#include +#include +#include +#include +#include +#include + +/*internal id got after we'll register the MTA-MIB with the agent */ +static +u_int mta_registration_id = 0; + + + +/* this our MTA module */ +static +struct lmodule *mta_module; + +static +const struct asn_oid oid_mta = OIDX_mta; +/*see the generated file mta_oid.h*/ + + + +struct mta_state mta_state_g; + +/* + * MTA mib module initialization hook. + * Returns 0 on success, < 0 on error + */ +static +int mta_init(struct lmodule * mod, + int argc __unused, + char *argv[] __unused) { + + mta_module = mod; + + memset(&mta_state_g, 0, sizeof(struct mta_state)); + + MTA_DPRINTF((stderr, "[%s] done.\n", __func__)); + return (0); +} + +/* + * MTA mib module finalization hook. + * Returns 0 on success, < 0 on error + */ +static +int mta_fini(void) { + + if (mta_registration_id > 0) { + or_unregister(mta_registration_id); + } + + MTA_DPRINTF((stderr, "[%s] done.\n", __func__)); + return (0); + +} + +/* + * MTA mib module dump function + * returns nothing + */ +static +void mta_dump_v(void) { + /*nothing iteresting here for the time being*/ + MTA_DPRINTF((stderr, "[%s] done.\n ", __func__)); +} + +/* + * MTA mib module reconfiguration function + * returns nothing +*/ +static +void mta_config_v(void) { + /*nothing iteresting here for the time being*/ + MTA_DPRINTF((stderr, "[%s] done.\n ", __func__)); +} + + + +static +void mta_loading_v(const struct lmodule *mod __unused, int loaded) +{ + /*nothing iteresting here for the time being*/ + if ( loaded == 1 ) { + goto LABEL_RETURN; + } +LABEL_RETURN:; + MTA_DPRINTF((stderr,"[%s] done.\n ", __func__)); + +} + +/* + * MTA mib module start operation + * returns nothing + */ +static +void mta_start_v(void) { + mta_registration_id = or_register(&oid_mta, + "The MIB module for MTA MIB (rfc 2789).", + mta_module); + if (mta_registration_id == 0) { + syslog(LOG_ERR, "Failed to register the TCP-MIB."); + return; + } + + MTA_DPRINTF((stderr, "[%s] done.\n ", __func__)); +} + +/* + * This identifies the MTA mib module + * inside the agent + */ +const struct snmp_module config = { + "This module implements the MTA-MIB (rfc 2789)", + mta_init, + mta_fini, + NULL, /*idle function, do not use it*/ + mta_dump_v, + mta_config_v, + mta_start_v, + NULL, /* proxy a PDU */ + mta_ctree, /* see the generated mta_tree.h */ + mta_CTREE_SIZE, /* see the generated mta_tree.h */ + mta_loading_v +}; + + + +int +op_mtaTable(struct snmp_context __unused *ctx, + struct snmp_value __unused *val, + u_int __unused sub, u_int __unused vindex, + enum snmp_op __unused op) +{ + return (SNMP_ERR_NOSUCHNAME); +} + + +int +op_mtaGroupTable(struct snmp_context __unused *ctx, + struct snmp_value __unused *val, + u_int __unused sub, u_int __unused vindex, + enum snmp_op __unused op) +{ + return (SNMP_ERR_NOSUCHNAME); +} + +int +op_mtaGroupAssociationTable(struct snmp_context __unused *ctx, + struct snmp_value __unused *val, + u_int __unused sub, u_int __unused vindex, + enum snmp_op __unused op) +{ + return (SNMP_ERR_NOSUCHNAME); +} + +int +op_mtaGroupErrorTable(struct snmp_context __unused *ctx, + struct snmp_value __unused *val, + u_int __unused sub, u_int __unused vindex, + enum snmp_op __unused op) +{ + return (SNMP_ERR_NOSUCHNAME); +} From owner-p4-projects@FreeBSD.ORG Tue Nov 1 10:29:34 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DB3516A421; Tue, 1 Nov 2005 10:29:33 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 31B4D16A41F for ; Tue, 1 Nov 2005 10:29:33 +0000 (GMT) (envelope-from soc-tyler@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D49A343D45 for ; Tue, 1 Nov 2005 10:29:32 +0000 (GMT) (envelope-from soc-tyler@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jA1ATWve043276 for ; Tue, 1 Nov 2005 10:29:32 GMT (envelope-from soc-tyler@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA1ATWtq043273 for perforce@freebsd.org; Tue, 1 Nov 2005 10:29:32 GMT (envelope-from soc-tyler@freebsd.org) Date: Tue, 1 Nov 2005 10:29:32 GMT Message-Id: <200511011029.jA1ATWtq043273@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-tyler@freebsd.org using -f From: soc-tyler To: Perforce Change Reviews Cc: Subject: PERFORCE change 86162 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, 01 Nov 2005 10:29:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=86162 Change 86162 by soc-tyler@soc-tyler_launchd on 2005/11/01 10:28:46 Start merging changes from most recent tarball from zarzycki@ (launchd-117.tar.gz to be linked to from wiki) Untested as of yet, merging changes as close to Darwin's launchd as to help backward compatibility and future vendor source code updates Affected files ... .. //depot/projects/soc2005/launchd/includes/launch.h#14 edit .. //depot/projects/soc2005/launchd/includes/launch_priv.h#4 edit .. //depot/projects/soc2005/launchd/includes/launchd.h#11 edit .. //depot/projects/soc2005/launchd/includes/launchd_core_logic.h#1 add .. //depot/projects/soc2005/launchd/includes/launchd_unix_ipc.h#1 add .. //depot/projects/soc2005/launchd/includes/pathnames.h#3 edit .. //depot/projects/soc2005/launchd/launchd.c#25 edit .. //depot/projects/soc2005/launchd/launchd_core_logic.c#1 add .. //depot/projects/soc2005/launchd/launchd_unix_ipc.c#1 add .. //depot/projects/soc2005/launchd/liblaunch.c#16 edit Differences ... ==== //depot/projects/soc2005/launchd/includes/launch.h#14 (text+ko) ==== ==== //depot/projects/soc2005/launchd/includes/launch_priv.h#4 (text+ko) ==== @@ -25,12 +25,15 @@ #include +#define LAUNCH_JOBKEY_FIRSTBORN "FirstBorn" + #define LAUNCH_KEY_GETUSERENVIRONMENT "GetUserEnvironment" #define LAUNCH_KEY_SETUSERENVIRONMENT "SetUserEnvironment" #define LAUNCH_KEY_UNSETUSERENVIRONMENT "UnsetUserEnvironment" #define LAUNCH_KEY_SETSTDOUT "SetStandardOut" #define LAUNCH_KEY_SETSTDERR "SetStandardError" -#define LAUNCH_KEY_SHUTDOWN "Shutdown" +#define LAUNCH_KEY_SHUTDOWN "Shutdown" +#define LAUNCH_KEY_SINGLEUSER "SingleUser" #define LAUNCH_KEY_GETRESOURCELIMITS "GetResourceLimits" #define LAUNCH_KEY_SETRESOURCELIMITS "SetResourceLimits" #define LAUNCH_KEY_RELOADTTYS "ReloadTTYS" ==== //depot/projects/soc2005/launchd/includes/launchd.h#11 (text+ko) ==== @@ -35,13 +35,31 @@ #include #include +/* + * Use launchd_assumes() when we can recover, even if it means we leak or limp along. + * + * Use launchd_assert() for core initialization routines. + */ +#define launchd_assumes(e) \ + (__builtin_expect(!(e), 0) ? syslog(LOG_NOTICE, "Please file a bug report: %s:%u in %s(): (%s) == %u", __FILE__, __LINE__, __func__, #e, errno), false : true) + +#define launchd_assert(e) launchd_assumes(e) ? true : abort(); + +#define PID1_REAP_ADOPTED_CHILDREN + +struct kevent; +struct conncb; + typedef void (*kq_callback)(void *, struct kevent *); extern kq_callback kqsimple_zombie_reaper; -extern sigset_t blocked_signals; +extern uint32_t blocked_signals; +extern bool shutdown_in_progress; +extern int batch_disabler_count; #ifdef PID1_REAP_ADOPTED_CHILDREN extern int pid1_child_exit_status; +bool init_check_pid(pid_t); #endif int kevent_mod(uintptr_t ident, short filter, u_short flags, u_int fflags, intptr_t data, void *udata); @@ -54,9 +72,19 @@ void clean_ttys(void); void catatonia(void); void death(void); -/* */ + +void batch_job_enable(bool e, struct conncb *c); + +launch_data_t launchd_setstdio(int d, launch_data_t o); +void launchd_SessionCreate(void); +void launchd_shutdown(void); +void launchd_single_user(void); +pid_t launchd_fork(void); +pid_t launchd_ws_fork(void); +int _fd(int fd); #ifdef _BUILD_DARWIN_ +boolean_t launchd_mach_ipc_demux(mach_msg_header_t *Request, mach_msg_header_t *Reply); extern mach_port_t launchd_bootstrap_port; void launchd_SessionCreate(const char *who); #endif ==== //depot/projects/soc2005/launchd/includes/pathnames.h#3 (text+ko) ==== ==== //depot/projects/soc2005/launchd/launchd.c#25 (text+ko) ==== @@ -32,13 +32,7 @@ #include #include #include - -#ifdef EVFILT_MACH_IMPLEMENTED -#include -#include -#endif #endif - #include #include #include @@ -56,226 +50,143 @@ #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 "launch.h" #include "launch_priv.h" #include "launchd.h" - -#ifdef _BUILD_DARWIN_ -#include "bootstrap_internal.h" -#endif +#include "launchd_core_logic.h" +#include "launchd_unix_ipc.h" -#define LAUNCHD_MIN_JOB_RUN_TIME 10 -#define LAUNCHD_REWARD_JOB_RUN_TIME 60 -#define LAUNCHD_FAILED_EXITS_THRESHOLD 10 #define PID1LAUNCHD_CONF "/etc/launchd.conf" #define LAUNCHD_CONF ".launchd.conf" - -#ifdef _BUILD_DARWIN_ +#ifndef LAUNCHCTL_PATH +#define LAUNCHCTL_PATH "/bin/launchctl" +#endif #define SECURITY_LIB "/System/Library/Frameworks/Security.framework/Versions/A/Security" #define VOLFSDIR "/.vol" -#endif extern char **environ; -//! launchd's job callback datastruct -/*! - * this structure contains all the necessary data for one of the job callbacks - * such as the PID, the kqueue callback (kq_callback) - */ -struct jobcb { - kq_callback kqjob_callback; - TAILQ_ENTRY(jobcb) tqe; - launch_data_t ldj; - pid_t p; - int last_exit_status; - int execfd; - time_t start_time; - size_t failed_exits; - int *vnodes; - size_t vnodes_cnt; - int *qdirs; - size_t qdirs_cnt; - unsigned int start_interval; - struct tm *start_cal_interval; - unsigned int checkedin:1, firstborn:1, debug:1, throttle:1, futureflags:28; - char label[0]; -}; - -//! launchd's socket connection callback -/*! - * this structure contains the basic data needed for our unix socket - * connections that we create to communicate with launchctl via - * "liblaunch" - */ -struct conncb { - kq_callback kqconn_callback; - TAILQ_ENTRY(conncb) tqe; - launch_t conn; - struct jobcb *j; - int disabled_batch:1, futureflags:31; -}; - -static TAILQ_HEAD(jobcbhead, jobcb) jobs = TAILQ_HEAD_INITIALIZER(jobs); -static TAILQ_HEAD(conncbhead, conncb) connections = TAILQ_HEAD_INITIALIZER(connections); -static int mainkq = 0; -static int asynckq = 0; -static int batch_disabler_count = 0; - -static launch_data_t load_job(launch_data_t pload); -static launch_data_t get_jobs(const char *which); -static launch_data_t setstdio(int d, launch_data_t o); -static launch_data_t adjust_rlimits(launch_data_t in); -static void batch_job_enable(bool e, struct conncb *c); -static void do_shutdown(void); - -static void listen_callback(void *, struct kevent *); static void async_callback(void); static void signal_callback(void *, struct kevent *); static void fs_callback(void); -static void simple_zombie_reaper(void *, struct kevent *); static void readcfg_callback(void *, struct kevent *); -static kq_callback kqlisten_callback = listen_callback; static kq_callback kqasync_callback = (kq_callback)async_callback; static kq_callback kqsignal_callback = signal_callback; static kq_callback kqfs_callback = (kq_callback)fs_callback; static kq_callback kqreadcfg_callback = readcfg_callback; -kq_callback kqsimple_zombie_reaper = simple_zombie_reaper; - -static void job_watch(struct jobcb *j); -static void job_ignore(struct jobcb *j); -static void job_start(struct jobcb *j); -static void job_start_child(struct jobcb *j, int execfd); -static void job_setup_attributes(struct jobcb *j); -static void job_stop(struct jobcb *j); -static void job_reap(struct jobcb *j); -static void job_remove(struct jobcb *j); -static void job_set_alarm(struct jobcb *j); -static launch_data_t job_export(struct jobcb *j); -static void job_callback(void *obj, struct kevent *kev); -static void job_log(struct jobcb *j, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4))); -static void job_log_error(struct jobcb *j, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4))); - -static void ipc_open(int fd, struct jobcb *j); -static void ipc_close(struct conncb *c); -static void ipc_callback(void *, struct kevent *); -static void ipc_readmsg(launch_data_t msg, void *context); -static void ipc_readmsg2(launch_data_t data, const char *cmd, void *context); +static kq_callback kqshutdown_callback = (kq_callback)launchd_shutdown; #ifdef PID1_REAP_ADOPTED_CHILDREN static void pid1waitpid(void); -static bool launchd_check_pid(pid_t p); #endif static void pid1_magic_init(bool sflag, bool vflag, bool xflag); -static void launchd_server_init(bool create_session); -static void conceive_firstborn(char *argv[]); +static struct jobcb *conceive_firstborn(char *argv[], const char *session_user); static void usage(FILE *where); -static int _fd(int fd); static void loopback_setup(void); +static void workaround3048875(int argc, char *argv[]); +static void testfd_or_openfd(int fd, const char *path, int flags); static void reload_launchd_config(void); -static int dir_has_files(const char *path); -static void setup_job_env(launch_data_t obj, const char *key, void *context); -static void unsetup_job_env(launch_data_t obj, const char *key, void *context); - -static size_t total_children = 0; +static int mainkq = 0; +static int asynckq = 0; static pid_t readcfg_pid = 0; -static pid_t launchd_proper_pid = 0; -static bool launchd_inited = false; -static bool shutdown_in_progress = false; +static bool re_exec_in_single_user_mode = false; +static char *pending_stdout = NULL; +static char *pending_stderr = NULL; +static struct jobcb *fbj = NULL; -sigset_t blocked_signals; - +/* Darwin's sigset_t datatype is a simple uint32_t */ #ifdef _BUILD_DARWIN_ - -#ifdef EVFILT_MACH_IMPLEMENTED -static void *mach_demand_loop(void *); -static void mach_callback(void *, struct kevent *); -static kq_callback kqmach_callback = mach_callback; +sigset_t blocked_signals = 0; +#else +/* FreeBSD's is a struct */ +uint32_t blocked_signals = 0; #endif +bool shutdown_in_progress = false; +int batch_disabler_count = 0; -// workaround for an OpenFirmware and Darwin kernel bug -static void workaround3048875(int argc, char *argv[]); -static pthread_t mach_server_loop_thread; -mach_port_t launchd_bootstrap_port = MACH_PORT_NULL; -blocked_signals = 0; -#endif - -static char *pending_stdout = NULL; -static char *pending_stderr = NULL; - -int main(int argc, char *argv[]) { +int main(int argc, char *argv[]) +{ static const int sigigns[] = { SIGHUP, SIGINT, SIGPIPE, SIGALRM, SIGTERM, SIGURG, SIGTSTP, SIGTSTP, SIGCONT, /*SIGCHLD,*/ SIGTTIN, SIGTTOU, SIGIO, SIGXCPU, SIGXFSZ, SIGVTALRM, SIGPROF, - SIGWINCH, SIGINFO, SIGUSR1, SIGUSR2 }; - void testfd_or_openfd(int fd, const char *path, int flags) { - int tmpfd; - - if (-1 != (tmpfd = dup(fd))) { - close(tmpfd); - } else { - if (-1 == (tmpfd = open(path, flags))) { - syslog(LOG_ERR, "open(\"%s\", ...): %m", path); - } else if (tmpfd != fd) { - dup2(tmpfd, fd); - close(tmpfd); - } - } + SIGWINCH, SIGINFO, SIGUSR1, SIGUSR2 }; + bool sflag = false, xflag = false, vflag = false, dflag = false; + const char *session_type = NULL; + const char *session_user = NULL; + const char *optargs = NULL; struct kevent kev; size_t i; - bool sflag = false, xflag = false, vflag = false, dflag = false; - int ch; + int ch, ker; + + /* main() phase one: sanitize the process */ -// workaround for that nasty OpenFirmware bug, zoinks! -#ifdef _BUILD_DARWIN_ - if (getpid() == 1) + if (getpid() == 1) { workaround3048875(argc, argv); -#endif + } else { + int sigi, fdi, dts = getdtablesize(); + sigset_t emptyset; - setegid(getgid()); - seteuid(getuid()); + for (fdi = STDERR_FILENO + 1; fdi < dts; fdi++) + launchd_assumes(close(fdi) == 0); + for (sigi = 1; sigi < NSIG; sigi++) + launchd_assumes(signal(sigi, SIG_DFL) != SIG_ERR); + sigemptyset(&emptyset); + launchd_assumes(sigprocmask(SIG_SETMASK, &emptyset, NULL) == 0); + } testfd_or_openfd(STDIN_FILENO, _PATH_DEVNULL, O_RDONLY); testfd_or_openfd(STDOUT_FILENO, _PATH_DEVNULL, O_WRONLY); testfd_or_openfd(STDERR_FILENO, _PATH_DEVNULL, O_WRONLY); - openlog(getprogname(), LOG_CONS|(getpid() != 1 ? LOG_PID|LOG_PERROR : 0), LOG_LAUNCHD); - setlogmask(LOG_UPTO(LOG_NOTICE)); - - while ((ch = getopt(argc, argv, "dhsvx")) != -1) { + /* main phase two: parse arguments */ + + if (getpid() == 1) { + optargs = "svx"; + } else if (getuid() == 0) { + optargs = "S:U:dh"; + } else { + optargs = "dh"; + } + + while ((ch = getopt(argc, argv, optargs)) != -1) { switch (ch) { - case 'd': dflag = true; break; - case 's': sflag = true; break; - case 'x': xflag = true; break; - case 'v': vflag = true; break; - case 'h': usage(stdout); break; + case 'S': session_type = optarg; break; /* what type of session we're creating */ + case 'U': session_user = optarg; break; /* which user to create a session as */ + case 'd': dflag = true; break; /* daemonize */ + case 's': sflag = true; break; /* single user */ + case 'x': xflag = true; break; /* safe boot */ + case 'v': vflag = true; break; /* verbose boot */ + case 'h': usage(stdout); break; /* help */ + case '?': /* we should do something with the global optopt variable here */ default: - syslog(LOG_WARNING, "ignoring unknown arguments"); + fprintf(stderr, "ignoring unknown arguments\n"); usage(stderr); break; } @@ -283,121 +194,149 @@ argc -= optind; argv += optind; - if (dflag && daemon(0, 0) == -1) - syslog(LOG_WARNING, "couldn't daemonize: %m"); + if ((session_type && !session_user) || (!session_user && session_type)) { + fprintf(stderr, "-S and -U must be used together\n"); + exit(EXIT_FAILURE); + } + + /* main phase three: if we need to become a user, do so ASAP */ + + if (session_user) { + struct passwd *pwe = getpwnam(session_user); + uid_t u = pwe ? pwe->pw_uid : 0; + gid_t g = pwe ? pwe->pw_gid : 0; + + if (pwe == NULL) { + fprintf(stderr, "lookup of user %s failed!\n", session_user); + exit(EXIT_FAILURE); + } + + launchd_assert(initgroups(session_user, g) != -1); + + launchd_assert(setgid(g) != -1); - if ((mainkq = kqueue()) == -1) { - syslog(LOG_EMERG, "kqueue(): %m"); - abort(); + launchd_assert(setuid(u) != -1); } - if ((asynckq = kqueue()) == -1) { - syslog(LOG_ERR, "kqueue(): %m"); - abort(); - } + /* main phase four: get the party started */ + + if (dflag) + launchd_assumes(daemon(0, 0) == 0); + + openlog(getprogname(), LOG_CONS|(getpid() != 1 ? LOG_PID|LOG_PERROR : 0), LOG_LAUNCHD); + setlogmask(LOG_UPTO(LOG_NOTICE)); + + launchd_assert((mainkq = kqueue()) != -1); + + launchd_assert((asynckq = kqueue()) != -1); - if (kevent_mod(asynckq, EVFILT_READ, EV_ADD, 0, 0, &kqasync_callback) == -1) { - syslog(LOG_ERR, "kevent_mod(asynckq, EVFILT_READ): %m"); - abort(); - } + launchd_assert(kevent_mod(asynckq, EVFILT_READ, EV_ADD, 0, 0, &kqasync_callback) != -1); sigemptyset(&blocked_signals); for (i = 0; i < (sizeof(sigigns) / sizeof(int)); i++) { - if (kevent_mod(sigigns[i], EVFILT_SIGNAL, EV_ADD, 0, 0, &kqsignal_callback) == -1) - syslog(LOG_ERR, "failed to add kevent for signal: %d: %m", sigigns[i]); + launchd_assumes(kevent_mod(sigigns[i], EVFILT_SIGNAL, EV_ADD, 0, 0, &kqsignal_callback) != -1); sigaddset(&blocked_signals, sigigns[i]); - signal(sigigns[i], SIG_IGN); + launchd_assumes(signal(sigigns[i], SIG_IGN) != SIG_ERR); } /* sigh... ignoring SIGCHLD has side effects: we can't call wait*() */ - if (kevent_mod(SIGCHLD, EVFILT_SIGNAL, EV_ADD, 0, 0, &kqsignal_callback) == -1) - syslog(LOG_ERR, "failed to add kevent for signal: %d: %m", SIGCHLD); - + launchd_assert(kevent_mod(SIGCHLD, EVFILT_SIGNAL, EV_ADD, 0, 0, &kqsignal_callback) != -1); + +#ifdef _BUILD_DARWIN_ + mach_init_init(); +#endif + + if (argv[0] || (session_type != NULL && 0 == strcasecmp(session_type, "tty"))) + fbj = conceive_firstborn(argv, session_user); + + if (NULL == getenv("PATH")) + setenv("PATH", _PATH_STDPATH, 1); + if (getpid() == 1) { pid1_magic_init(sflag, vflag, xflag); } else { -#ifdef _BUILD_DARWIN_ - launchd_bootstrap_port = bootstrap_port; -#endif - /* - * launchd_server_init() is called now if we're not assuming PID 1, - * i.e. all filesystems are mounted and marked rw; otherwise, we call - * launchd_server_init() from fs_callback() - */ - launchd_server_init(argv[0] ? true : false); + ipc_server_init(); } - /* this registers for the kqfs_callback (fs_callback()) function to be - * called when the mount table is updated, so we can call some PID 1 stuff */ - /* do this after pid1_magic_init() to not catch ourselves mounting stuff */ - if (kevent_mod(0, EVFILT_FS, EV_ADD, 0, 0, &kqfs_callback) == -1) - syslog(LOG_ERR, "kevent_mod(EVFILT_FS, &kqfs_callback): %m"); + launchd_assumes(kevent_mod(0, EVFILT_FS, EV_ADD, 0, 0, &kqfs_callback) != -1); + + if (session_type) { + pid_t pp = getppid(); + + /* As a per session launchd, we need to exit if our parent dies. + * + * Normally, in Unix, SIGHUP would cause us to exit, but we're a + * daemon, and daemons use SIGHUP to signal the need to reread + * configuration files. "Weee." + */ + + if (pp == 1) + exit(EXIT_SUCCESS); + ker = kevent_mod(pp, EVFILT_PROC, EV_ADD, 0, 0, &kqshutdown_callback); - if (argv[0]) - conceive_firstborn(argv); + if (ker == -1) + exit(launchd_assumes(errno == ESRCH) ? EXIT_SUCCESS : EXIT_FAILURE); + } reload_launchd_config(); - if (argv[0]) - job_start(TAILQ_FIRST(&jobs)); + if (fbj) + job_start(fbj); for (;;) { - static struct timespec timeout = { 30, 0 }; - struct timespec *timeoutp = NULL; + if (getpid() == 1 && readcfg_pid == 0) + init_pre_kevent(); + + if (shutdown_in_progress && total_children == 0) { + job_remove_all(); +#ifdef _BUILD_DARWIN_ + mach_init_reap(); +#endif + + shutdown_in_progress = false; - if (getpid() == 1) { - if (readcfg_pid == 0) - init_pre_kevent(); - } else { - /* in theory, this will make sure we don't exit if we - * have (a) any more jobs nd (b) open socket connections - * to say, something like, launchctl? ;) - */ - if (TAILQ_EMPTY(&jobs) && TAILQ_EMPTY(&connections)) { - /* liblaunch will restart us if we're needed again */ - timeoutp = &timeout; - } else if (shutdown_in_progress && total_children == 0) { + if (getpid() != 1) { exit(EXIT_SUCCESS); + } else if (re_exec_in_single_user_mode) { + re_exec_in_single_user_mode = false; + launchd_assumes(execl("/sbin/launchd", "/sbin/launchd", "-s", NULL) != -1); } } - - switch (kevent(mainkq, NULL, 0, &kev, 1, timeoutp)) { - case -1: - syslog(LOG_DEBUG, "kevent(): %m"); - break; - case 1: - (*((kq_callback *)kev.udata))(kev.udata, &kev); - break; - case 0: - /* we exit here if and once we're done processing all jobs - * assigned to us - */ - if (timeoutp) - exit(EXIT_SUCCESS); - else - syslog(LOG_DEBUG, "kevent(): spurious return with infinite timeout"); - break; - default: - syslog(LOG_DEBUG, "unexpected: kevent() returned something != 0, -1 or 1"); - break; - } + + if (launchd_assumes(kevent(mainkq, NULL, 0, &kev, 1, NULL) == 1)) + (*((kq_callback *)kev.udata))(kev.udata, &kev); } } static void pid1_magic_init(bool sflag, bool vflag, bool xflag) { - int memmib[2] = { CTL_HW, HW_PHYSMEM }; +#ifdef _BUILD_DARWIN_ + int memmib[2] = { CTL_HW, HW_MEMSIZE }; +#else + int memmib[2] = { CTL_HW, HW_REALMEM }; +#endif int mvnmib[2] = { CTL_KERN, KERN_MAXVNODES }; int hnmib[2] = { CTL_KERN, KERN_HOSTNAME }; uint64_t mem = 0; uint32_t mvn; size_t memsz = sizeof(mem); -#ifdef _BUILD_DARWIN_ - pthread_attr_t attr; - int pthr_r; +#ifdef KERN_TFP + struct group *tfp_gr; + + if (launchd_assumes((tfp_gr = getgrnam("procview")) != NULL)) { + int tfp_r_mib[3] = { CTL_KERN, KERN_TFP, KERN_TFP_READ_GROUP }; + gid_t tfp_r_gid = tfp_gr->gr_gid; + launchd_assumes(sysctl(tfp_r_mib, 3, NULL, NULL, &tfp_r_gid, sizeof(tfp_r_gid)) != -1); + } + + if (launchd_assumes((tfp_gr = getgrnam("procmod")) != NULL)) { + int tfp_rw_mib[3] = { CTL_KERN, KERN_TFP, KERN_TFP_RW_GROUP }; + gid_t tfp_rw_gid = tfp_gr->gr_gid; + launchd_assumes(sysctl(tfp_rw_mib, 3, NULL, NULL, &tfp_rw_gid, sizeof(tfp_rw_gid)) != -1); + } #endif setpriority(PRIO_PROCESS, 0, -1); @@ -411,1547 +350,141 @@ if (sysctl(memmib, 2, &mem, &memsz, NULL, 0) == -1) { syslog(LOG_WARNING, "sysctl(\"%s\"): %m", "hw.physmem"); } else { - /* The following assignment of mem to itself if the size - * of data returned is 32 bits instead of 64 is a clever - * C trick to move the 32 bits on big endian systems to - * the least significant bytes of the 64 mem variable. - * - * On little endian systems, this is effectively a no-op. - */ - if (memsz == 4) - mem = *(uint32_t *)&mem; mvn = mem / (64 * 1024) + 1024; - - // Performance note: change the max # of vnodes if (sysctl(mvnmib, 2, NULL, NULL, &mvn, sizeof(mvn)) == -1) syslog(LOG_WARNING, "sysctl(\"%s\"): %m", "kern.maxvnodes"); } - - // Performance note: set our hostname to localhost for now if (sysctl(hnmib, 2, NULL, NULL, "localhost", sizeof("localhost")) == -1) syslog(LOG_WARNING, "sysctl(\"%s\"): %m", "kern.hostname"); if (setlogin("root") == -1) syslog(LOG_ERR, "setlogin(\"root\"): %m"); - - // Performance note: setup our loopback interface inline + loopback_setup(); if (mount("fdesc", "/dev", MNT_UNION, NULL) == -1) syslog(LOG_ERR, "mount(\"%s\", \"%s\", ...): %m", "fdesc", "/dev/"); - setenv("PATH", _PATH_STDPATH, 1); -#ifdef _BUILD_DARWIN_ - launchd_bootstrap_port = mach_init_init(); - task_set_bootstrap_port(mach_task_self(), launchd_bootstrap_port); - bootstrap_port = MACH_PORT_NULL; - - pthread_attr_init(&attr); - pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); - - pthr_r = pthread_create(&mach_server_loop_thread, &attr, mach_server_loop, NULL); - if (pthr_r != 0) { - syslog(LOG_ERR, "pthread_create(mach_server_loop): %s", strerror(pthr_r)); - exit(EXIT_FAILURE); - } - - pthread_attr_destroy(&attr); -#endif - init_boot(sflag, vflag, xflag); } -#ifdef PID1_REAP_ADOPTED_CHILDREN -static bool launchd_check_pid(pid_t p) -{ - struct kevent kev; - struct jobcb *j; - TAILQ_FOREACH(j, &jobs, tqe) { - if (j->p == p) { - EV_SET(&kev, p, EVFILT_PROC, 0, 0, 0, j); - j->kqjob_callback(j, &kev); - return true; - } - } - - if (p == readcfg_pid) { - readcfg_callback(NULL, NULL); - return true; - } - - return false; -} -#endif - -static char *sockdir = NULL; -static char *sockpath = NULL; - -static void launchd_clean_up(void) +void usage(FILE *where) { - seteuid(0); - setegid(0); + const char *opts = "[-d]"; - if (-1 == unlink(sockpath)) - syslog(LOG_WARNING, "unlink(\"%s\"): %m", sockpath); - else if (-1 == rmdir(sockdir)) - syslog(LOG_WARNING, "rmdir(\"%s\"): %m", sockdir); + if (getuid() == 0) + opts = "[-d] [-S -U ]"; - setegid(getgid()); - seteuid(getuid()); -} + fprintf(where, "%s: %s [-- command [args ...]]\n", getprogname(), opts); -static void launchd_server_init(bool create_session) -{ - struct sockaddr_un sun; - mode_t oldmask; - int r, fd = -1, ourdirfd = -1; - char ourdir[1024]; + fprintf(where, "\t-d Daemonize.\n"); + fprintf(where, "\t-h This usage statement.\n"); - memset(&sun, 0, sizeof(sun)); - sun.sun_family = AF_UNIX; - - if (create_session) { - snprintf(ourdir, sizeof(ourdir), "%s/%u.%u", LAUNCHD_SOCK_PREFIX, getuid(), getpid()); - snprintf(sun.sun_path, sizeof(sun.sun_path), "%s/%u.%u/sock", LAUNCHD_SOCK_PREFIX, getuid(), getpid()); - setenv(LAUNCHD_SOCKET_ENV, sun.sun_path, 1); - } else { - snprintf(ourdir, sizeof(ourdir), "%s/%u", LAUNCHD_SOCK_PREFIX, getuid()); - snprintf(sun.sun_path, sizeof(sun.sun_path), "%s/%u/sock", LAUNCHD_SOCK_PREFIX, getuid()); - } - - seteuid(0); - setegid(0); - - if (mkdir(LAUNCHD_SOCK_PREFIX, S_IRWXU|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH) == -1) { - if (errno == EROFS) { - goto out_bad; - } else if (errno == EEXIST) { - struct stat sb; - stat(LAUNCHD_SOCK_PREFIX, &sb); - if (!S_ISDIR(sb.st_mode)) { - errno = EEXIST; - syslog(LOG_ERR, "mkdir(\"%s\"): %m", LAUNCHD_SOCK_PREFIX); - goto out_bad; - } - } else { - syslog(LOG_ERR, "mkdir(\"%s\"): %m", LAUNCHD_SOCK_PREFIX); - goto out_bad; - } + if (getuid() == 0) { + fprintf(where, "\t-S What type of session to create (Aqua, tty or X11).\n"); + fprintf(where, "\t-U Which user to create the session as.\n"); } - unlink(ourdir); - if (mkdir(ourdir, S_IRWXU) == -1) { - if (errno == EROFS) { - goto out_bad; - } else if (errno == EEXIST) { - struct stat sb; - stat(ourdir, &sb); - if (!S_ISDIR(sb.st_mode)) { - errno = EEXIST; - syslog(LOG_ERR, "mkdir(\"%s\"): %m", LAUNCHD_SOCK_PREFIX); - goto out_bad; - } - } else { - syslog(LOG_ERR, "mkdir(\"%s\"): %m", ourdir); - goto out_bad; - } - } - - if (chown(ourdir, getuid(), getgid()) == -1) - syslog(LOG_WARNING, "chown(\"%s\"): %m", ourdir); - - setegid(getgid()); - seteuid(getuid()); - - ourdirfd = _fd(open(ourdir, O_RDONLY)); - if (ourdirfd == -1) { - syslog(LOG_ERR, "open(\"%s\"): %m", ourdir); - goto out_bad; - } - - if (flock(ourdirfd, LOCK_EX|LOCK_NB) == -1) { - if (errno == EWOULDBLOCK) { - exit(EXIT_SUCCESS); - } else { - syslog(LOG_ERR, "flock(\"%s\"): %m", ourdir); - goto out_bad; - } - } - - if (unlink(sun.sun_path) == -1 && errno != ENOENT) { - if (errno != EROFS) - syslog(LOG_ERR, "unlink(\"thesocket\"): %m"); - goto out_bad; - } - if ((fd = _fd(socket(AF_UNIX, SOCK_STREAM, 0))) == -1) { - syslog(LOG_ERR, "socket(\"thesocket\"): %m"); - goto out_bad; - } - oldmask = umask(077); - r = bind(fd, (struct sockaddr *)&sun, sizeof(sun)); - umask(oldmask); - if (r == -1) { - if (errno != EROFS) - syslog(LOG_ERR, "bind(\"thesocket\"): %m"); - goto out_bad; - } - - if (listen(fd, SOMAXCONN) == -1) { - syslog(LOG_ERR, "listen(\"thesocket\"): %m"); - goto out_bad; - } - - if (kevent_mod(fd, EVFILT_READ, EV_ADD, 0, 0, &kqlisten_callback) == -1) { - syslog(LOG_ERR, "kevent_mod(\"thesocket\", EVFILT_READ): %m"); - goto out_bad; - } - - launchd_inited = true; - - sockdir = strdup(ourdir); - sockpath = strdup(sun.sun_path); - - launchd_proper_pid = getpid(); - atexit(launchd_clean_up); - -out_bad: - setegid(getgid()); - seteuid(getuid()); - - if (!launchd_inited) { - if (fd != -1) - close(fd); - if (ourdirfd != -1) - close(ourdirfd); - } -} - -static long long job_get_integer(launch_data_t j, const char *key) -{ - launch_data_t t = launch_data_dict_lookup(j, key); - if (t) - return launch_data_get_integer(t); - else - return 0; -} - -static const char *job_get_string(launch_data_t j, const char *key) -{ - launch_data_t t = launch_data_dict_lookup(j, key); - if (t) - return launch_data_get_string(t); - else - return NULL; -} - -static const char *job_get_file2exec(launch_data_t j) -{ - launch_data_t tmpi, tmp = launch_data_dict_lookup(j, LAUNCH_JOBKEY_PROGRAM); - - if (tmp) { - return launch_data_get_string(tmp); - } else { - tmp = launch_data_dict_lookup(j, LAUNCH_JOBKEY_PROGRAMARGUMENTS); - if (tmp) { - tmpi = launch_data_array_get_index(tmp, 0); - if (tmpi) - return launch_data_get_string(tmpi); - } - return NULL; - } -} - -static bool job_get_bool(launch_data_t j, const char *key) -{ - launch_data_t t = launch_data_dict_lookup(j, key); - if (t) - return launch_data_get_bool(t); - else - return false; -} - -static void ipc_open(int fd, struct jobcb *j) -{ - struct conncb *c = calloc(1, sizeof(struct conncb)); - - fcntl(fd, F_SETFL, O_NONBLOCK); - - c->kqconn_callback = ipc_callback; - c->conn = launchd_fdopen(fd); - c->j = j; - TAILQ_INSERT_TAIL(&connections, c, tqe); - kevent_mod(fd, EVFILT_READ, EV_ADD, 0, 0, &c->kqconn_callback); -} - -static void simple_zombie_reaper(void *obj __attribute__((unused)), struct kevent *kev) -{ - waitpid(kev->ident, NULL, 0); -} - -static void listen_callback(void *obj __attribute__((unused)), struct kevent *kev) -{ - struct sockaddr_un sun; - socklen_t sl = sizeof(sun); - int cfd; - - if ((cfd = _fd(accept(kev->ident, (struct sockaddr *)&sun, &sl))) == -1) { - return; - } - - ipc_open(cfd, NULL); -} - -static void ipc_callback(void *obj, struct kevent *kev) -{ - struct conncb *c = obj; - int r; - - if (kev->filter == EVFILT_READ) { - if (launchd_msg_recv(c->conn, ipc_readmsg, c) == -1 && errno != EAGAIN) { - if (errno != ECONNRESET) - syslog(LOG_DEBUG, "%s(): recv: %m", __func__); - ipc_close(c); - } - } else if (kev->filter == EVFILT_WRITE) { - r = launchd_msg_send(c->conn, NULL); - if (r == -1) { - if (errno != EAGAIN) { - syslog(LOG_DEBUG, "%s(): send: %m", __func__); - ipc_close(c); - } - } else if (r == 0) { - kevent_mod(launchd_getfd(c->conn), EVFILT_WRITE, EV_DELETE, 0, 0, NULL); - } - } else { - syslog(LOG_DEBUG, "%s(): unknown filter type!", __func__); - ipc_close(c); - } -} - -static void set_user_env(launch_data_t obj, const char *key, void *context __attribute__((unused))) -{ - setenv(key, launch_data_get_string(obj), 1); -} - -static void launch_data_close_fds(launch_data_t o) -{ - size_t i; - - switch (launch_data_get_type(o)) { - case LAUNCH_DATA_DICTIONARY: - launch_data_dict_iterate(o, (void (*)(launch_data_t, const char *, void *))launch_data_close_fds, NULL); - break; - case LAUNCH_DATA_ARRAY: - for (i = 0; i < launch_data_array_get_count(o); i++) - launch_data_close_fds(launch_data_array_get_index(o, i)); - break; - case LAUNCH_DATA_FD: - if (launch_data_get_fd(o) != -1) - close(launch_data_get_fd(o)); - break; - default: - break; - } -} >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 1 10:45:54 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BDDE16A421; Tue, 1 Nov 2005 10:45:53 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 62CA316A41F for ; Tue, 1 Nov 2005 10:45:53 +0000 (GMT) (envelope-from soc-tyler@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC51643D49 for ; Tue, 1 Nov 2005 10:45:52 +0000 (GMT) (envelope-from soc-tyler@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jA1AjqXw043861 for ; Tue, 1 Nov 2005 10:45:52 GMT (envelope-from soc-tyler@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA1Ajq4x043858 for perforce@freebsd.org; Tue, 1 Nov 2005 10:45:52 GMT (envelope-from soc-tyler@freebsd.org) Date: Tue, 1 Nov 2005 10:45:52 GMT Message-Id: <200511011045.jA1Ajq4x043858@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-tyler@freebsd.org using -f From: soc-tyler To: Perforce Change Reviews Cc: Subject: PERFORCE change 86163 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, 01 Nov 2005 10:45:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=86163 Change 86163 by soc-tyler@soc-tyler_launchd on 2005/11/01 10:45:06 Assuming PID 1 has been bumped down on the priority list. Might as well not build that nonsense into launchd(8) Affected files ... .. //depot/projects/soc2005/launchd/Makefile#22 edit .. //depot/projects/soc2005/launchd/launchd.c#26 edit Differences ... ==== //depot/projects/soc2005/launchd/Makefile#22 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= launchd -SRCS= launchd.c liblaunch.c init.c +SRCS= launchd.c liblaunch.c launchd_unix_ipc.c launchd_core_logic.c init.c #launchdebugd.c launchproxy.c MAN= launchd.8 @@ -11,11 +11,11 @@ NO_SHARED?= YES -CFLAGS+= -g -Wall -W -Wshadow -Wpadded -Iincludes +CFLAGS+= -g -Wall -Iincludes # init.c related CFLAGS (from src/sbin/init/Makefile) # -DSECURE to make secure single-user logins (enter root passwd, etc) # -DDEBUGSHELL ? we don't need no stinkin' DEBUGSHELL -CFLAGS+= -DLOGIN_CAP -DCOMPAT_SYSV_INIT -D_BE_INIT_ \ +CFLAGS+= -DLOGIN_CAP -DCOMPAT_SYSV_INIT \ -DLAUNCHD_PATH=`echo \"$$PWD/launchd\"` \ -DLAUNCHCTL_PATH=`echo \"$$PWD/launchctl/launchctl\"` # defining LAUNCHD_PATH and LAUNCHCTL_PATH is for development only ==== //depot/projects/soc2005/launchd/launchd.c#26 (text+ko) ==== @@ -731,9 +731,11 @@ launchd_assumes(close(s6) == 0); } +/* this is a workaround for an openfirmware bug */ void workaround3048875(int argc, char *argv[]) { +#ifdef _BUILD_DARWIN_ int i; char **ap, *newargv[100], *p = argv[1]; @@ -754,6 +756,7 @@ return; execv(newargv[0], newargv); +#endif } #ifdef _BUILD_DARWIN_ From owner-p4-projects@FreeBSD.ORG Tue Nov 1 15:43:24 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3431C16A423; Tue, 1 Nov 2005 15:43:24 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D416F16A41F for ; Tue, 1 Nov 2005 15:43:23 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8723943D46 for ; Tue, 1 Nov 2005 15:43:23 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jA1FhN6D064502 for ; Tue, 1 Nov 2005 15:43:23 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA1FhNkl064499 for perforce@freebsd.org; Tue, 1 Nov 2005 15:43:23 GMT (envelope-from millert@freebsd.org) Date: Tue, 1 Nov 2005 15:43:23 GMT Message-Id: <200511011543.jA1FhNkl064499@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 86185 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, 01 Nov 2005 15:43:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=86185 Change 86185 by millert@millert_ibook on 2005/11/01 15:42:33 Enable locking inside flask using mutexes. The selinux code uses spinlock but SEBSD uses mutexes. SEDarwin can use either but we'll use mutexes for now. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.c#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/linux-compat.h#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.c#5 (text+ko) ==== @@ -30,6 +30,10 @@ #include #include #include +#include +#ifdef __APPLE__ +#include +#endif int selinux_enforcing = 0; @@ -68,7 +72,10 @@ struct avc_callback_node *next; }; -#ifndef __APPLE__ +#ifdef __APPLE__ +static mutex_t *avc_lock; +static mutex_t *avc_log_lock; +#else static struct mtx avc_lock; static struct mtx avc_log_lock; #endif @@ -219,8 +226,13 @@ if (!avc_audit_buffer) panic("AVC: unable to allocate audit buffer\n"); +#ifdef __APPLE__ + avc_lock = mutex_alloc(ETAP_NO_TRACE); + avc_log_lock = mutex_alloc(ETAP_NO_TRACE); +#else mtx_init(&avc_lock, "SEBSD AVC", NULL, MTX_DEF); mtx_init(&avc_log_lock, "SEBSD message lock", NULL, MTX_DEF); +#endif size_t evsize; char *ev; ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/linux-compat.h#8 (text+ko) ==== @@ -140,21 +140,21 @@ #define GFP_KERNEL M_WAITOK #ifdef __APPLE__ -/* TBD: Skip this for now: */ -#define mtx_init(a,b,c,d) - /* TBD: no boot-time tunable support yet */ #define TUNABLE_INT_FETCH(str,var) -/* TBD: scary, but skip locking for now */ -#define mtx_lock(m) -#define mtx_unlock(m) -#endif +/* spinlock */ +#define spinlock_t mutex_t * +#define spin_lock_irqsave(m,flags) mutex_lock(*(m)) +#define spin_unlock_irqrestore(m,flags) mutex_unlock(*(m)) + +#else /* ! __APPLE__ */ /* spinlock */ #define spinlock_t struct mtx #define spin_lock_irqsave(m,flags) mtx_lock(m) #define spin_unlock_irqrestore(m,flags) mtx_unlock(m) +#endif /* !__APPLE__ */ #endif /* _KERNEL */ From owner-p4-projects@FreeBSD.ORG Tue Nov 1 20:17:09 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B82316A42A; Tue, 1 Nov 2005 20:17:08 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6E39716A41F for ; Tue, 1 Nov 2005 20:17:08 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E776143D4C for ; Tue, 1 Nov 2005 20:17:05 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jA1KH5kY084042 for ; Tue, 1 Nov 2005 20:17:05 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA1KH5KZ084039 for perforce@freebsd.org; Tue, 1 Nov 2005 20:17:05 GMT (envelope-from jhb@freebsd.org) Date: Tue, 1 Nov 2005 20:17:05 GMT Message-Id: <200511012017.jA1KH5KZ084039@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 86196 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, 01 Nov 2005 20:17:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=86196 Change 86196 by jhb@jhb_slimer on 2005/11/01 20:16:37 IFC @86194. Affected files ... .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#35 integrate .. //depot/projects/smpng/sys/conf/files#156 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_hpet.c#1 branch .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#59 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#85 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#103 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#46 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#62 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi/Makefile#10 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#30 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#42 integrate .. //depot/projects/smpng/sys/pci/if_vrreg.h#11 integrate .. //depot/projects/smpng/sys/sys/ktrace.h#11 integrate .. //depot/projects/smpng/sys/sys/signal.h#20 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#66 integrate Differences ... ==== //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#35 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.79 2005/10/26 20:21:45 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.80 2005/11/01 09:24:35 wpaul Exp $"); #include #include @@ -285,7 +285,11 @@ if (wq_queues == NULL) return(ENOMEM); +#ifdef NTOSKRNL_MULTIPLE_DPCS bzero((char *)kq_queues, sizeof(kdpc_queue) * mp_ncpus); +#else + bzero((char *)kq_queues, sizeof(kdpc_queue)); +#endif bzero((char *)wq_queues, sizeof(kdpc_queue) * WORKITEM_THREADS); /* ==== //depot/projects/smpng/sys/conf/files#156 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1061 2005/10/28 15:58:17 joerg Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1062 2005/10/31 21:40:40 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -410,6 +410,7 @@ dev/acpica/acpi_cmbat.c optional acpi dev/acpica/acpi_cpu.c optional acpi dev/acpica/acpi_ec.c optional acpi +dev/acpica/acpi_hpet.c optional acpi dev/acpica/acpi_isab.c optional acpi isa dev/acpica/acpi_lid.c optional acpi dev/acpica/acpi_package.c optional acpi ==== //depot/projects/smpng/sys/dev/acpica/acpivar.h#59 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.96 2005/07/23 19:35:59 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.97 2005/11/01 15:57:15 scottl Exp $ */ #ifndef _ACPIVAR_H_ @@ -154,6 +154,7 @@ #define ACPI_THERMAL 0x01000000 #define ACPI_TIMER 0x02000000 #define ACPI_OEM 0x04000000 +#define ACPI_HPET 0x08000000 /* * Constants for different interrupt models used with acpi_SetIntrModel(). ==== //depot/projects/smpng/sys/kern/kern_descrip.c#85 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.282 2005/10/31 15:41:25 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.283 2005/11/01 17:13:05 jhb Exp $"); #include "opt_compat.h" @@ -1525,10 +1525,10 @@ { struct filedesc *fdp; struct file **fpp; - int i; + int i, locked; struct filedesc_to_leader *fdtol; struct file *fp; - struct vnode *vp; + struct vnode *cdir, *jdir, *rdir, *vp; struct flock lf; /* Certain daemons might not have file descriptors. */ @@ -1559,13 +1559,14 @@ lf.l_len = 0; lf.l_type = F_UNLCK; vp = fp->f_vnode; - VFS_ASSERT_GIANT(vp->v_mount); + locked = VFS_LOCK_GIANT(vp->v_mount); (void) VOP_ADVLOCK(vp, (caddr_t)td->td_proc-> p_leader, F_UNLCK, &lf, F_POSIX); + VFS_UNLOCK_GIANT(locked); FILEDESC_LOCK(fdp); fdrop(fp, td); fpp = fdp->fd_ofiles + i; @@ -1635,17 +1636,29 @@ fdp->fd_nfiles = 0; - if (fdp->fd_cdir) - vrele(fdp->fd_cdir); + cdir = fdp->fd_cdir; fdp->fd_cdir = NULL; - if (fdp->fd_rdir) - vrele(fdp->fd_rdir); + rdir = fdp->fd_rdir; fdp->fd_rdir = NULL; - if (fdp->fd_jdir) - vrele(fdp->fd_jdir); + jdir = fdp->fd_jdir; fdp->fd_jdir = NULL; + FILEDESC_UNLOCK(fdp); - FILEDESC_UNLOCK(fdp); + if (cdir) { + locked = VFS_LOCK_GIANT(cdir->v_mount); + vrele(cdir); + VFS_UNLOCK_GIANT(locked); + } + if (rdir) { + locked = VFS_LOCK_GIANT(rdir->v_mount); + vrele(rdir); + VFS_UNLOCK_GIANT(locked); + } + if (jdir) { + locked = VFS_LOCK_GIANT(jdir->v_mount); + vrele(jdir); + VFS_UNLOCK_GIANT(locked); + } fddrop(fdp); } ==== //depot/projects/smpng/sys/kern/kern_exit.c#103 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.269 2005/10/26 07:18:36 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.270 2005/11/01 17:13:05 jhb Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -235,6 +235,7 @@ */ mtx_lock(&Giant); /* XXX: not sure if needed */ funsetownlst(&p->p_sigiolst); + mtx_unlock(&Giant); /* * If this process has an nlminfo data area (for lockd), release it @@ -247,7 +248,6 @@ * This may block! */ fdfree(td); - mtx_unlock(&Giant); /* * If this thread tickled GEOM, we need to wait for the giggling to ==== //depot/projects/smpng/sys/kern/kern_ktrace.c#46 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.101 2005/06/24 12:05:24 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.103 2005/11/01 14:46:37 rwatson Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -64,6 +64,7 @@ struct ktr_request { struct ktr_header ktr_header; + void *ktr_buffer; struct ucred *ktr_cred; struct vnode *ktr_vp; union { @@ -236,8 +237,9 @@ mtx_unlock(&ktrace_mtx); microtime(&req->ktr_header.ktr_time); req->ktr_header.ktr_pid = p->p_pid; + req->ktr_header.ktr_tid = td->td_tid; bcopy(p->p_comm, req->ktr_header.ktr_comm, MAXCOMLEN + 1); - req->ktr_header.ktr_buffer = NULL; + req->ktr_buffer = NULL; req->ktr_header.ktr_len = 0; } else { p->p_traceflag |= KTRFAC_DROP; @@ -272,8 +274,8 @@ vrele(req->ktr_vp); mtx_unlock(&Giant); } - if (req->ktr_header.ktr_buffer != NULL) - free(req->ktr_header.ktr_buffer, M_KTRACE); + if (req->ktr_buffer != NULL) + free(req->ktr_buffer, M_KTRACE); mtx_lock(&ktrace_mtx); STAILQ_INSERT_HEAD(&ktr_free, req, ktr_list); mtx_unlock(&ktrace_mtx); @@ -340,7 +342,7 @@ ktp->ktr_narg = narg; if (buflen > 0) { req->ktr_header.ktr_len = buflen; - req->ktr_header.ktr_buffer = buf; + req->ktr_buffer = buf; } ktr_submitrequest(req); } @@ -387,7 +389,7 @@ } if (namelen > 0) { req->ktr_header.ktr_len = namelen; - req->ktr_header.ktr_buffer = buf; + req->ktr_buffer = buf; } ktr_submitrequest(req); } @@ -436,7 +438,7 @@ ktg->ktr_fd = fd; ktg->ktr_rw = rw; req->ktr_header.ktr_len = datalen; - req->ktr_header.ktr_buffer = buf; + req->ktr_buffer = buf; ktr_submitrequest(req); } @@ -684,7 +686,7 @@ free(cp, M_KTRACE); return (ENOMEM); } - req->ktr_header.ktr_buffer = cp; + req->ktr_buffer = cp; req->ktr_header.ktr_len = uap->len; ktr_submitrequest(req); return (0); @@ -827,8 +829,8 @@ kth->ktr_len += datalen; } if (buflen != 0) { - KASSERT(kth->ktr_buffer != NULL, ("ktrace: nothing to write")); - aiov[auio.uio_iovcnt].iov_base = kth->ktr_buffer; + KASSERT(req->ktr_buffer != NULL, ("ktrace: nothing to write")); + aiov[auio.uio_iovcnt].iov_base = req->ktr_buffer; aiov[auio.uio_iovcnt].iov_len = buflen; auio.uio_resid += buflen; auio.uio_iovcnt++; ==== //depot/projects/smpng/sys/kern/vfs_aio.c#62 (text+ko) ==== @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_aio.c,v 1.199 2005/10/30 02:12:49 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_aio.c,v 1.200 2005/11/01 17:13:05 jhb Exp $"); #include #include @@ -894,10 +894,8 @@ * Get rid of our current filedescriptors. AIOD's don't need any * filedescriptors, except as temporarily inherited from the client. */ - mtx_lock(&Giant); fdfree(td); - mtx_unlock(&Giant); /* The daemon resides in its own pgrp. */ MALLOC(newpgrp, struct pgrp *, sizeof(struct pgrp), M_PGRP, M_WAITOK | M_ZERO); ==== //depot/projects/smpng/sys/modules/acpi/acpi/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/acpi/acpi/Makefile,v 1.13 2005/10/23 00:22:02 njl Exp $ +# $FreeBSD: src/sys/modules/acpi/acpi/Makefile,v 1.14 2005/10/31 21:40:40 phk Exp $ .PATH: ${.CURDIR}/../../../contrib/dev/acpica \ ${.CURDIR}/../../../pci \ @@ -42,7 +42,8 @@ # ACPI hardware drivers, mostly used for mobile systems. SRCS+= acpi_acad.c acpi_battery.c acpi_cmbat.c acpi_cpu.c -SRCS+= acpi_ec.c acpi_lid.c acpi_perf.c acpi_smbat.c acpi_throttle.c +SRCS+= acpi_ec.c acpi_hpet.c acpi_lid.c acpi_perf.c acpi_smbat.c +SRCS+= acpi_throttle.c # OSD layer SRCS+= OsdDebug.c ==== //depot/projects/smpng/sys/netinet6/in6.c#30 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/in6.c,v 1.58 2005/10/22 05:07:16 suz Exp $ */ +/* $FreeBSD: src/sys/netinet6/in6.c,v 1.59 2005/10/31 23:06:04 suz Exp $ */ /* $KAME: in6.c,v 1.259 2002/01/21 11:37:50 keiichi Exp $ */ /*- @@ -641,6 +641,14 @@ */ if ((error = in6_update_ifa(ifp, ifra, ia, 0)) != 0) return (error); + if ((ia = in6ifa_ifpwithaddr(ifp, &ifra->ifra_addr.sin6_addr)) + == NULL) { + /* + * this can happen when the user specify the 0 valid + * lifetime. + */ + break; + } /* * then, make the prefix on-link on the interface. @@ -693,41 +701,33 @@ return (EINVAL); /* XXX panic here? */ } } - if ((ia = in6ifa_ifpwithaddr(ifp, &ifra->ifra_addr.sin6_addr)) - == NULL) { - /* XXX: this should not happen! */ - log(LOG_ERR, "in6_control: addition succeeded, but" - " no ifaddr\n"); - } else { - if ((ia->ia6_flags & IN6_IFF_AUTOCONF) != 0 && - ia->ia6_ndpr == NULL) { /* new autoconfed addr */ - ia->ia6_ndpr = pr; - pr->ndpr_refcnt++; - /* - * If this is the first autoconf address from - * the prefix, create a temporary address - * as well (when specified). - */ - if (ip6_use_tempaddr && - pr->ndpr_refcnt == 1) { - int e; - if ((e = in6_tmpifadd(ia, 1, 0)) != 0) { - log(LOG_NOTICE, "in6_control: " - "failed to create a " - "temporary address, " - "errno=%d\n", e); - } - } - } + /* relate the address to the prefix */ + if (ia->ia6_ndpr == NULL) { + ia->ia6_ndpr = pr; + pr->ndpr_refcnt++; /* - * this might affect the status of autoconfigured - * addresses, that is, this address might make - * other addresses detached. + * If this is the first autoconf address from the + * prefix, create a temporary address as well + * (when required). */ - pfxlist_onlink_check(); + if ((ia->ia6_flags & IN6_IFF_AUTOCONF) && + ip6_use_tempaddr && pr->ndpr_refcnt == 1) { + int e; + if ((e = in6_tmpifadd(ia, 1, 0)) != 0) { + log(LOG_NOTICE, "in6_control: failed " + "to create a temporary address, " + "errno=%d\n", e); + } + } } + + /* + * this might affect the status of autoconfigured addresses, + * that is, this address might make other addresses detached. + */ + pfxlist_onlink_check(); if (error == 0 && ia) EVENTHANDLER_INVOKE(ifaddr_event, ifp); break; @@ -735,8 +735,6 @@ case SIOCDIFADDR_IN6: { - int i = 0; - struct nd_prefixctl pr0; struct nd_prefix *pr; /* @@ -747,37 +745,12 @@ * and the prefix management. We do this, however, to provide * as much backward compatibility as possible in terms of * the ioctl operation. + * Note that in6_purgeaddr() will decrement ndpr_refcnt. */ - bzero(&pr0, sizeof(pr0)); - pr0.ndpr_ifp = ifp; - pr0.ndpr_plen = in6_mask2len(&ia->ia_prefixmask.sin6_addr, - NULL); - if (pr0.ndpr_plen == 128) - goto purgeaddr; - pr0.ndpr_prefix = ia->ia_addr; - /* apply the mask for safety. */ - for (i = 0; i < 4; i++) { - pr0.ndpr_prefix.sin6_addr.s6_addr32[i] &= - ifra->ifra_prefixmask.sin6_addr.s6_addr32[i]; - } - /* - * The logic of the following condition is a bit complicated. - * We expire the prefix when - * 1. the address obeys autoconfiguration and it is the - * only owner of the associated prefix, or - * 2. the address does not obey autoconf and there is no - * other owner of the prefix. - */ - if ((pr = nd6_prefix_lookup(&pr0)) != NULL && - (((ia->ia6_flags & IN6_IFF_AUTOCONF) != 0 && - pr->ndpr_refcnt == 1) || - ((ia->ia6_flags & IN6_IFF_AUTOCONF) == 0 && - pr->ndpr_refcnt == 0))) { - pr->ndpr_expire = 1; /* XXX: just for expiration */ - } - - purgeaddr: + pr = ia->ia6_ndpr; in6_purgeaddr(&ia->ia_ifa); + if (pr && pr->ndpr_refcnt == 0) + prelist_remove(pr); EVENTHANDLER_INVOKE(ifaddr_event, ifp); break; } @@ -1399,21 +1372,24 @@ } /* - * When an autoconfigured address is being removed, release the - * reference to the base prefix. Also, since the release might - * affect the status of other (detached) addresses, call - * pfxlist_onlink_check(). + * Release the reference to the base prefix. There should be a + * positive reference. */ - if ((oia->ia6_flags & IN6_IFF_AUTOCONF) != 0) { - if (oia->ia6_ndpr == NULL) { - nd6log((LOG_NOTICE, "in6_unlink_ifa: autoconf'ed address " - "%p has no prefix\n", oia)); - } else { - oia->ia6_ndpr->ndpr_refcnt--; - oia->ia6_flags &= ~IN6_IFF_AUTOCONF; - oia->ia6_ndpr = NULL; - } + if (oia->ia6_ndpr == NULL) { + nd6log((LOG_NOTICE, + "in6_unlink_ifa: autoconf'ed address " + "%p has no prefix\n", oia)); + } else { + oia->ia6_ndpr->ndpr_refcnt--; + oia->ia6_ndpr = NULL; + } + /* + * Also, if the address being removed is autoconf'ed, call + * pfxlist_onlink_check() since the release might affect the status of + * other (detached) addresses. + */ + if ((oia->ia6_flags & IN6_IFF_AUTOCONF)) { pfxlist_onlink_check(); } ==== //depot/projects/smpng/sys/pci/if_vr.c#42 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_vr.c,v 1.112 2005/10/27 21:18:37 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_vr.c,v 1.113 2005/10/31 21:37:27 jhb Exp $"); /* * VIA Rhine fast ethernet PCI NIC driver @@ -655,6 +655,8 @@ mtx_init(&sc->vr_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF); + callout_init_mtx(&sc->vr_stat_callout, &sc->vr_mtx, 0); + /* * Map control/status registers. */ @@ -755,8 +757,6 @@ goto fail; } - callout_handle_init(&sc->vr_stat_ch); - /* Call MI attach routine. */ ether_ifattach(ifp, eaddr); @@ -799,16 +799,14 @@ ether_poll_deregister(ifp); #endif - VR_LOCK(sc); - - sc->suspended = 1; - /* These should only be active if attach succeeded */ if (device_is_attached(dev)) { + VR_LOCK(sc); + sc->suspended = 1; vr_stop(sc); - VR_UNLOCK(sc); /* XXX: Avoid recursive acquire. */ + VR_UNLOCK(sc); + callout_drain(&sc->vr_stat_callout); ether_ifdetach(ifp); - VR_LOCK(sc); } if (sc->vr_miibus) device_delete_child(dev, sc->vr_miibus); @@ -827,7 +825,6 @@ if (sc->vr_ldata) contigfree(sc->vr_ldata, sizeof(struct vr_list_data), M_DEVBUF); - VR_UNLOCK(sc); mtx_destroy(&sc->vr_mtx); return (0); @@ -1128,7 +1125,7 @@ struct vr_softc *sc = xsc; struct mii_data *mii; - VR_LOCK(sc); + VR_LOCK_ASSERT(sc); if (sc->vr_flags & VR_F_RESTART) { if_printf(sc->vr_ifp, "restarting\n"); @@ -1140,9 +1137,7 @@ mii = device_get_softc(sc->vr_miibus); mii_tick(mii); - sc->vr_stat_ch = timeout(vr_tick, sc, hz); - - VR_UNLOCK(sc); + callout_reset(&sc->vr_stat_callout, hz, vr_tick, sc); } #ifdef DEVICE_POLLING @@ -1532,7 +1527,7 @@ ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - sc->vr_stat_ch = timeout(vr_tick, sc, hz); + callout_reset(&sc->vr_stat_callout, hz, vr_tick, sc); } /* @@ -1668,7 +1663,7 @@ ifp = sc->vr_ifp; ifp->if_timer = 0; - untimeout(vr_tick, sc, sc->vr_stat_ch); + callout_stop(&sc->vr_stat_callout); ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); VR_SETBIT16(sc, VR_COMMAND, VR_CMD_STOP); ==== //depot/projects/smpng/sys/pci/if_vrreg.h#11 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_vrreg.h,v 1.23 2005/10/27 21:18:37 jhb Exp $ + * $FreeBSD: src/sys/pci/if_vrreg.h,v 1.24 2005/10/31 21:37:27 jhb Exp $ */ /* @@ -465,7 +465,7 @@ u_int8_t vr_flags; /* See VR_F_* below */ struct vr_list_data *vr_ldata; struct vr_chain_data vr_cdata; - struct callout_handle vr_stat_ch; + struct callout vr_stat_callout; struct mtx vr_mtx; int suspended; /* if 1, sleeping/detaching */ #ifdef DEVICE_POLLING ==== //depot/projects/smpng/sys/sys/ktrace.h#11 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ktrace.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/sys/sys/ktrace.h,v 1.29 2005/01/07 02:29:23 imp Exp $ + * $FreeBSD: src/sys/sys/ktrace.h,v 1.31 2005/11/01 14:46:37 rwatson Exp $ */ #ifndef _SYS_KTRACE_H_ @@ -54,7 +54,7 @@ pid_t ktr_pid; /* process id */ char ktr_comm[MAXCOMLEN+1]; /* command name */ struct timeval ktr_time; /* timestamp */ - void *ktr_buffer; + intptr_t ktr_tid; /* was ktr_buffer */ }; /* ==== //depot/projects/smpng/sys/sys/signal.h#20 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)signal.h 8.4 (Berkeley) 5/4/95 - * $FreeBSD: src/sys/sys/signal.h,v 1.49 2005/10/30 02:12:48 davidxu Exp $ + * $FreeBSD: src/sys/sys/signal.h,v 1.50 2005/11/01 03:14:39 davidxu Exp $ */ #ifndef _SYS_SIGNAL_H_ @@ -109,7 +109,7 @@ #define SIGUSR2 31 /* user defined signal 2 */ #endif #if __BSD_VISIBLE -#define SIGTHR 32 /* Thread interrupt. */ +#define SIGTHR 32 /* reserved by thread library. */ #endif #define SIGRTMIN 65 ==== //depot/projects/smpng/sys/vm/vm_page.c#66 (text+ko) ==== @@ -97,7 +97,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.306 2005/10/08 21:03:54 des Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.307 2005/11/01 04:30:21 alc Exp $"); #include #include @@ -1677,6 +1677,8 @@ mnew->valid = VM_PAGE_BITS_ALL; vm_page_dirty(mnew); vm_page_flag_clear(mnew, PG_BUSY); + mnew->wire_count = m->wire_count - m->cow; + m->wire_count = m->cow; } } From owner-p4-projects@FreeBSD.ORG Wed Nov 2 14:51:26 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1925916A421; Wed, 2 Nov 2005 14:51:26 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CF89E16A41F for ; Wed, 2 Nov 2005 14:51:25 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8723943D48 for ; Wed, 2 Nov 2005 14:51:25 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jA2EpPWX081949 for ; Wed, 2 Nov 2005 14:51:25 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA2EpPxv081946 for perforce@freebsd.org; Wed, 2 Nov 2005 14:51:25 GMT (envelope-from wsalamon@computer.org) Date: Wed, 2 Nov 2005 14:51:25 GMT Message-Id: <200511021451.jA2EpPxv081946@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 86230 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, 02 Nov 2005 14:51:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=86230 Change 86230 by wsalamon@gretsch on 2005/11/02 14:50:43 Create a file to track auditing that needs to be done from userspace. Affected files ... .. //depot/projects/trustedbsd/audit3/notes/userspace_audit.tsv#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Nov 2 15:10:50 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB3D916A420; Wed, 2 Nov 2005 15:10:49 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9DF0016A421 for ; Wed, 2 Nov 2005 15:10:49 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4230343D5F for ; Wed, 2 Nov 2005 15:10:49 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jA2FAn2j082670 for ; Wed, 2 Nov 2005 15:10:49 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA2FAm6g082665 for perforce@freebsd.org; Wed, 2 Nov 2005 15:10:48 GMT (envelope-from millert@freebsd.org) Date: Wed, 2 Nov 2005 15:10:48 GMT Message-Id: <200511021510.jA2FAm6g082665@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 86231 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, 02 Nov 2005 15:10:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=86231 Change 86231 by millert@millert_ibook on 2005/11/02 15:10:17 Add deker and millert Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/users#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/users#3 (text+ko) ==== @@ -4,4 +4,6 @@ user andrew roles { user_r user_secret_r }; user rwatson roles { user_r user_secret_r }; user cvance roles { user_r user_secret_r }; +user millert roles { user_r user_secret_r }; +user deker roles { user_r user_secret_r }; user test roles { user_r user_secret_r }; From owner-p4-projects@FreeBSD.ORG Wed Nov 2 17:29:52 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A45716A421; Wed, 2 Nov 2005 17:29:51 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4960116A420 for ; Wed, 2 Nov 2005 17:29:51 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33F1143D62 for ; Wed, 2 Nov 2005 17:29:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jA2HTlOB095810 for ; Wed, 2 Nov 2005 17:29:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA2HTleT095807 for perforce@freebsd.org; Wed, 2 Nov 2005 17:29:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 2 Nov 2005 17:29:47 GMT Message-Id: <200511021729.jA2HTleT095807@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 86239 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, 02 Nov 2005 17:29:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=86239 Change 86239 by rwatson@rwatson_zoo on 2005/11/02 17:29:20 When hinted not to preempt, also don't IPI. Affected files ... .. //depot/projects/netsmp/src/sys/kern/sched_4bsd.c#3 edit Differences ... ==== //depot/projects/netsmp/src/sys/kern/sched_4bsd.c#3 (text+ko) ==== @@ -1159,29 +1159,40 @@ cpu = NOCPU; ke->ke_runq = &runq; } - - if (single_cpu && (cpu != PCPU_GET(cpuid))) { - kick_other_cpu(td->td_priority,cpu); - } else { - - if (!single_cpu) { - cpumask_t me = PCPU_GET(cpumask); - int idle = idle_cpus_mask & me; + + /* + * Once we've established where to schedule the thread, we have to + * decide if we want to preempt the current thread, or IPI another + * CPU to start immediate execution there. + * + * Currently, suppressing preemption on the scheduling also + * suppresses IPIs to shedule on another CPU, as it is assumed that + * starting the thread running at once will result in poor timing of + * events, lock contention, etc. + */ + if (!(flags & SRQ_NOPREEMPT)) { + if (single_cpu && (cpu != PCPU_GET(cpuid))) { + kick_other_cpu(td->td_priority,cpu); + } else { + if (!single_cpu) { + cpumask_t me = PCPU_GET(cpumask); + int idle = idle_cpus_mask & me; - if (!idle && ((flags & SRQ_INTR) == 0) && - (idle_cpus_mask & ~(hlt_cpus_mask | me))) - forwarded = forward_wakeup(cpu); - } + if (!idle && ((flags & SRQ_INTR) == 0) && + (idle_cpus_mask & ~(hlt_cpus_mask | me))) + forwarded = forward_wakeup(cpu); + } - if (!forwarded) { - if ((flags & SRQ_YIELDING) == 0 && - (flags & SRQ_NOPREEMPT) == 0 && - maybe_preempt(td)) - return; - else - maybe_resched(td); + if (!forwarded) { + if ((flags & SRQ_YIELDING) == 0 && + maybe_preempt(td)) + return; + else + maybe_resched(td); + } } - } + } else + maybe_resched(td); if ((td->td_proc->p_flag & P_NOLOAD) == 0) sched_load_add(); From owner-p4-projects@FreeBSD.ORG Wed Nov 2 20:28:34 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C78816A421; Wed, 2 Nov 2005 20:28:34 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DEB6816A41F for ; Wed, 2 Nov 2005 20:28:33 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6159843D48 for ; Wed, 2 Nov 2005 20:28:33 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jA2KSX8F006336 for ; Wed, 2 Nov 2005 20:28:33 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA2KSWHb006333 for perforce@freebsd.org; Wed, 2 Nov 2005 20:28:32 GMT (envelope-from jhb@freebsd.org) Date: Wed, 2 Nov 2005 20:28:32 GMT Message-Id: <200511022028.jA2KSWHb006333@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 86245 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, 02 Nov 2005 20:28:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=86245 Change 86245 by jhb@jhb_slimer on 2005/11/02 20:27:56 IFC @86243. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#73 integrate .. //depot/projects/smpng/sys/amd64/acpica/madt.c#9 integrate .. //depot/projects/smpng/sys/amd64/amd64/io_apic.c#10 integrate .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#17 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#38 integrate .. //depot/projects/smpng/sys/amd64/include/apicvar.h#8 integrate .. //depot/projects/smpng/sys/amd64/include/intr_machdep.h#6 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#33 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_windrv.c#6 integrate .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#24 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#33 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#36 integrate .. //depot/projects/smpng/sys/compat/ndis/winx32_wrap.S#3 integrate .. //depot/projects/smpng/sys/conf/files#157 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/CHANGES.txt#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acapps.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#24 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdebug.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdisasm.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdispat.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acefi.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acenv.h#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acevents.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acexcep.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acgcc.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acglobal.h#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/achware.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acinterp.h#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/aclocal.h#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acmacros.h#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acnames.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/acnamesp.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acobject.h#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acopcode.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/acoutput.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acparser.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpi.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpiosxf.h#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpixf.h#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acresrc.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acstruct.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actables.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl1.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl2.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actypes.h#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acutils.h#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/aecommon.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/aeexec.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/amlcode.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/amlresrc.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/adisasm.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/getopt.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslanalyze.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcodegen.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompile.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.l#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.y#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asldefine.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslerror.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfiles.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfold.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslglobal.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllength.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllisting.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslload.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllookup.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmain.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmap.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslopcodes.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asloperands.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslopt.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslresource.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype1.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslstubs.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltransform.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltree.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltypes.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslutils.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbdisply.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbexec.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbfileio.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbhistry.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbinput.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbstats.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbutils.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbxface.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmbuffer.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmnames.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmobject.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmopcode.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrc.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcl.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcs.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmutils.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmwalk.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsfield.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsinit.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmethod.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmthdat.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsobject.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsopcode.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsutils.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswexec.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswload.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswscope.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswstate.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evevent.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpe.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpeblk.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evmisc.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evregion.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evrgnini.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evsci.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxface.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfevnt.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfregn.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconfig.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconvrt.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/excreate.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exdump.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfield.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfldio.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmisc.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmutex.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exnames.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg1.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg2.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg3.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg6.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exprep.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exregion.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresnte.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresolv.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresop.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstore.c#24 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstoren.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstorob.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exsystem.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exutils.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwacpi.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwgpe.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwregs.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwsleep.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwtimer.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsaccess.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsalloc.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdump.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdumpdv.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nseval.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsinit.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsload.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsnames.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsobject.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsparse.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nssearch.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsutils.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nswalk.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfeval.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfname.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfobj.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/osunixxf.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psargs.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psloop.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/psopcode.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psparse.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psscope.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/pstree.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psutils.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/pswalk.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psxface.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsaddr.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscalc.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscreate.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsdump.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsinfo.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/rsio.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsirq.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rslist.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsmemory.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsmisc.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsutils.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsxface.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbconvrt.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbget.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbgetall.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbinstal.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbrsdt.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbutils.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxface.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxfroot.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utalloc.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utcache.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/utclib.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utcopy.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdebug.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdelete.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/uteval.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utglobal.c#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utinit.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmath.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmisc.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmutex.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/utobject.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utstate.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/utxface.c#16 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#18 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdTable.c#11 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#88 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#31 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#28 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#60 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#37 integrate .. //depot/projects/smpng/sys/i386/acpica/madt.c#15 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#67 integrate .. //depot/projects/smpng/sys/i386/i386/io_apic.c#14 integrate .. //depot/projects/smpng/sys/i386/i386/local_apic.c#36 integrate .. //depot/projects/smpng/sys/i386/include/apicvar.h#16 integrate .. //depot/projects/smpng/sys/i386/include/intr_machdep.h#8 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#10 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#39 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#77 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#47 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi/Makefile#11 integrate .. //depot/projects/smpng/sys/net/if_gre.c#26 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.c#6 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#19 integrate .. //depot/projects/smpng/sys/netgraph/netgraph.h#23 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#41 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#34 integrate .. //depot/projects/smpng/sys/netinet/igmp.c#16 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#61 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.c#36 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#42 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#78 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#37 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#75 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#42 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_output.c#10 integrate .. //depot/projects/smpng/sys/netipx/ipx_ip.c#13 integrate .. //depot/projects/smpng/sys/netipx/spx_usrreq.c#23 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#54 integrate .. //depot/projects/smpng/sys/sys/param.h#89 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#47 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#55 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#73 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.181 2005/10/31 16:14:07 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.182 2005/11/02 08:23:28 alc Exp $"); #include #include @@ -323,6 +323,7 @@ static PMAP_INLINE void free_pv_entry(pv_entry_t pv); static pv_entry_t get_pv_entry(void); +static pv_entry_t pv_entry_reclaim(pmap_t locked_pmap); static void alpha_protection_init(void); static void pmap_changebit(vm_page_t m, int bit, boolean_t setem); @@ -1321,7 +1322,55 @@ return uma_zalloc(pvzone, M_NOWAIT); } +/* + * Reclaim a pv entry by removing a mapping to an inactive page. + */ +static pv_entry_t +pv_entry_reclaim(pmap_t locked_pmap) +{ + pmap_t pmap; + pt_entry_t *pte, tpte; + pv_entry_t pv; + vm_offset_t va; + vm_page_t m; + PMAP_LOCK_ASSERT(locked_pmap, MA_OWNED); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + TAILQ_FOREACH(m, &vm_page_queues[PQ_INACTIVE].pl, pageq) { + if (m->hold_count || m->busy || (m->flags & PG_BUSY)) + continue; + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + va = pv->pv_va; + pmap = pv->pv_pmap; + if (pmap != locked_pmap && !PMAP_TRYLOCK(pmap)) + continue; + pmap->pm_stats.resident_count--; + pte = pmap_lev3pte(pmap, va); + tpte = *pte; + *pte = 0; + KASSERT((tpte & PG_W) == 0, + ("pv_entry_reclaim: wired pte %#lx", tpte)); + if ((tpte & PG_FOR) == 0) + vm_page_flag_set(m, PG_REFERENCED); + if ((tpte & PG_FOW) == 0) { + if (pmap_track_modified(va)) + vm_page_dirty(m); + } + pmap_invalidate_page(pmap, va); + TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); + 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--; + pmap_unuse_pt(pmap, va, pv->pv_ptem); + if (pmap != locked_pmap) + PMAP_UNLOCK(pmap); + return (pv); + } + } + panic("pv_entry_reclaim: increase vm.pmap.shpgperproc"); +} + static int pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va) { @@ -1368,7 +1417,7 @@ pv = get_pv_entry(); if (pv == NULL) - panic("no pv entries: increase vm.pmap.shpgperproc"); + pv = pv_entry_reclaim(pmap); pv->pv_va = va; pv->pv_pmap = pmap; pv->pv_ptem = mpte; ==== //depot/projects/smpng/sys/amd64/acpica/madt.c#9 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.18 2005/10/31 15:41:17 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.19 2005/11/01 22:44:06 jkim Exp $"); #include #include @@ -229,7 +229,7 @@ * the version 1.0 portion of the RSDP. Version 2.0 has * an additional checksum that we verify first. */ - if (AcpiTbChecksum(rsdp, ACPI_RSDP_XCHECKSUM_LENGTH) != 0) { + if (AcpiTbGenerateChecksum(rsdp, ACPI_RSDP_XCHECKSUM_LENGTH)) { if (bootverbose) printf("MADT: RSDP failed extended checksum\n"); return (ENXIO); ==== //depot/projects/smpng/sys/amd64/amd64/io_apic.c#10 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.17 2005/10/31 15:41:17 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.18 2005/11/02 20:11:46 jhb Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -56,10 +56,10 @@ #define IOAPIC_REDTBL_LO(i) (IOAPIC_REDTBL + (i) * 2) #define IOAPIC_REDTBL_HI(i) (IOAPIC_REDTBL_LO(i) + 1) -#define VECTOR_EXTINT 252 -#define VECTOR_NMI 253 -#define VECTOR_SMI 254 -#define VECTOR_DISABLED 255 +#define IRQ_EXTINT (NUM_IO_INTS + 1) +#define IRQ_NMI (NUM_IO_INTS + 2) +#define IRQ_SMI (NUM_IO_INTS + 3) +#define IRQ_DISABLED (NUM_IO_INTS + 4) #define DEST_NONE -1 @@ -68,22 +68,18 @@ static MALLOC_DEFINE(M_IOAPIC, "ioapic", "I/O APIC structures"); /* - * New interrupt support code.. - * - * XXX: we really should have the interrupt cookie passed up from new-bus - * just be a int pin, and not map 1:1 to interrupt vector number but should - * use INTR_TYPE_FOO to set priority bands for device classes and do all the - * magic remapping of intpin to vector in here. For now we just cheat as on - * ia64 and map intpin X to vector NRSVIDT + X. Note that we assume that the - * first IO APIC has ISA interrupts on pins 1-15. Not sure how you are - * really supposed to figure out which IO APIC in a system with multiple IO - * APIC's actually has the ISA interrupts routed to it. As far as interrupt - * pin numbers, we use the ACPI System Interrupt number model where each - * IO APIC has a contiguous chunk of the System Interrupt address space. + * I/O APIC interrupt source driver. Each pin is assigned an IRQ cookie + * as laid out in the ACPI System Interrupt number model where each I/O + * APIC has a contiguous chunk of the System Interrupt address space. + * We assume that IRQs 1 - 15 behave like ISA IRQs and that all other + * IRQs behave as PCI IRQs by default. We also assume that the pin for + * IRQ 0 is actually an ExtINT pin. The apic enumerators override the + * configuration of individual pins as indicated by their tables. */ struct ioapic_intsrc { struct intsrc io_intsrc; + u_int io_irq; u_int io_intpin:8; u_int io_vector:8; u_int io_activehi:1; @@ -107,7 +103,7 @@ static u_int ioapic_read(volatile ioapic_t *apic, int reg); static void ioapic_write(volatile ioapic_t *apic, int reg, u_int val); static const char *ioapic_bus_string(int bus_type); -static void ioapic_print_vector(struct ioapic_intsrc *intpin); +static void ioapic_print_irq(struct ioapic_intsrc *intpin); static void ioapic_enable_source(struct intsrc *isrc); static void ioapic_disable_source(struct intsrc *isrc, int eoi); static void ioapic_eoi_source(struct intsrc *isrc); @@ -178,25 +174,25 @@ } static void -ioapic_print_vector(struct ioapic_intsrc *intpin) +ioapic_print_irq(struct ioapic_intsrc *intpin) { - switch (intpin->io_vector) { - case VECTOR_DISABLED: + switch (intpin->io_irq) { + case IRQ_DISABLED: printf("disabled"); break; - case VECTOR_EXTINT: + case IRQ_EXTINT: printf("ExtINT"); break; - case VECTOR_NMI: + case IRQ_NMI: printf("NMI"); break; - case VECTOR_SMI: + case IRQ_SMI: printf("SMI"); break; default: printf("%s IRQ %u", ioapic_bus_string(intpin->io_bus), - intpin->io_vector); + intpin->io_irq); } } @@ -259,14 +255,20 @@ struct ioapic *io = (struct ioapic *)intpin->io_intsrc.is_pic; uint32_t low, high, value; - /* For disabled pins, just ensure that they are masked. */ - if (intpin->io_vector == VECTOR_DISABLED) { + /* + * If a pin is completely invalid or if it is valid but hasn't + * been enabled yet, just ensure that the pin is masked. + */ + if (intpin->io_irq == IRQ_DISABLED || (intpin->io_irq < NUM_IO_INTS && + intpin->io_vector == 0)) { + mtx_lock_spin(&icu_lock); low = ioapic_read(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin)); if ((low & IOART_INTMASK) == IOART_INTMCLR) ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), low | IOART_INTMSET); + mtx_unlock_spin(&icu_lock); return; } @@ -291,24 +293,26 @@ low |= IOART_INTALO; if (intpin->io_masked) low |= IOART_INTMSET; - switch (intpin->io_vector) { - case VECTOR_EXTINT: + switch (intpin->io_irq) { + case IRQ_EXTINT: KASSERT(intpin->io_edgetrigger, ("ExtINT not edge triggered")); low |= IOART_DELEXINT; break; - case VECTOR_NMI: + case IRQ_NMI: KASSERT(intpin->io_edgetrigger, ("NMI not edge triggered")); low |= IOART_DELNMI; break; - case VECTOR_SMI: + case IRQ_SMI: KASSERT(intpin->io_edgetrigger, ("SMI not edge triggered")); low |= IOART_DELSMI; break; default: - low |= IOART_DELLOPRI | apic_irq_to_idt(intpin->io_vector); + KASSERT(intpin->io_vector != 0, ("No vector for IRQ %u", + intpin->io_irq)); + low |= IOART_DELLOPRI | intpin->io_vector; } /* Write the values to the APIC. */ @@ -334,7 +338,7 @@ if (bootverbose) { printf("ioapic%u: routing intpin %u (", io->io_id, intpin->io_intpin); - ioapic_print_vector(intpin); + ioapic_print_irq(intpin); printf(") to cluster %u\n", intpin->io_dest); } ioapic_program_intpin(intpin); @@ -365,10 +369,27 @@ ioapic_enable_intr(struct intsrc *isrc) { struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; + struct ioapic *io = (struct ioapic *)isrc->is_pic; if (intpin->io_dest == DEST_NONE) { + /* + * Allocate an APIC vector for this interrupt pin. Once + * we have a vector we program the interrupt pin. Note + * that after we have booted ioapic_assign_cluster() + * will program the interrupt pin again, but it doesn't + * hurt to do that and trying to avoid that adds needless + * complication. + */ + intpin->io_vector = apic_alloc_vector(intpin->io_irq); + if (bootverbose) { + printf("ioapic%u: routing intpin %u (", io->io_id, + intpin->io_intpin); + ioapic_print_irq(intpin); + printf(") to vector %u\n", intpin->io_vector); + } + ioapic_program_intpin(intpin); ioapic_assign_cluster(intpin); - lapic_enable_intr(intpin->io_vector); + apic_enable_vector(intpin->io_vector); } } @@ -378,7 +399,7 @@ struct ioapic_intsrc *pin; pin = (struct ioapic_intsrc *)isrc; - return (pin->io_vector); + return (pin->io_irq); } static int @@ -386,6 +407,8 @@ { struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; + if (intpin->io_vector == 0) + return 0; return (lapic_intr_pending(intpin->io_vector)); } @@ -523,16 +546,16 @@ for (i = 0, intpin = io->io_pins; i < numintr; i++, intpin++) { intpin->io_intsrc.is_pic = (struct pic *)io; intpin->io_intpin = i; - intpin->io_vector = intbase + i; + intpin->io_irq = intbase + i; /* * Assume that pin 0 on the first I/O APIC is an ExtINT pin. * Assume that pins 1-15 are ISA interrupts and that all * other pins are PCI interrupts. */ - if (intpin->io_vector == 0) + if (intpin->io_irq == 0) ioapic_set_extint(io, i); - else if (intpin->io_vector < IOAPIC_ISA_INTS) { + else if (intpin->io_irq < IOAPIC_ISA_INTS) { intpin->io_bus = APIC_BUS_ISA; intpin->io_activehi = 1; intpin->io_edgetrigger = 1; @@ -550,9 +573,9 @@ * logical IDs to CPU clusters when they are enabled. */ intpin->io_dest = DEST_NONE; - if (bootverbose && intpin->io_vector != VECTOR_DISABLED) { + if (bootverbose && intpin->io_irq != IRQ_DISABLED) { printf("ioapic%u: intpin %d -> ", io->io_id, i); - ioapic_print_vector(intpin); + ioapic_print_irq(intpin); printf(" (%s, %s)\n", intpin->io_edgetrigger ? "edge" : "level", intpin->io_activehi ? "high" : "low"); @@ -573,7 +596,7 @@ io = (struct ioapic *)cookie; if (pin >= io->io_numintr) return (-1); - return (io->io_pins[pin].io_vector); + return (io->io_pins[pin].io_irq); } int @@ -584,9 +607,9 @@ io = (struct ioapic *)cookie; if (pin >= io->io_numintr) return (EINVAL); - if (io->io_pins[pin].io_vector == VECTOR_DISABLED) + if (io->io_pins[pin].io_irq == IRQ_DISABLED) return (EINVAL); - io->io_pins[pin].io_vector = VECTOR_DISABLED; + io->io_pins[pin].io_irq = IRQ_DISABLED; if (bootverbose) printf("ioapic%u: intpin %d disabled\n", io->io_id, pin); return (0); @@ -600,9 +623,9 @@ io = (struct ioapic *)cookie; if (pin >= io->io_numintr || vector < 0) return (EINVAL); - if (io->io_pins[pin].io_vector >= NUM_IO_INTS) + if (io->io_pins[pin].io_irq >= NUM_IO_INTS) return (EINVAL); - io->io_pins[pin].io_vector = vector; + io->io_pins[pin].io_irq = vector; if (bootverbose) printf("ioapic%u: Routing IRQ %d -> intpin %d\n", io->io_id, vector, pin); @@ -619,7 +642,7 @@ io = (struct ioapic *)cookie; if (pin >= io->io_numintr) return (EINVAL); - if (io->io_pins[pin].io_vector >= NUM_IO_INTS) + if (io->io_pins[pin].io_irq >= NUM_IO_INTS) return (EINVAL); io->io_pins[pin].io_bus = bus_type; if (bootverbose) @@ -636,12 +659,12 @@ io = (struct ioapic *)cookie; if (pin >= io->io_numintr) return (EINVAL); - if (io->io_pins[pin].io_vector == VECTOR_NMI) + if (io->io_pins[pin].io_irq == IRQ_NMI) return (0); - if (io->io_pins[pin].io_vector >= NUM_IO_INTS) + if (io->io_pins[pin].io_irq >= NUM_IO_INTS) return (EINVAL); io->io_pins[pin].io_bus = APIC_BUS_UNKNOWN; - io->io_pins[pin].io_vector = VECTOR_NMI; + io->io_pins[pin].io_irq = IRQ_NMI; io->io_pins[pin].io_masked = 0; io->io_pins[pin].io_edgetrigger = 1; io->io_pins[pin].io_activehi = 1; @@ -659,12 +682,12 @@ io = (struct ioapic *)cookie; if (pin >= io->io_numintr) return (EINVAL); - if (io->io_pins[pin].io_vector == VECTOR_SMI) + if (io->io_pins[pin].io_irq == IRQ_SMI) return (0); - if (io->io_pins[pin].io_vector >= NUM_IO_INTS) + if (io->io_pins[pin].io_irq >= NUM_IO_INTS) return (EINVAL); io->io_pins[pin].io_bus = APIC_BUS_UNKNOWN; - io->io_pins[pin].io_vector = VECTOR_SMI; + io->io_pins[pin].io_irq = IRQ_SMI; io->io_pins[pin].io_masked = 0; io->io_pins[pin].io_edgetrigger = 1; io->io_pins[pin].io_activehi = 1; @@ -682,12 +705,12 @@ io = (struct ioapic *)cookie; if (pin >= io->io_numintr) return (EINVAL); - if (io->io_pins[pin].io_vector == VECTOR_EXTINT) + if (io->io_pins[pin].io_irq == IRQ_EXTINT) return (0); - if (io->io_pins[pin].io_vector >= NUM_IO_INTS) + if (io->io_pins[pin].io_irq >= NUM_IO_INTS) return (EINVAL); io->io_pins[pin].io_bus = APIC_BUS_UNKNOWN; - io->io_pins[pin].io_vector = VECTOR_EXTINT; + io->io_pins[pin].io_irq = IRQ_EXTINT; if (enable_extint) io->io_pins[pin].io_masked = 0; else @@ -708,7 +731,7 @@ io = (struct ioapic *)cookie; if (pin >= io->io_numintr || pol == INTR_POLARITY_CONFORM) return (EINVAL); - if (io->io_pins[pin].io_vector >= NUM_IO_INTS) + if (io->io_pins[pin].io_irq >= NUM_IO_INTS) return (EINVAL); io->io_pins[pin].io_activehi = (pol == INTR_POLARITY_HIGH); if (bootverbose) @@ -725,7 +748,7 @@ io = (struct ioapic *)cookie; if (pin >= io->io_numintr || trigger == INTR_TRIGGER_CONFORM) return (EINVAL); - if (io->io_pins[pin].io_vector >= NUM_IO_INTS) + if (io->io_pins[pin].io_irq >= NUM_IO_INTS) return (EINVAL); io->io_pins[pin].io_edgetrigger = (trigger == INTR_TRIGGER_EDGE); if (bootverbose) @@ -756,18 +779,11 @@ io->io_id, flags >> 4, flags & 0xf, io->io_intbase, io->io_intbase + io->io_numintr - 1); bsp_id = PCPU_GET(apic_id); - for (i = 0, pin = io->io_pins; i < io->io_numintr; i++, pin++) { - /* - * Finish initializing the pins by programming the vectors - * and delivery mode. - */ - if (pin->io_vector == VECTOR_DISABLED) - continue; - ioapic_program_intpin(pin); - if (pin->io_vector >= NUM_IO_INTS) - continue; - intr_register_source(&pin->io_intsrc); - } + + /* Register valid pins as interrupt sources. */ + for (i = 0, pin = io->io_pins; i < io->io_numintr; i++, pin++) + if (pin->io_irq < NUM_IO_INTS) + intr_register_source(&pin->io_intsrc); } /* ==== //depot/projects/smpng/sys/amd64/amd64/local_apic.c#17 (text+ko) ==== @@ -32,14 +32,18 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.18 2005/10/26 22:32:30 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.19 2005/11/02 20:11:46 jhb Exp $"); #include "opt_hwpmc_hooks.h" +#include "opt_ddb.h" + #include #include #include #include +#include +#include #include #include #include @@ -56,6 +60,11 @@ #include #include +#ifdef DDB +#include +#include +#endif + /* * We can handle up to 60 APICs via our logical cluster IDs, but currently * the physical IDs on Intel processors up to the Pentium 4 are limited to @@ -73,6 +82,10 @@ #define LAPIC_TIMER_STATHZ_DIVIDER 15 #define LAPIC_TIMER_PROFHZ_DIVIDER 3 +/* Magic IRQ values for the timer and syscalls. */ +#define IRQ_TIMER (NUM_IO_INTS + 1) +#define IRQ_SYSCALL (NUM_IO_INTS + 2) + /* * Support for local APICs. Local APICs manage interrupts on each * individual processor as opposed to I/O APICs which receive interrupts @@ -126,6 +139,9 @@ IDTVEC(apic_isr7), /* 224 - 255 */ }; +/* Include IDT_SYSCALL to make indexing easier. */ +static u_int ioint_irqs[APIC_NUM_IOINTS + 1]; + static u_int32_t lapic_timer_divisors[] = { APIC_TDCR_1, APIC_TDCR_2, APIC_TDCR_4, APIC_TDCR_8, APIC_TDCR_16, APIC_TDCR_32, APIC_TDCR_64, APIC_TDCR_128 @@ -197,12 +213,14 @@ /* Perform basic initialization of the BSP's local APIC. */ lapic_enable(); + ioint_irqs[IDT_SYSCALL - APIC_IO_INTS] = IRQ_SYSCALL; /* Set BSP's per-CPU local APIC ID. */ PCPU_SET(apic_id, lapic_id()); /* Local APIC timer interrupt. */ setidt(APIC_TIMER_INT, IDTVEC(timerint), SDT_SYSIGT, SEL_KPL, 0); + ioint_irqs[APIC_TIMER_INT - APIC_IO_INTS] = IRQ_TIMER; /* XXX: error/thermal interrupts */ } @@ -258,18 +276,6 @@ } void -lapic_enable_intr(u_int irq) -{ - u_int vector; - - vector = apic_irq_to_idt(irq); - KASSERT(vector != IDT_SYSCALL, ("Attempt to overwrite syscall entry")); - KASSERT(ioint_handlers[vector / 32] != NULL, - ("No ISR handler for IRQ %u", irq)); - setidt(vector, ioint_handlers[vector / 32], SDT_SYSIGT, SEL_KPL, 0); -} - -void lapic_setup(void) { struct lapic *la; @@ -692,30 +698,102 @@ lapic->lvt_timer = value; } -/* Translate between IDT vectors and IRQ vectors. */ +/* Request a free IDT vector to be used by the specified IRQ. */ u_int -apic_irq_to_idt(u_int irq) +apic_alloc_vector(u_int irq) { u_int vector; KASSERT(irq < NUM_IO_INTS, ("Invalid IRQ %u", irq)); - vector = irq + APIC_IO_INTS; - if (vector >= IDT_SYSCALL) - vector++; - return (vector); + + /* + * Search for a free vector. Currently we just use a very simple + * algorithm to find the first free vector. + */ + mtx_lock_spin(&icu_lock); + for (vector = 0; vector < APIC_NUM_IOINTS; vector++) { + if (ioint_irqs[vector] != 0) + continue; + ioint_irqs[vector] = irq; + mtx_unlock_spin(&icu_lock); + return (vector + APIC_IO_INTS); + } + mtx_unlock_spin(&icu_lock); + panic("Couldn't find an APIC vector for IRQ %u", irq); +} + +void +apic_enable_vector(u_int vector) +{ + + KASSERT(vector != IDT_SYSCALL, ("Attempt to overwrite syscall entry")); + KASSERT(ioint_handlers[vector / 32] != NULL, + ("No ISR handler for vector %u", vector)); + setidt(vector, ioint_handlers[vector / 32], SDT_SYSIGT, SEL_KPL, 0); +} + +/* Release an APIC vector when it's no longer in use. */ +void +apic_free_vector(u_int vector, u_int irq) +{ + KASSERT(vector >= APIC_IO_INTS && vector != IDT_SYSCALL && + vector <= APIC_IO_INTS + APIC_NUM_IOINTS, + ("Vector %u does not map to an IRQ line", vector)); + KASSERT(irq < NUM_IO_INTS, ("Invalid IRQ %u", irq)); + KASSERT(ioint_irqs[vector - APIC_IO_INTS] == irq, ("IRQ mismatch")); + mtx_lock_spin(&icu_lock); + ioint_irqs[vector - APIC_IO_INTS] = 0; + mtx_unlock_spin(&icu_lock); } +/* Map an IDT vector (APIC) to an IRQ (interrupt source). */ u_int apic_idt_to_irq(u_int vector) { KASSERT(vector >= APIC_IO_INTS && vector != IDT_SYSCALL && - vector <= APIC_IO_INTS + NUM_IO_INTS, + vector <= APIC_IO_INTS + APIC_NUM_IOINTS, ("Vector %u does not map to an IRQ line", vector)); - if (vector > IDT_SYSCALL) - vector--; - return (vector - APIC_IO_INTS); + return (ioint_irqs[vector - APIC_IO_INTS]); +} + +#ifdef DDB +/* + * Dump data about APIC IDT vector mappings. + */ +DB_SHOW_COMMAND(apic, db_show_apic) +{ + struct intsrc *isrc; + int quit, i, verbose; + u_int irq; + + quit = 0; + if (strcmp(modif, "vv") == 0) + verbose = 2; + else if (strcmp(modif, "v") == 0) + verbose = 1; + else + verbose = 0; + db_setup_paging(db_simple_pager, &quit, db_lines_per_page); + for (i = 0; i < APIC_NUM_IOINTS + 1 && !quit; i++) { + irq = ioint_irqs[i]; + if (irq != 0 && irq != IRQ_SYSCALL) { + db_printf("vec 0x%2x -> ", i + APIC_IO_INTS); + if (irq == IRQ_TIMER) + db_printf("lapic timer\n"); + else if (irq < NUM_IO_INTS) { + isrc = intr_lookup_source(irq); + if (isrc == NULL || verbose == 0) + db_printf("IRQ %u\n", irq); + else + db_dump_intr_event(isrc->is_event, + verbose == 2); + } else + db_printf("IRQ %u ???\n", irq); + } + } } +#endif /* * APIC probing support code. This includes code to manage enumerators. ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#38 (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.444 2005/10/27 18:54:43 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.445 2005/11/01 22:59:02 jhb Exp $ machine amd64 cpu HAMMER @@ -63,6 +63,7 @@ options AHD_REG_PRETTY_PRINT # Print register bitfields in debug # output. Adds ~215k to driver. options ADAPTIVE_GIANT # Giant mutex is adaptive. +options STOP_NMI # Stop CPUS using NMI instead of IPI # Debugging for use in -current options KDB # Enable kernel debugger support. ==== //depot/projects/smpng/sys/amd64/include/apicvar.h#8 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.13 2005/06/09 18:23:54 ups Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.14 2005/11/02 20:11:47 jhb Exp $ */ #ifndef _MACHINE_APICVAR_H_ @@ -173,7 +173,9 @@ IDTVEC(apic_isr4), IDTVEC(apic_isr5), IDTVEC(apic_isr6), IDTVEC(apic_isr7), IDTVEC(spuriousint), IDTVEC(timerint); -u_int apic_irq_to_idt(u_int irq); +u_int apic_alloc_vector(u_int irq); +void apic_enable_vector(u_int vector); +void apic_free_vector(u_int vector, u_int irq); u_int apic_idt_to_irq(u_int vector); void apic_register_enumerator(struct apic_enumerator *enumerator); void *ioapic_create(uintptr_t addr, int32_t id, int intbase); @@ -192,7 +194,6 @@ void lapic_create(u_int apic_id, int boot_cpu); void lapic_disable(void); void lapic_dump(const char *str); -void lapic_enable_intr(u_int vector); void lapic_eoi(void); int lapic_id(void); void lapic_init(uintptr_t addr); ==== //depot/projects/smpng/sys/amd64/include/intr_machdep.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 2 22:19:04 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73F4416A423; Wed, 2 Nov 2005 22:19:04 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1C02C16A420 for ; Wed, 2 Nov 2005 22:19:04 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C34F943D45 for ; Wed, 2 Nov 2005 22:19:03 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jA2MJ33H018845 for ; Wed, 2 Nov 2005 22:19:03 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA2MJ36r018842 for perforce@freebsd.org; Wed, 2 Nov 2005 22:19:03 GMT (envelope-from millert@freebsd.org) Date: Wed, 2 Nov 2005 22:19:03 GMT Message-Id: <200511022219.jA2MJ36r018842@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 86253 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, 02 Nov 2005 22:19:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=86253 Change 86253 by millert@millert_ibook on 2005/11/02 22:18:57 Copy sebsd_migscs to POLICYDIR in install target so it can actually be used. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/Makefile.install#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/Makefile.install#4 (text+ko) ==== @@ -21,5 +21,5 @@ genfs install: - cp policy.16 $(POLICYDIR) + cp policy.16 sebsd_migscs $(POLICYDIR) From owner-p4-projects@FreeBSD.ORG Thu Nov 3 21:09:20 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2754216A422; Thu, 3 Nov 2005 21:09:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DE63B16A41F for ; Thu, 3 Nov 2005 21:09:19 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24EBC43D45 for ; Thu, 3 Nov 2005 21:09:19 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jA3L9JPu031572 for ; Thu, 3 Nov 2005 21:09:19 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA3L9ITo031568 for perforce@freebsd.org; Thu, 3 Nov 2005 21:09:18 GMT (envelope-from jhb@freebsd.org) Date: Thu, 3 Nov 2005 21:09:18 GMT Message-Id: <200511032109.jA3L9ITo031568@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 86304 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, 03 Nov 2005 21:09:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=86304 Change 86304 by jhb@jhb_slimer on 2005/11/03 21:08:51 Update. Affected files ... .. //depot/projects/smpng/sys/notes#66 edit Differences ... ==== //depot/projects/smpng/sys/notes#66 (text+ko) ==== @@ -75,9 +75,6 @@ - arm, powerpc? - fork counts? - Add a cache-line padded mtx_aligned union and use it for the mutex pools. -- Add stoppedpcbs[] support to other archs - - alpha - - sparc64 Active child branches: - jhb_intr - fast ithreads and MSI? (perhaps do MSI in jhb_acpipci) From owner-p4-projects@FreeBSD.ORG Thu Nov 3 21:34:44 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B2F716A421; Thu, 3 Nov 2005 21:34:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 52AF216A41F for ; Thu, 3 Nov 2005 21:34:43 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 414C643D45 for ; Thu, 3 Nov 2005 21:34:40 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jA3LYemq032986 for ; Thu, 3 Nov 2005 21:34:40 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA3LYdu1032983 for perforce@freebsd.org; Thu, 3 Nov 2005 21:34:40 GMT (envelope-from soc-andrew@freebsd.org) Date: Thu, 3 Nov 2005 21:34:40 GMT Message-Id: <200511032134.jA3LYdu1032983@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 86310 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, 03 Nov 2005 21:34:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=86310 Change 86310 by soc-andrew@soc-andrew_serv on 2005/11/03 21:33:41 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/etc/mtree/BSD.usr.dist#6 integrate .. //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#6 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#18 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#8 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#4 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/readme/article.sgml#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/scripts/package-split.py#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#10 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.512 2005/08/23 07:58:55 brian Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.514 2005/11/03 08:56:39 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -522,7 +522,7 @@ mkdir -p ${INSTALLTMP} for prog in [ awk cap_mkdb cat chflags chmod chown \ date echo egrep find grep install-info \ - ln make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ + ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ test true uname wc zic; do \ cp `which $$prog` ${INSTALLTMP}; \ done @@ -777,7 +777,7 @@ .if !defined(NO_CXX) _gperf= gnu/usr.bin/gperf -.if ${BOOTSTRAPPING} < 500113 +.if ${BOOTSTRAPPING} < 700004 _groff= gnu/usr.bin/groff .else _groff= gnu/usr.bin/groff/tmac ==== //depot/projects/soc2005/bsdinstaller/src/etc/mtree/BSD.usr.dist#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.312 2005/03/04 14:24:30 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.313 2005/10/28 21:25:27 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -73,6 +73,8 @@ .. ru_RU.KOI8-R .. + uk_UA.KOI8-U + .. .. dict .. ==== //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.207 2005/09/19 08:13:43 imura Exp $ +# $FreeBSD: src/lib/Makefile,v 1.208 2005/10/27 03:09:20 davidxu Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -66,7 +66,7 @@ .if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "ia64" && \ ${MACHINE_ARCH} != "powerpc" && !defined(NO_LIBC_R) -_libc_r= libc_r +_libc_r= .endif .if ${MACHINE_ARCH} != "arm" ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.890 2005/09/28 12:39:00 kensmith Exp $ +# $FreeBSD: src/release/Makefile,v 1.892 2005/11/03 07:27:50 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -584,10 +584,6 @@ cd ${.CURDIR}/..; \ ${CROSSMAKE} ${KERNEL_FLAGS} \ kernel \ - DESTDIR=${RD}/trees/base; \ - cd ${.CURDIR}/..; \ - ${CROSSMAKE} ${KERNEL_FLAGS} -DNO_MODULES \ - reinstallkernel -DINSTALL_DEBUG \ DESTDIR=${RD}/trees/base touch ${.TARGET} @@ -719,7 +715,7 @@ .endif cp ${.CURDIR}/../etc/usbd.conf ${RD}/mfsfd/etc/usbd.conf cp ${.CURDIR}/../etc/master.passwd ${RD}/mfsfd/etc/master.passwd - pwd_mkdb -d ${RD}/mfsfd/etc -p ${RD}/mfsfd/etc/master.passwd + cp ${RD}/trees/base/etc/*pwd.db ${RD}/mfsfd/etc/ ( for F in defaults/rc.conf netconfig protocols ; do \ sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \ ${RD}/trees/base/etc/$$F > ${RD}/mfsfd/stand/etc/$$F ; \ ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -878,8 +878,8 @@ based host adapter (tested with a Tekram DC-390U2W). On the other hand some no-name Symbios 53C985 board has been reported to work. Cards like the Tekram DC-390F (Symbios875 based) have been confirmed to - work fine on the PC164. Unfortunately this seems to be dependent on the - actual version of the chip/board. + work fine on the PC164. Symbios 53C896 has been confirmed to not + work. Symbios 53C825[a] will also work as boot adapter. Diamond FirePort, although based on Symbios chips, is not bootable by the @@ -966,7 +966,7 @@ Features: - 21064 or 21064A CPU at speeds of 166 up to 333 MHz + 21064 or 21064A CPU at speeds of 100 up to 333 MHz DECchip 21071-AA core logic chip set ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#2 (text+ko) ==== @@ -1,5 +1,5 @@ @@ -63,7 +63,7 @@ Common Installation Problems for &arch.print; Architecture Users - + My system hangs while probing hardware during boot, or it @@ -88,21 +88,6 @@ boot loader can be found in the &os; Handbook. - - - My system uses the nVidia nForce3 Pro-150 chipset and I get hangs - at the end of boot or suddenly starts losing interrupts. - - - There are problems with the apic on this chipset and/or the - bios on every machine that we had seen at the time of release. - While disabling ACPI as above will work, a less drastic option may - be to set the hint.apic.0.disabled hint instead. - If you have the option in the bios, try disabling the APIC support. - Unfortunately some machines lack this option. - - - My legacy ISA device used to be recognized in previous versions ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#8 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.894 2005/10/12 12:24:37 joel Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.897 2005/10/31 16:52:11 hrs Exp $ 2000 @@ -127,6 +127,23 @@ has been added. This allows to export &man.uma.9; allocator statistics via a binary structure stream. + The sysctl variable hw.pci.do_powerstate + has been changed from a boolean to a range. + 0 means no power management, + 1 means conservative power management which + any device class that has caused problems is added to the watch list, + 2 means aggressive power management where + any device class that is not fundamental to the system is added to the list, + and 3 means power them all down unconditionally. + The default is 1. + + The GENERIC kernel now enables + SMP support by default. + + Sample kernel configuration files + src/sys/arch/conf/MAC + for the Mandatory Access Control framework have been added. + Boot Loader Changes @@ -168,6 +185,9 @@ The smbios(4) driver support for amd64 has been added. + The tnt4882(4) driver which supports National Instruments + PCI-GPIB card has been added. + A new loader tunable hw.apic.enable_extint has been added. This tunable can be used not to mask the ExtINT pin on the first @@ -178,6 +198,8 @@ Multimedia Support + The &man.agp.4; driver now supports ATI IGP chipsets. + The &man.sound.4; driver now supports wider range sampling rate, multiple precisions choice, and 24/32 bit PCM format conversion. @@ -188,9 +210,6 @@ The &man.snd.via8233.4; driver is now MPSAFE. - The &man.snd.via8233.4; driver is now supported - on &os;/amd64. - The &man.snd.via82c686.4; driver is now MPSAFE. @@ -210,6 +229,9 @@ The &man.pcn.4; driver is now MPSAFE. &merged; + The &man.re.4; driver now supports D-Link DGE-528(T) + Gigabit Ethernet card. + The &man.sf.4; driver is now MPSAFE. &merged; The &man.ste.4; driver is now MPSAFE. @@ -277,11 +299,18 @@ Disks and Storage + The &man.aac.4; driver now supports the Adaptec 2610SA SATA-RAID + controller in some Hewlett-Packard machines. + The &man.ata.4; driver now supports a workaround for some controllers whose DMA does not work properly in 48bit mode. For the suspicious controllers the PIO mode will be used for access to over 137GB areas. + The &man.ata.4; driver now supports the ITE IT8211F IDE controller, + and Promise PDC40718 and PDC40719 chip found in Promise + Fasttrak TX4300. + A new GEOM class GEOM_ZERO has been added. It creates very huge provider (41PB) /dev/gzero and mainly for performance testing. @@ -292,6 +321,9 @@ The GEOM_LABEL class now supports Ext2FS and ReiserFS. + The &man.hptmv.4; driver has been updated and now supports + amd64 as well as PAE. + The &man.mpt.4; driver has been updated to support various new features such as RAID volume and RAID member state/settings reporting, periodic volume re-synchronization @@ -345,11 +377,28 @@ flag to compare the symbolic link itself rather than the file that the link points to. + The &man.gpt.8; utility now supports setting GPT partition labels. + The &man.ifconfig.8; utility now supports a flag to allow printing potentially sensitive keying material to standard output. This sensitive information will not be printed by default. + The &man.ifconfig.8; utility now supports a + parameter, which is just an alias for , + yet is more convenient and easier to type. + + The parameter to &man.ifconfig.8; + no longer requires a network interface as its argument. The + argument still is supported for backward compatibility, but now + it is deprecated and its use is discouraged. + + The &man.kenv.1; utility now supports a + flag to suppress warnings. + + The libedit library has been + updated from the NetBSD source tree as of August 2005. + The &man.libmemstat.3; library has been added. This is for use by debugging and monitoring applications in tracking kernel memory statistics. It provides an @@ -389,6 +438,12 @@ The &man.powerd.8; program now supports a option which allows to specify pidfile. + The &man.rpcgen.1; utility now generates headers and stub files + which can be used with ANSI C compilers by default. + + The &man.sysctl.8; utility now supports a + flag to suppress a limited set of warnings and errors. + The shared library version number of all libraries have been updated due to some possible ABI changes. The libraries include: snmp_*, libdialog, libg2c, libobjc, @@ -420,9 +475,11 @@ The removable_interfaces variable has been removed. - A new variable ifconfig_ifn - has been added. This allows - /etc/rc.d/netif + A new keyword NOAUTO in + ifconfig_ifn + has been added. This prevents configuration of an interface + at boot time or via /etc/pccard_ether, + and allows /etc/rc.d/netif to be used to start and stop an interface on a purely manual basis. @@ -434,6 +491,9 @@ libpcap has been updated to v0.9.1 (release). + OpenSSH has been updated from + version 4.0p1 to version 4.2p1. + sendmail has been updated from version 8.13.3 to version 8.13.4. ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#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/release/doc/share/misc/dev.archlist.txt,v 1.69 2005/10/10 18:01:18 joel Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.70 2005/10/25 04:32:42 brueffer Exp $ # # @@ -112,7 +112,7 @@ snd_csa i386,amd64 snd_ds1 i386,amd64 snd_emu10k1 i386,amd64 -snd_es137x i386,amd64 +snd_es137x i386,sparc64,amd64 snd_ess i386,amd64 snd_fm801 i386,amd64 snd_gusc i386,amd64 ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#2 (text+ko) ==== @@ -2,7 +2,7 @@ The FreeBSD Simplified Chinese Project Original Revision: 1.14 - $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml,v 1.2 2005/03/22 19:20:19 delphij Exp $ + $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml,v 1.3 2005/10/13 17:25:28 delphij Exp $ --> Ö§³ÖµÄ´¦ÀíÆ÷ºÍÖ÷°å @@ -35,7 +35,7 @@ &os; Äܹ»ÀûÓà Intel CPU µÄ³¬Ïß³Ì (HTT) Ö§³Ö²¢´ÓÖÐÊÜÒæ¡£ ÆôÓÃÁË options SMP µÄÄÚºËÄܹ»×Ô¶¯¼ì²âµ½¸½¼ÓµÄÂß¼­´¦ÀíÆ÷¡£ - ĬÈ쵀 &os; µ÷¶ÈÆ÷½«Âß¼­´¦ÀíÆ÷µÈͬÓÚһЩ¶îÍâµÄÎïÀí´¦Àí°®£» + ĬÈ쵀 &os; µ÷¶ÈÆ÷½«Âß¼­´¦ÀíÆ÷µÈͬÓÚһЩ¶îÍâµÄÎïÀí´¦ÀíÆ÷£» »»ÑÔÖ®£¬ Ëü²»»á³¢ÊÔ¸ù¾Ýͬһ CPU ÉϵÄÂß¼­´¦ÀíÆ÷¶Ôµ÷¶È¾ö²ßʵʩÓÅ»¯¡£ ÓÉÓÚÕâÖÖ¼òµ¥µÄµ÷¶È²ßÂԻᵼÖÂÐÔÄܲ»¹»ÀíÏ룬 ijЩÇé¿öÏÂͨ¹ýÉèÖà machdep.hlt_logical_cpus sysctl ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/readme/article.sgml#3 (text+ko) ==== @@ -18,7 +18,7 @@ The &os; Project - $FreeBSD: src/release/doc/zh_CN.GB2312/readme/article.sgml,v 1.2 2005/10/12 20:30:39 delphij Exp $ + $FreeBSD: src/release/doc/zh_CN.GB2312/readme/article.sgml,v 1.3 2005/10/14 16:25:53 delphij Exp $ 2000 @@ -121,7 +121,7 @@ ¶ÔÓÚÄÇЩϣÍûÓà &os; À´´¦ÀíÈÕ³£ÒµÎñ£¬ ¶ø²»Êdz¢ÊÔ×îР&os; ¼¼ÊõµÄÓû§À´Ëµ£¬ ÕýʽµÄ·¢Ðа汾 (ÀýÈç &release.prev.stable;) ͨ³£¸üΪºÏÊÊ¡£ - ·¢Ðа汾¾­¹ýÁËÒ»¶Îʱ¼äµÄ²âÊÔºÍÖÊÁ¿±£Õϼì²ì£¬ + ·¢Ðа汾¾­¹ýÁËÒ»¶Îʱ¼äµÄ²âÊÔºÍÖÊÁ¿±£Õϼì²é£¬ ÒÔÈ·±£Æä¸ß¿É¿¿ÐÔ¡£ ]]> @@ -328,7 +328,7 @@ RELNOTES.TXT¡¢ HARDWARE.TXT ºÍ INSTALL.TXT) °üº¬Á˶ÔÌض¨Ó²¼þÌåϵµÄÐÅÏ¢¡£ - ±ÈÈ磬alpha ·¢ÐÐ˵Ã÷»á°üº¬Á˲»ÊÊÓÃÓÚ &i386; µÄÐÅÏ¢£¬ + ±ÈÈ磬 alpha ·¢ÐÐ˵Ã÷ÖпÉÄÜ°üº¬Ä³Ð©²»ÊÊÓÃÓÚ &i386; µÄÐÅÏ¢£¬ ·´Ö®ÒàÈ»¡£ ÿƪÎĵµÊÊÓõÄÌåϵ½á¹¹»áÔÚÎĵµµÄ±êÌâ´¦Áгö¡£ ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#3 (text+ko) ==== @@ -1,14 +1,14 @@ &os;/&arch; &release.current; ·¢ÐÐ˵Ã÷ The &os; Project - $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml,v 1.6 2005/10/12 20:30:39 delphij Exp $ + $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml,v 1.9 2005/10/27 17:35:48 delphij Exp $ 2000 @@ -34,7 +34,7 @@ &release.branch; ¿ª·¢ÏßÉÏËù×öµÄ¸Ä¶¯¡£ ±¾ÎĵµÁоÙÁË×ÔÇ°Ò»·¢Ðа汾ÒÔÀ´ËùÓÐÊÊÓõݲȫ¹«¸æ£¬ ÒÔ¼°¶ÔÓÚ &os; ÄÚºËÒÔ¼°ÏµÍ³¸½´øµÄÓ¦ÓóÌÐòËù×öµÄÖØÒªÐ޸ġ£ - ÔÚÉý¼¶Ê±ËùÐèҪעÒâµÄһЩÎÊÌ⣬ Ò²½øÐÐÁ˼òÂԵĽéÉÜ¡£ + ¶ÔÔÚÉý¼¶Ê±ÐèҪעÒâµÄһЩÎÊÌ⣬ Ò²½øÐÐÁ˼òÂԵĽéÉÜ¡£ @@ -229,16 +229,17 @@ ÒѾ­±»É¾È¥¡£ ʹÓÃÕâÒ»ÀàÐ굀 CPU µÄÓû§£¬ ӦʹÓà &os; 5.X »ò¸üÔçµÄ°æ±¾¡£ - Äں˵÷ÊÔÆ÷ &man.ddb.4; ÏÖÔÚÖ§³ÖÓÃÓÚÏÔʾ³ÖÓÐÐÝÃß»¥³âÌå - (ÒÔ¼°µ±Ç°Ïß³ÌËù³ÖÓеÄ×ÔÐý»¥³âÌå) µÄÇé¿öµÄ - show alllocks ÃüÁîÁË¡£ &merged; + Äں˵÷ÊÔÆ÷ &man.ddb.4; ÐÂÔöÁË + show alllocks ÃüÁ + ÓÃÒÔÏÔʾ³ÖÓÐÐÝÃß»¥³âÌå + (ÒÔ¼°µ±Ç°Ïß³ÌËù³ÖÓеÄ×ÔÐý»¥³âÌå) µÄÇé¿öµÄÁË¡£ &merged; ½«±ÀÀ£Ê±µÄÄÚºËת´æ (crash dump) ¸ñʽ¸ÄΪÁË ELF ÒÔÖ§³Ö´óÄÚ´æ (³¬¹ý 4GB) µÄ»·¾³¡£ &man.ichsmb.4; Çý¶¯ÏÖÔÚ¿ÉÒÔ×÷Ϊ¿É¼ÓÔØÄÚºËÄ£¿éʹÓÃÁË¡£ - ÏÖÔÚ &man.jail.8; ¹¦ÄÜÖ§³ÖÒ»¸öÐ嵀 sysctl + &man.jail.8; ¹¦ÄÜÏÖÔÚÖ§³ÖÒ»¸öÐ嵀 sysctl security.jail.chflags_allowed£¬ ÓÃÓÚ¿ØÖÆ &man.chflags.1; ÔÚ jail ÖеÄÐÐΪ¡£ Èç¹ûÉèÖÃΪ 0 (ĬÈÏÖµ)£¬ jail ÖÐµÄ root @@ -361,7 +362,7 @@ ÒÔ¼õÉÙºÍÆäËûϵͳʱÖÓÖ®¼äµÄͬ²½Ð§¹û¡£ shell ÃüÁîµÄ×î´ó³¤¶È£¬ ´ÓÔ­Ï鵀 128 - ±äζÁË PAGE_SIZE¡£ ĬÈÏÇé¿öÏ£¬ + ±äΪÁË PAGE_SIZE¡£ ĬÈÏÇé¿öÏ£¬ Õâ¸öÖµÓ¦¸ÃÊÇ 4KB (i386, pc98, amd64, ºÍ powerpc) »ò 8KB (sparc64 ºÍ ia64)¡£ Æä½á¹ûÊÇ£¬ ¼æÈÝÄ£¿éÐèÒªÖØбàÒ룬 ÒÔ±ãÓÚÄÚºËÖеÄÊý¾Ý½á¹¹±£³Öͬ²½¡£ @@ -386,7 +387,7 @@ ¼ÓÔØÆ÷ÃüÁî autoboot ÏÖÔÚÖ§³ÖÌáʾ·û²ÎÊýÁË¡£ - ÏÖÔÚ autoboot ¼ÓÔØÆ÷ÃüÁîÄܹ»ÔÚ + autoboot ¼ÓÔØÆ÷ÃüÁîÏÖÔÚÄܹ»ÔÚ autoboot_delay ±äÁ¿ÉèÖÃΪ -1 ʱÍêÈ«½ûÖ¹Óû§´ò¶ÏÆô¶¯¹ý³ÌÁË¡£ &merged; @@ -408,7 +409,7 @@ ²¢ÔÚ»Ö¸´Ê±ÖØдò¿ª¡£ ÕâÒ»ÐÐΪ¿ÉÒÔͨ¹ý½« debug.acpi.do_powerstate ºÍ hw.pci.do_powerstate ÕâÁ½¸ö sysctl - ÉèÖÃΪ 0¡£ + ÉèÖÃΪ 0 À´½ûÓᣠ¼ÓÈëÁËÓÃÓÚ IBM ±Ê¼Ç±¾µÄ &man.acpi.ibm.4; Çý¶¯¡£ ËüÌṩÁËÐí¶àÈȼü£¬ ÒÔ¼°¶ÁÈ¡·çÉÈ״̬ºÍζȴ«¸ÐÆ÷µÄÄÜÁ¦¡£ @@ -462,13 +463,13 @@ ÒÔ¼°ÓйصÄÆäËû¹¤¾ß¡£ ɾȥÁ˶ÔÓÚ OLDCARD ×ÓϵͳµÄÖ§³Ö¡£ - ÏÖÔÚ£¬ NEWCARD ϵͳ±»ÓÃÓÚÖ§³ÖËùÓÐµÄ PCCARD É豸ÁË¡£ + ÏÖÔÚ£¬ ËùÓÐµÄ PCCARD É豸¶¼ÊÇͨ¹ý NEWCARD ϵͳ֧³ÖµÄÁË¡£ ¼ÓÈëÁËÓÃÓÚÖ§³Ö GPIB-PCIIA IEEE-488 ¿¨µÄ pcii Çý¶¯¡£ &merged; - &man.atkbd.4; Çý¶¯ÏÖÔÚÖ§³Ö 0x8 + &man.atkbd.4; Çý¶¯ÐÂÔöÁË 0x8 (µÚ 3 λ) ±êÖ¾£¬ ÓÃÒÔÔÚÉ豸̽²âʱ½ûÖ¹²âÊÔ¼üÅÌ¿Ú£¬ - ÒÔ±ÜÃâÔÚijЩÐͺŵĻúÆ÷£¬ ÌرðÊÇ Compaq R300Z ϵÁÐµÄ + ÒÔ±ÜÃâÔÚijЩÐͺţ¬ ÌرðÊÇ Compaq R300Z ϵÁÐµÄ amd64 ±Ê¼Ç±¾ÉÏÔì³É¹ÒÆðµÄÎÊÌâ¡£ ¼ÓÈëÁËÓÃÓÚÖ§³ÖÖ±½Ó·ÃÎÊÒÔģʽ0 (¼òµ¥I/O) @@ -546,12 +547,12 @@ &man.dc.4; Çý¶¯ÏÖÔÚÖ§³Ö &man.altq.4; ¿ò¼Ü£¬ ²¢ÇÒÊÇ MPSAFE µÄÁË¡£ &merged; - &man.de.4; Çý¶¯ÏÖÔÚÊÇ MPSAFE µÄÁË¡£ + &man.de.4; Çý¶¯ÏÖÔÚ MPSAFE ÁË¡£ &man.ed.4; Çý¶¯ÏÖÔÚÖ§³Ö &man.altq.4; ¿ò¼ÜÁË¡£ &merged; - &man.ed.4; Çý¶¯ÏÖÔÚÊÇ MPSAFE µÄÁË¡£ + &man.ed.4; Çý¶¯ÏÖÔÚ MPSAFE ÁË¡£ ÔÚ &man.em.4; Çý¶¯³ÌÐòÖУ¬ ¶ÔÓÚ VLAN ±ê¼Ç (tagging) µÄÓ²¼þÖ§³Ö£¬ ÓÉÓÚÆäºÍ»ìÔÓģʽ֮¼äµÄһЩ³åÍ»±»Ä¬ÈϵؽûÓᣠ@@ -594,22 +595,22 @@ &man.pcn.4; Çý¶¯ÏÖÔÚ MPSAFE ÁË¡£ - ÏÖÔÚ &man.re.4; Çý¶¯Äܹ»Ö§³Ö &man.altq.4; + &man.re.4; Çý¶¯ÏÖÔÚÄܹ»Ö§³Ö &man.altq.4; ¿ò¼Ü£¬ ²¢ÇÒ MPSAFE ÁË¡£ &merged; - ÏÖÔÚ &man.sf.4; Çý¶¯Ö§³ÖÉ豸»ìºÏÂÖѯ (device polling) + &man.sf.4; Çý¶¯ÏÖÔÚÖ§³ÖÉ豸»ìºÏÂÖѯ (device polling) ºÍ &man.altq.4; ÁË¡£ &merged; ÐÞÕýÁË &man.sk.4; Çý¶¯ÖеĶദ³ÌÐòÉè¼Æ´íÎó¡£ ÕâЩÎÊÌâÖ÷ÒªÓ°Ïì SMP ϵͳ£¬ ¿ÉÄܵ¼ÖÂϵͳ±ÀÀ£¡¢ ÄÚºËȱҳ¡¢ - SSH Á¬½ÓÖжϣ¬ »òÎļþ´«ÊäÎÊÌâ¡£ + SSH Á¬½ÓÖжϣ¬ ÒÔ¼°Îļþ´«ÊäÎÊÌâ¡£ ¸ü¶àϸ½Ú£¬ ¿ÉÒÔÔÚ¿±Î󹫸æ FreeBSD-EN-05:02.sk ÉÏÕÒµ½¡£ &merged; - ÏÖÔÚ£¬ &man.sk.4; Çý¶¯Ö§³Ö &man.altq.4; ÁË¡£ - ͬʱ£¬ ´ËÇý¶¯Ö§³Ö»ùÓÚ Yukon µÄÍø¿¨µÄ¾ÞÐÍÖ¡ÄÜÁ¦ÁË¡£ + &man.sk.4; Çý¶¯ÏÖÔÚÖ§³Ö &man.altq.4; ÁË¡£ + ͬʱ£¬ ´ËÇý¶¯ÌṩÁ˶ÔÓÚ»ùÓÚ Yukon µÄÍø¿¨µÄ¾ÞÐÍÖ¡µÄÖ§³ÖÄÜÁ¦¡£ &merged; &man.ste.4; Çý¶¯Ö§³Ö &man.altq.4; ÁË¡£ @@ -648,8 +649,8 @@ ÏÖÔÚ¿ÉÒÔÓà &man.ifconfig.8; ¹¤¾ßÀ´¶Ô &man.if.bridge.4; ½øÐÐÅäÖÃÁË¡£ - ÏÖÔÚ &man.ipfw.4; IPDIVERT - Ñ¡Ïî¿ÉÒÔÓÃÄÚºËÄ£¿éµÄ·½Ê½À´¼ÓÔØÁË¡£ Èç¹ûûÓмÓÔØÄ£¿é£¬ + &man.ipfw.4; IPDIVERT + Ñ¡ÏîÏÖÔÚ¿ÉÒÔͨ¹ýÄÚºËÄ£¿éµÄ·½Ê½À´¼ÓÔØÁË¡£ Èç¹ûûÓмÓÔØÄ£¿é£¬ Ôò &man.ipfw.4; ½«¾Ü¾ø°²×° divert ¹æÔò£¬ ¶ø &man.natd.8; Ôò»á·µ»Ø´íÎóÐÅÏ¢ protocol not supported¡£ @@ -661,7 +662,7 @@ &man.ipfw.4; ºÍ &man.dummynet.4; ϵͳÄܹ»Ö§³Ö IPv6 ÁË¡£ - &man.ipfw.8;ÏÖÔÚÖ§³Öͨ¹ýת·¢ socket À´Çø·Ö²¢±ê¼Ç + &man.ipfw.8; ÏÖÔÚÖ§³Öͨ¹ýת·¢ socket À´Çø·Ö²¢±ê¼Ç &man.altq.4; °üÁË¡£ ´ËÍ⣬ »¹¿ÉÒÔͨ¹ýÌض¨µÄ payload ³ß´çÀ´Æ¥Åä TCP °ü¡£ &man.ipfw.8; ÏÖÔÚÖ§³Öͨ¹ýת·¢ socket£¬ @@ -702,13 +703,13 @@ ¼ÓÈëÁË &man.ng.tcpmss.4; NetGraph ½Úµã¡£ ËüÖ§³Ö¸Ä±ä TCP °üµÄ MSS Ñ¡Ïî¡£ - ÏÖÔÚ &man.sppp.4; Çý¶¯³ÌÐò°üº¬ÁË֡ת·¢ (Frame Relay) + &man.sppp.4; Çý¶¯³ÌÐòÏÖÔÚÌṩÁË֡ת·¢ (Frame Relay) Ö§³Ö¡£ &merged; &man.sppp.4; Çý¶¯ÏÖÔÚ MPSAFE ÁË¡£ &os; ·ÓɱíÏÖÔÚÒªÇó·ÓɵÄÍø¹Ø±ØÐëºÍ·Óɱ¾ÉíͬÊôͬһµØÖ·×å¡£ - ÏÖÔÚ &man.route.8; ¹¤¾ß»á¾Ü¾øÒìÖÖµØÖ·×å»ìÓÃÁË¡£ ÀýÈ磺 + ÏÖÔÚ£¬ &man.route.8; ¹¤¾ß»á¾Ü¾øÒìÖÖµØÖ·×å»ìÓÃÁË¡£ ÀýÈ磺 &prompt.root; route add 10.1.1.1 -inet6 fe80::1%fxp0 @@ -739,13 +740,13 @@ ʹµÃ¾Ü¾ø·þÎñ¹¥»÷±äµÃÈÝÒס£ ÕâÒ» TCP À©Õ¹±»×î½üµÄÒ»¸ö Internet ²Ý°¸ÈÏΪÊÇÓÐȱÏݵġ£ - ½« KAME IPv4 IPsec ʵÏÖ¼¯³Éµ½ÁË &os; ÖУ¬ - ÏÖÔÚÖ§³Ö TCP-MD5 ÁË¡£ &merged; + ÒѾ­½« KAME IPv4 IPsec ʵÏÖ¼¯³Éµ½ÁË &os; ÖУ¬ + ÏÖÔÚËüÖ§³Ö TCP-MD5 ÁË¡£ &merged; ¶ÌÆÚʹÓö˿ڵÄËæ»ú·ÖÅäµ¼ÖÂÁËÔÚ¸ßÁ¬½ÓËÙÂÊʱµÄ¶Ë¿ÚÖØÓÃÎÊÌâ¡£ ÕâÒ»¹¦ÄÜÏÖÔÚÔÚ¶ÌÆÚÄÚ·¢Éú´óÁ¿Á¬½Ó£¬ ¼´Ð¶˿ڵĴ´½¨ËÙÂÊ¿ìÓÚÿÃë net.inet.ip.portrange.randomcps ʱ£¬ - ±»×Ô¶¯½ûÓà + »á±»×Ô¶¯Í£Óà net.inet.ip.portrange.randomtime Ãë¡£ ÕâÁ½¸ö sysctl ±äÁ¿µÄĬÈÏÖµ£¬ ·Ö±ðÊÇ 10 ºÍ 45¡£ @@ -758,9 +759,9 @@ debug.mpsafenet sysctl ±äÁ¿ÉèÖÃΪ 1)¡£ - ÏÖÔÚ Unix domain socket ÌṩÁË + Unix domain socket ÏÖÔÚÌṩÁËÐÂÔöµÄ LOCAL_CREDS ºÍ - LOCAL_CONNWAIT¡£ + LOCAL_CONNWAIT Ñ¡Ïî¡£ ÆäÖУ¬ LOCAL_CREDS Ñ¡ÏîÌṩÁËÒ»ÖÖ»úÖÆ£¬ ʹµÃ½ÓÊÕ·½Äܹ»ÒÔ &man.recvmsg.2; ¿ØÖÆÏûÏ¢µÄÐÎʽ£¬ ÊÕµ½·¢ËÍÕߵĽø³Ìƾ¾Ý¡£ @@ -772,7 +773,7 @@ ´ÅÅ̼°´æ´¢ - ÏÖÔÚ &man.amr.4; ¿ÉÒÔ°²È«µØÔÚʹÓÃÁË + &man.amr.4; ÏÖÔÚ¿ÉÒÔ°²È«µØÔÚʹÓÃÁË &man.pae.4; µÄϵͳÉÏʹÓÃÁË¡£ &merged; ¼ÓÈëÁË &man.arcmsr.4; Çý¶¯¡£ @@ -806,7 +807,7 @@ ¼ÓÈëÁËÓÃÓÚÖ§³Ö HighPoint RocketRAID 182x ϵÁÐÓ²¼þµÄ &man.hptmv.4; Çý¶¯¡£ &merged; - ÏÖÔÚ &man.ips.4; Çý¶¯ÔÚ½ÏÐ嵀 ServeRAID ÐͺÅÉÏ£¬ + ¾­¹ý¸Ä½øµÄ &man.ips.4; Çý¶¯ÔÚ½ÏÐ嵀 ServeRAID ÐͺÅÉÏ£¬ Äܹ»Ö§³ÖÄں˱ÀÀ£µÄת´¢²Ù×÷ÁË¡£ &merged; ɾȥÁË &man.matcd.4; Çý¶¯¡£ &merged; @@ -835,13 +836,13 @@ Îļþϵͳ Ô­ÏÈÔÚ¹Ò½Óʱ½øÐеģ¬ ÖØмÆËã - Ôà (¼´£¬ ÉÏ´ÎÍ£»úʱûÓÐÕý³£Ð¶ÏÂ) µÄ UFS ºÍ UFS2 + Ôà µÄ (¼´£¬ ÉÏ´ÎÍ£»úʱûÓÐÕý³£Ð¶ÏÂ) UFS ºÍ UFS2 ÎļþϵͳժҪÐÅÏ¢µÄ¹¤×÷£¬ ÏÖÔÚתÓɺǫ́ &man.fsck.8; ½øÐС£ ÕâÒ»Ð޸Ľ«¼«´óµØ¸ÄÉÆϵͳ±ÀÀ£ºó¹Ò½Ó´óÎļþϵͳʱµÄËٶȡ£ - Èç¹ûÏ£Íû»¹Ô­Ô­ÏȵÄÐÐΪ£¬ ¿ÉÒÔͨ¹ý½« + Èç¹ûÏ£Íû»Ö¸´Ô­ÏȵÄÐÐΪ£¬ Ôò¿ÉÒÔͨ¹ý½« vfs.ffs.compute_summary_at_mount sysctl - ±äÁ¿ÉèÖÃΪ·ÇÁãÖµÀ´ÊµÏÖ¡£ &merged; + ±äÁ¿ÉèÖÃΪ·ÇÁãÖµÀ´Íê³É¡£ &merged; ÐÞÕýÁËÓÉÓÚ NFS ·þÎñÆ÷¿ÉÄܵ¼ÖµÄÒ»¸öÄں˱ÀÀ£¡£ ¸ü¶àϸ½Ú£¬ ¿ÉÒÔÔÚ¿±Î󹫸æ @@ -868,7 +869,7 @@ ¼ÓÈëÁËÓÃÓÚ´¦Àí¶þ½øÖÆÎļþ²¹¶¡µÄ &man.bsdiff.1; ºÍ &man.bspatch.1; ¹¤¾ß¡£ - ÏÖÔÚ &man.burncd.8; ¹¤¾ßÄܹ»ÔÚ¹âÅ̶¨ÐÍÖ®ºóÖ´ÐÐÃüÁîÁË (ÀýÈç + &man.burncd.8; ¹¤¾ßÏÖÔÚÄܹ»ÔÚ¹âÅ̶¨ÐÍÖ®ºóÖ´ÐÐÃüÁîÁË (ÀýÈç eject)¡£ ʵÏÖÁË @@ -891,19 +892,19 @@ altpath Ñ¡Ï ÓÃÒÔÉèÖÃÃüÁîµÄËÑË÷·¾¶¡£ - ÏÖÔÚ &man.ftpd.8; ³ÌÐò»áÕýÈ·µØΪĿ¼ºÍÎļþµÄ״̬ʹÓà 212 + &man.ftpd.8; ³ÌÐòÏÖÔÚÄܹ»ÕýÈ·µØΪĿ¼ºÍÎļþµÄ״̬ʹÓà 212 ºÍ 213 ״̬´úÂëÁË (¹ýÈ¥µÄ°æ±¾£¬ Ôø¾­³¤ÆÚʹÓà 211)¡£ ÕâÒ»ÐÐΪÔÚ RFC 959 ÖнøÐÐÁËÃèÊö¡£ &merged; &man.gpt.8; µÄ create ÃüÁ - ÏÖÔÚÖ§³ÖÒ»¸ö ÃüÁîÐбêÖ¾£¬ - ÒÔÇ¿ÖÆ´´½¨ GPT£¬ ¼´Ê¹´ÅÅÌÉÏÔ­ÏÈÒѾ­´æÔÚÁË MBR ¼Ç¼¡£ + ÐÂÔöÁË ÃüÁîÐбêÖ¾£¬ + ÓÃÒÔÔÚÔ­ÏÈÒѾ­´æÔÚÁË MBR ¼Ç¼µÄ´ÅÅÌÉÏÇ¿ÖÆ´´½¨ GPT¡£ &merged; Èç¹ûÖ¸¶¨ÁË AF_UNSPEC£¬ - ÏÖÔÚ &man.getaddrinfo.3; º¯Êý»áÔÚ²éѯ AAAA + ÏÖÔÚµÄ &man.getaddrinfo.3; º¯Êý»áÔÚ²éѯ AAAA ¼Ç¼֮ǰ£¬ Ê×ÏȲéѯ A DNS ×ÊÔ´¼Ç¼¡£ һЩÓÐÎÊÌâµÄ DNS ·þÎñÆ÷»áÔÚ AAAA ¼Ç¼²»´æÔÚʱ·µ»Ø NXDOMAIN£¬ @@ -918,17 +919,17 @@ AF_INET6 ¼Ç¼ÏÈÓÚ AF_INET ¼Ç¼¡£ &merged; - ÏÖÔÚ &man.gethostbyname.3;, &man.gethostbyname2.3;, ÒÔ¼° - &man.gethostbyaddr.3; º¯ÊýÊÇḬ̈߳²È«µÄÁË¡£ &merged; + &man.gethostbyname.3;, &man.gethostbyname2.3;, ÒÔ¼° + &man.gethostbyaddr.3; º¯ÊýÏÖÔÚÊÇḬ̈߳²È«µÄÁË¡£ &merged; &man.getnetent.3;, &man.getnetbyname.3;, ÒÔ¼° - &man.getnetbyaddr.3; º¯ÊýÊÇḬ̈߳²È«µÄÁË¡£ &merged; + &man.getnetbyaddr.3; º¯ÊýÏÖÔÚÊÇḬ̈߳²È«µÄÁË¡£ &merged; - ÏÖÔÚ &man.getprotoent.3;£¬ &man.getprotobyname.3;£¬ ÒÔ¼° - &man.getprotobynumber.3; º¯ÊýÊÇḬ̈߳²È«µÄÁË¡£ &merged; + &man.getprotoent.3;£¬ &man.getprotobyname.3;£¬ ÒÔ¼° + &man.getprotobynumber.3; º¯ÊýÏÖÔÚÊÇḬ̈߳²È«µÄÁË¡£ &merged; - ÏÖÔÚ &man.getservent.3;£¬ &man.getservbyname.3;£¬ ÒÔ¼° - &man.getservbyport.3; º¯ÊýÊÇḬ̈߳²È«µÄÁË¡£ &merged; + &man.getservent.3;£¬ &man.getservbyname.3;£¬ ÒÔ¼° + &man.getservbyport.3; º¯ÊýÏÖÔÚÊÇḬ̈߳²È«µÄÁË¡£ &merged; Ϊ×ñÑ­ IEEE Std 1003.1-2001 ±ê×¼ (Ò²³Æ×÷ POSIX 2001)£¬ struct netent ½á¹¹µÄ @@ -948,10 +949,18 @@ setstate ÕâÈý¸ö×ÓÃüÁîÁË¡£ &merged; - ¶Ô &man.ifconfig.8; ¹¤¾ß½øÐÐÁËÖع¹¡£ ÏÖÔÚËüµÄÄ£¿é»¯¸ü¼ÓÇåÎú£¬ + ¶Ô &man.ifconfig.8; ¹¤¾ß½øÐÐÁËÖع¹¡£ ÏÖÔÚÆäÄ£¿é»¯¸üΪÇåÎú£¬ ²¢ÇÒÔÚ´¦ÀíijЩÍøÂç½Ó¿ÚרÓеŦÄÜʱ¸üΪÁé»î¡£ ¶Ô 802.11 Ö§³Ö½øÐÐÁ˸üУ¬ ÒÔ±ãÖ§³Ö×î½ü¶ÔÓÚ 802.11 ×ÓϵͳºÍÇý¶¯³ÌÐòËù½øÐеĸĽø¡£ + &man.ifconfig.8; ¹¤¾ßÐÂÔöÁË + ²ÎÊý£¬ Ëüʵ¼ÊÉϵȼÛÓÚ £¬ + ÒÔ¼ò»¯²Ù×÷²¢·½±ãÊäÈë¡£ + + &man.ifconfig.8; µÄ ²ÎÊý£¬ + ²»ÔÙÒªÇó±ØÐ븽´øÍøÂç½Ó¿ÚµÄÃû×ֵIJÎÊýÁË¡£ ΪÁ˱£³ÖÏòϼæÈÝ£¬ + Ô­ÓеIJÎÊýÈÔÈ»±£Áô£¬ µ«²»ÔÙ¹ÄÀøʹÓᣠ+ ¶ÔÓÚÏ൱ÊýÁ¿µÄ &man.ipfw.8; Ñ¡ÏîµÄ¼òдÐÎʽµÄÖ§³Ö£¬ ²»ÔÙÍƼöʹÓᣠÈç¹ûʹÓÃÁËÕâЩ¼òд£¬ Ôò»áÔÚ stderr Êä³ö¾¯¸æ£¬ ÒÔ¼°¶ÔÓ¦µÄ¡¢ ÕýÈ·µÄÈ«³ÆÐÎʽ¡£ @@ -1189,7 +1198,7 @@ ×Ö·û£¬ ÏÖÔÚ¿ÉÒԹرÕÑ¡ÏîЭÉÌ£¬ ²¢ÔÊÐí·¢³öÖÃÁ˸ßλµÄ×Ö·ûÁË¡£ ÕâÒ»ÌØÐÔÄܹ»°ïÖúÀûÓà &man.telnet.1; ×÷ΪЭÒé²âÊÔ¹¤¾ßÀ´Ê¹Óᣠ- Ôö¼ÓÁËÓÃÓڹرÕÑ¡¶¨µÄ TCp Á¬½ÓµÄ &man.tcpdrop.8; ÃüÁî¡£ + Ôö¼ÓÁËÓÃÓڹرÕÑ¡¶¨µÄ TCP Á¬½ÓµÄ &man.tcpdrop.8; ÃüÁî¡£ ËüÀ´×Ô OpenBSD. &merged; &man.what.1; ÐÂÔöÁË Ñ¡Ï Æ书ÄÜÊÇ£¬ ==== //depot/projects/soc2005/bsdinstaller/src/release/scripts/package-split.py#2 (text+ko) ==== @@ -7,7 +7,7 @@ # # Usage: package-split.py # -# $FreeBSD: src/release/scripts/package-split.py,v 1.6 2005/05/03 05:37:09 marcel Exp $ +# $FreeBSD: src/release/scripts/package-split.py,v 1.7 2005/11/03 00:23:13 kensmith Exp $ import os import sys @@ -93,12 +93,7 @@ 'www/lynx', 'x11/rxvt', # Formerly on disc3 - 'lang/php4', - 'lang/php5', - 'security/portaudit', - 'www/apache13', - 'www/apache13-modssl', - 'www/apache2']) + 'security/portaudit']) if arch == 'i386': pkgs.extend(['comms/ltmdm', 'www/opera']) ==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#10 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.339 2005/10/12 21:40:41 pjd Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.340 2005/10/17 20:47:44 phk Exp $ # XXX MISSING: mkproto SUBDIR= ac \ @@ -60,6 +60,7 @@ inetd \ iostat \ ip6addrctl \ + ipfwpcap \ IPXrouted \ jail \ jexec \ From owner-p4-projects@FreeBSD.ORG Fri Nov 4 21:35:12 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9836316A421; Fri, 4 Nov 2005 21:35:11 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6C97E16A41F for ; Fri, 4 Nov 2005 21:35:11 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E442343D45 for ; Fri, 4 Nov 2005 21:35:10 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jA4LZAbH050127 for ; Fri, 4 Nov 2005 21:35:10 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA4LZ8vk050097 for perforce@freebsd.org; Fri, 4 Nov 2005 21:35:08 GMT (envelope-from peter@freebsd.org) Date: Fri, 4 Nov 2005 21:35:08 GMT Message-Id: <200511042135.jA4LZ8vk050097@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 86349 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, 04 Nov 2005 21:35:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=86349 Change 86349 by peter@peter_daintree on 2005/11/04 21:35:01 IFC @86347 Affected files ... .. //depot/projects/hammer/Makefile.inc1#105 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#10 integrate .. //depot/projects/hammer/UPDATING#85 integrate .. //depot/projects/hammer/bin/date/date.1#13 integrate .. //depot/projects/hammer/bin/sh/eval.c#10 integrate .. //depot/projects/hammer/bin/sh/exec.c#7 integrate .. //depot/projects/hammer/bin/sh/exec.h#4 integrate .. //depot/projects/hammer/bin/sh/memalloc.c#5 integrate .. //depot/projects/hammer/bin/sh/memalloc.h#3 integrate .. //depot/projects/hammer/bin/sh/miscbltin.c#6 integrate .. //depot/projects/hammer/bin/sh/options.c#5 integrate .. //depot/projects/hammer/bin/sh/sh.1#21 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#7 integrate .. //depot/projects/hammer/contrib/gcc/config/freebsd-spec.h#13 integrate .. //depot/projects/hammer/contrib/smbfs/mount_smbfs/mount_smbfs.8#4 integrate .. //depot/projects/hammer/contrib/top/top.X#6 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#34 integrate .. //depot/projects/hammer/etc/netstart#6 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#41 integrate .. //depot/projects/hammer/etc/rc.d/NETWORKING#9 integrate .. //depot/projects/hammer/etc/rc.d/devd#5 integrate .. //depot/projects/hammer/etc/rc.d/ipfw#11 integrate .. //depot/projects/hammer/etc/rc.d/ipmon#11 integrate .. //depot/projects/hammer/etc/rc.d/newsyslog#3 integrate .. //depot/projects/hammer/etc/rc.d/pf#10 integrate .. //depot/projects/hammer/etc/rc.d/powerd#2 integrate .. //depot/projects/hammer/etc/rc.d/ppp-user#9 delete .. //depot/projects/hammer/etc/rc.d/routing#6 integrate .. //depot/projects/hammer/etc/rc.d/sendmail#12 integrate .. //depot/projects/hammer/etc/rc.initdiskless#5 integrate .. //depot/projects/hammer/etc/rc.subr#28 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/freebsd-native.h#6 integrate .. //depot/projects/hammer/gnu/usr.bin/diff/diff.1#4 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/main.c#10 integrate .. //depot/projects/hammer/include/time.h#5 integrate .. //depot/projects/hammer/lib/Makefile#52 integrate .. //depot/projects/hammer/lib/libc/sys/sendfile.2#12 integrate .. //depot/projects/hammer/lib/libnetgraph/debug.c#3 integrate .. //depot/projects/hammer/lib/libthr/Makefile#14 integrate .. //depot/projects/hammer/lib/libthr/arch/arm/arm/pthread_md.c#2 integrate .. //depot/projects/hammer/lib/libthr/arch/arm/include/pthread_md.h#3 integrate .. //depot/projects/hammer/lib/libthr/arch/i386/include/pthread_md.h#4 integrate .. //depot/projects/hammer/lib/libthr/pthread.map#6 integrate .. //depot/projects/hammer/lib/libthr/thread/Makefile.inc#10 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#16 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#17 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_join.c#12 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#26 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_syscalls.c#10 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_timer.c#1 branch .. //depot/projects/hammer/lib/msun/i387/e_exp.S#3 integrate .. //depot/projects/hammer/lib/msun/man/remainder.3#3 integrate .. //depot/projects/hammer/lib/msun/src/e_rem_pio2f.c#4 integrate .. //depot/projects/hammer/lib/msun/src/k_cos.c#4 integrate .. //depot/projects/hammer/lib/msun/src/k_cosf.c#4 integrate .. //depot/projects/hammer/lib/msun/src/k_sin.c#4 integrate .. //depot/projects/hammer/lib/msun/src/k_sinf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/k_tan.c#5 integrate .. //depot/projects/hammer/lib/msun/src/k_tanf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/math_private.h#6 integrate .. //depot/projects/hammer/lib/msun/src/s_tan.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_tanf.c#2 integrate .. //depot/projects/hammer/release/Makefile#78 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#18 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#11 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#110 integrate .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#7 integrate .. //depot/projects/hammer/release/scripts/package-split.py#5 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#18 integrate .. //depot/projects/hammer/share/examples/ipfilter/ipf-howto.txt#3 integrate .. //depot/projects/hammer/share/man/man4/bge.4#17 integrate .. //depot/projects/hammer/share/man/man4/ciss.4#9 integrate .. //depot/projects/hammer/share/man/man4/lmc.4#4 integrate .. //depot/projects/hammer/share/man/man4/ng_iface.4#6 integrate .. //depot/projects/hammer/share/man/man4/ng_ksocket.4#6 integrate .. //depot/projects/hammer/share/man/man5/libmap.conf.5#10 integrate .. //depot/projects/hammer/share/man/man8/rc.subr.8#6 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#29 integrate .. //depot/projects/hammer/share/mk/bsd.info.mk#7 integrate .. //depot/projects/hammer/sys/alpha/alpha/interrupt.c#21 integrate .. //depot/projects/hammer/sys/alpha/alpha/mp_machdep.c#16 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#45 integrate .. //depot/projects/hammer/sys/alpha/include/smp.h#4 integrate .. //depot/projects/hammer/sys/alpha/isa/isa.c#12 integrate .. //depot/projects/hammer/sys/amd64/acpica/madt.c#43 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#39 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#41 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#58 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#144 integrate .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#42 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#127 integrate .. //depot/projects/hammer/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/hammer/sys/amd64/conf/GENERIC#80 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#84 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#17 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#35 integrate .. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#18 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#49 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#9 integrate .. //depot/projects/hammer/sys/arm/arm/intr.c#11 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#18 integrate .. //depot/projects/hammer/sys/boot/forth/beastie.4th#9 integrate .. //depot/projects/hammer/sys/boot/i386/boot2/boot2.c#18 integrate .. //depot/projects/hammer/sys/boot/i386/loader/Makefile#12 integrate .. //depot/projects/hammer/sys/boot/pc98/loader/Makefile#10 integrate .. //depot/projects/hammer/sys/coda/coda_vfsops.c#18 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#36 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#36 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#34 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#34 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#34 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#38 integrate .. //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#16 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#37 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_windrv.c#10 integrate .. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#24 integrate .. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#23 integrate .. //depot/projects/hammer/sys/compat/ndis/pe_var.h#11 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#36 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#36 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_pe.c#9 integrate .. //depot/projects/hammer/sys/compat/ndis/winx32_wrap.S#3 integrate .. //depot/projects/hammer/sys/conf/Makefile.alpha#11 integrate .. //depot/projects/hammer/sys/conf/Makefile.amd64#20 integrate .. //depot/projects/hammer/sys/conf/Makefile.arm#13 integrate .. //depot/projects/hammer/sys/conf/Makefile.i386#9 integrate .. //depot/projects/hammer/sys/conf/Makefile.ia64#11 integrate .. //depot/projects/hammer/sys/conf/Makefile.pc98#9 integrate .. //depot/projects/hammer/sys/conf/Makefile.powerpc#15 integrate .. //depot/projects/hammer/sys/conf/Makefile.sparc64#10 integrate .. //depot/projects/hammer/sys/conf/files#129 integrate .. //depot/projects/hammer/sys/conf/files.i386#64 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#32 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#35 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#53 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/CHANGES.txt#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acapps.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acconfig.h#14 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acdebug.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acdisasm.h#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acdispat.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acefi.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acenv.h#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acevents.h#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acexcep.h#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acfreebsd.h#15 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acgcc.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acglobal.h#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/achware.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acinterp.h#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/aclocal.h#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acmacros.h#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acnames.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/acnamesp.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acobject.h#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acopcode.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/acoutput.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acparser.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acpi.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acpica_prep.sh#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acpiosxf.h#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acpixf.h#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acresrc.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acstruct.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actables.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actbl.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actbl1.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actbl2.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actypes.h#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acutils.h#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/aecommon.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/aeexec.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/amlcode.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/amlresrc.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/adisasm.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/getopt.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslanalyze.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcodegen.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompile.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.l#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.y#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asldefine.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslerror.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslfiles.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslfold.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslglobal.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asllength.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asllisting.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslload.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asllookup.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslmain.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslmap.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslopcodes.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asloperands.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslopt.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslresource.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslrestype1.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslrestype2.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslstubs.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asltransform.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asltree.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asltypes.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslutils.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbcmds.c#15 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbdisply.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbexec.c#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbfileio.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbhistry.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbinput.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbstats.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbutils.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbxface.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmbuffer.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmnames.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmobject.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmopcode.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmresrc.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmresrcl.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmresrcs.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmutils.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmwalk.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsfield.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsinit.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsmethod.c#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsmthdat.c#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsobject.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsopcode.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsutils.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswexec.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswload.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswscope.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswstate.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evevent.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evgpe.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evgpeblk.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evmisc.c#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evregion.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evrgnini.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evsci.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evxface.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evxfevnt.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evxfregn.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exconfig.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exconvrt.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/excreate.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exdump.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exfield.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exfldio.c#14 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exmisc.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exmutex.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exnames.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg1.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg2.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg3.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg6.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exprep.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exregion.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exresnte.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exresolv.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exresop.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exstore.c#14 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exstoren.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exstorob.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exsystem.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exutils.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwacpi.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwgpe.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwregs.c#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwsleep.c#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwtimer.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsaccess.c#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsalloc.c#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsdump.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsdumpdv.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nseval.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsinit.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsload.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsnames.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsobject.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsparse.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nssearch.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsutils.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nswalk.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsxfeval.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsxfname.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsxfobj.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/osunixxf.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psargs.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psloop.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/psopcode.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psparse.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psscope.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/pstree.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psutils.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/pswalk.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psxface.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsaddr.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rscalc.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rscreate.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsdump.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsinfo.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/rsio.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsirq.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rslist.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsmemory.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsmisc.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsutils.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsxface.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbconvrt.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbget.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbgetall.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbinstal.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbrsdt.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbutils.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbxface.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbxfroot.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utalloc.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utcache.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/utclib.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utcopy.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utdebug.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utdelete.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/uteval.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utglobal.c#14 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utinit.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utmath.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utmisc.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utmutex.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/utobject.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utstate.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/utxface.c#8 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#34 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSynch.c#10 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdTable.c#10 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#65 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#33 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_hpet.c#1 branch .. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#30 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_resource.c#20 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#47 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#54 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#36 integrate .. //depot/projects/hammer/sys/dev/ata/ata-dma.c#23 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#34 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#29 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cam.c#22 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#31 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-fd.c#16 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-tape.c#19 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#21 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus_cis.c#17 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbusreg.h#5 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbusvar.h#7 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#30 integrate .. //depot/projects/hammer/sys/dev/cy/cy.c#14 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#31 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#50 integrate .. //depot/projects/hammer/sys/dev/en/midway.c#24 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#44 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#19 integrate .. //depot/projects/hammer/sys/dev/isp/isp.c#15 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.c#18 integrate .. //depot/projects/hammer/sys/dev/isp/isp_ioctl.h#6 integrate .. //depot/projects/hammer/sys/dev/isp/ispmbox.h#7 integrate .. //depot/projects/hammer/sys/dev/md/md.c#54 integrate .. //depot/projects/hammer/sys/dev/mii/brgphy.c#20 integrate .. //depot/projects/hammer/sys/dev/nve/if_nve.c#11 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_disk.c#13 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#44 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#38 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#49 integrate .. //depot/projects/hammer/sys/dev/pci/pcireg.h#10 integrate .. //depot/projects/hammer/sys/dev/rc/rc.c#17 integrate .. //depot/projects/hammer/sys/dev/sab/sab.c#25 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#49 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#22 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/mixer.c#18 integrate .. //depot/projects/hammer/sys/dev/tdfx/tdfx_pci.c#15 integrate .. //depot/projects/hammer/sys/dev/twa/tw_osl_freebsd.c#3 integrate .. //depot/projects/hammer/sys/dev/twe/twe_freebsd.c#16 integrate .. //depot/projects/hammer/sys/dev/txp/if_txp.c#22 integrate .. //depot/projects/hammer/sys/dev/txp/if_txpreg.h#5 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_ebus.c#8 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_pccard.c#8 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/uart/uart_core.c#11 integrate .. //depot/projects/hammer/sys/dev/uart/uart_kbd_sun.c#6 integrate .. //depot/projects/hammer/sys/dev/uart/uart_tty.c#18 integrate .. //depot/projects/hammer/sys/dev/zs/zs.c#19 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vfsops.c#14 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#21 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_denode.c#23 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_fileno.c#2 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#36 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_ihash.c#5 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_subr.c#12 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#27 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_subr.c#14 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vfsops.c#18 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_node.c#13 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_subr.c#6 integrate .. //depot/projects/hammer/sys/fs/portalfs/portal_vfsops.c#14 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.c#18 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_subr.c#6 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#20 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#24 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#30 integrate .. //depot/projects/hammer/sys/fs/umapfs/umap_vfsops.c#15 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vfsops.c#18 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_work.c#13 integrate .. //depot/projects/hammer/sys/geom/concat/g_concat.c#16 integrate .. //depot/projects/hammer/sys/geom/gate/g_gate.c#13 integrate .. //depot/projects/hammer/sys/geom/label/g_label_ntfs.c#2 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#25 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#18 integrate .. //depot/projects/hammer/sys/geom/shsec/g_shsec.c#4 integrate .. //depot/projects/hammer/sys/geom/stripe/g_stripe.c#14 integrate .. //depot/projects/hammer/sys/geom/uzip/g_uzip.c#6 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_namei.c#3 integrate .. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/hammer/sys/i386/acpica/madt.c#16 integrate .. //depot/projects/hammer/sys/i386/conf/DEFAULTS#1 branch .. //depot/projects/hammer/sys/i386/conf/GENERIC#40 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#78 integrate .. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#17 integrate .. //depot/projects/hammer/sys/i386/i386/io_apic.c#17 integrate .. //depot/projects/hammer/sys/i386/i386/local_apic.c#20 integrate .. //depot/projects/hammer/sys/i386/i386/mptable.c#20 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#74 integrate .. //depot/projects/hammer/sys/i386/include/apicvar.h#14 integrate .. //depot/projects/hammer/sys/i386/include/intr_machdep.h#7 integrate .. //depot/projects/hammer/sys/i386/isa/atpic.c#15 integrate .. //depot/projects/hammer/sys/i386/isa/pcf.c#7 delete .. //depot/projects/hammer/sys/ia64/ia64/interrupt.c#20 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#48 integrate .. //depot/projects/hammer/sys/ia64/ia64/sscdisk.c#11 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vfsops.c#32 integrate .. //depot/projects/hammer/sys/kern/inflate.c#4 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#50 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#30 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#51 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#57 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#51 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#39 integrate .. //depot/projects/hammer/sys/kern/kern_kse.c#28 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_malloc.c#28 integrate .. //depot/projects/hammer/sys/kern/kern_mbuf.c#10 integrate .. //depot/projects/hammer/sys/kern/kern_resource.c#26 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#62 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#30 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#82 integrate .. //depot/projects/hammer/sys/kern/kern_time.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#20 integrate .. //depot/projects/hammer/sys/kern/link_elf.c#23 integrate .. //depot/projects/hammer/sys/kern/subr_kdb.c#15 integrate .. //depot/projects/hammer/sys/kern/subr_pcpu.c#5 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#17 integrate .. //depot/projects/hammer/sys/kern/subr_taskqueue.c#14 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#50 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#48 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#48 integrate .. //depot/projects/hammer/sys/kern/tty.c#48 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#33 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#60 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#38 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#52 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#35 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#35 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#61 integrate .. //depot/projects/hammer/sys/kern/vfs_cluster.c#30 integrate .. //depot/projects/hammer/sys/kern/vfs_export.c#14 integrate .. //depot/projects/hammer/sys/kern/vfs_hash.c#6 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#95 integrate .. //depot/projects/hammer/sys/libkern/iconv.c#10 integrate .. //depot/projects/hammer/sys/modules/Makefile#89 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi/Makefile#11 integrate .. //depot/projects/hammer/sys/modules/i2c/controllers/pcf/Makefile#3 integrate .. //depot/projects/hammer/sys/net/if_gre.c#27 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.c#7 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#20 integrate .. //depot/projects/hammer/sys/netatm/atm_aal5.c#7 integrate .. //depot/projects/hammer/sys/netatm/atm_cm.c#11 integrate .. //depot/projects/hammer/sys/netatm/atm_socket.c#12 integrate .. //depot/projects/hammer/sys/netatm/atm_var.h#8 integrate .. //depot/projects/hammer/sys/netatm/ipatm/ipatm_if.c#7 integrate .. //depot/projects/hammer/sys/netatm/ipatm/ipatm_load.c#9 integrate .. //depot/projects/hammer/sys/netgraph/atm/uni/ng_uni.c#6 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#12 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#5 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#4 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#14 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#14 integrate .. //depot/projects/hammer/sys/netgraph/netflow/netflow.c#11 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#24 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#39 integrate .. //depot/projects/hammer/sys/netgraph/ng_bridge.h#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#24 integrate .. //depot/projects/hammer/sys/netgraph/ng_fec.c#17 integrate .. //depot/projects/hammer/sys/netgraph/ng_ksocket.h#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_parse.h#7 integrate .. //depot/projects/hammer/sys/netgraph/ng_pppoe.h#8 integrate .. //depot/projects/hammer/sys/netgraph/ng_socket.c#20 integrate .. //depot/projects/hammer/sys/netgraph/ng_split.h#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_vlan.h#2 integrate .. //depot/projects/hammer/sys/netinet/igmp.c#11 integrate .. //depot/projects/hammer/sys/netinet/in.c#21 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#15 integrate .. //depot/projects/hammer/sys/netinet/ip_encap.c#7 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#66 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#25 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#28 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#53 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#32 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#53 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#30 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#34 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#21 integrate .. //depot/projects/hammer/sys/netipsec/ipsec_output.c#8 integrate .. //depot/projects/hammer/sys/netipx/ipx_ip.c#10 integrate .. //depot/projects/hammer/sys/netipx/spx_usrreq.c#15 integrate .. //depot/projects/hammer/sys/netkey/keydb.c#6 integrate .. //depot/projects/hammer/sys/netncp/ncp_conn.c#7 integrate .. //depot/projects/hammer/sys/netsmb/smb_conn.c#10 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_dev.c#5 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_lock.c#13 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_nfsiod.c#12 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#31 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#41 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#42 integrate .. //depot/projects/hammer/sys/nfsclient/nlminfo.h#2 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#24 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_syscalls.c#16 integrate .. //depot/projects/hammer/sys/pc98/cbus/sio.c#5 integrate .. //depot/projects/hammer/sys/pc98/conf/DEFAULTS#1 branch .. //depot/projects/hammer/sys/pc98/conf/GENERIC#36 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#39 integrate .. //depot/projects/hammer/sys/pci/if_vrreg.h#9 integrate .. //depot/projects/hammer/sys/pci/if_wb.c#33 integrate .. //depot/projects/hammer/sys/pci/if_wbreg.h#6 integrate .. //depot/projects/hammer/sys/pci/viapm.c#10 integrate .. //depot/projects/hammer/sys/powerpc/include/intr_machdep.h#8 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/db_trace.c#11 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/intr_machdep.c#9 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/locore.S#7 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/mmu_oea.c#1 branch .. //depot/projects/hammer/sys/powerpc/powerpc/ofw_machdep.c#8 integrate .. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#26 integrate .. //depot/projects/hammer/sys/security/mac_portacl/mac_portacl.c#7 integrate .. //depot/projects/hammer/sys/sparc64/include/intr_machdep.h#4 integrate .. //depot/projects/hammer/sys/sparc64/include/smp.h#7 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/intr_machdep.c#12 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#16 integrate .. //depot/projects/hammer/sys/sys/aio.h#3 integrate .. //depot/projects/hammer/sys/sys/interrupt.h#13 integrate .. //depot/projects/hammer/sys/sys/ktrace.h#6 integrate .. //depot/projects/hammer/sys/sys/lockf.h#5 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#45 integrate .. //depot/projects/hammer/sys/sys/param.h#68 integrate .. //depot/projects/hammer/sys/sys/proc.h#89 integrate .. //depot/projects/hammer/sys/sys/protosw.h#10 integrate .. //depot/projects/hammer/sys/sys/signal.h#12 integrate .. //depot/projects/hammer/sys/sys/signalvar.h#16 integrate .. //depot/projects/hammer/sys/sys/socketvar.h#30 integrate .. //depot/projects/hammer/sys/sys/syscall.h#47 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#47 integrate .. //depot/projects/hammer/sys/sys/syscallsubr.h#24 integrate .. //depot/projects/hammer/sys/sys/sysent.h#8 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#47 integrate .. //depot/projects/hammer/sys/sys/timers.h#4 integrate .. //depot/projects/hammer/sys/sys/umtx.h#11 integrate .. //depot/projects/hammer/sys/sys/unistd.h#9 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#25 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_bmap.c#10 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_dirhash.c#9 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_quota.c#14 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vfsops.c#12 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#44 integrate .. //depot/projects/hammer/sys/vm/vm_pager.c#21 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#36 integrate .. //depot/projects/hammer/tools/regression/bin/sh/builtins/command1.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/builtins/command2.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/builtins/command3.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/builtins/command3.0.stdout#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/builtins/command4.127#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/builtins/command5.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/builtins/command5.0.stdout#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/builtins/command6.127#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/builtins/command6.127.stdout#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/regress.sh#2 integrate .. //depot/projects/hammer/tools/tools/netrate/http/http.c#2 integrate .. //depot/projects/hammer/tools/tools/netrate/httpd/httpd.c#2 integrate .. //depot/projects/hammer/usr.bin/calendar/Makefile#6 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#41 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.ukrainian#1 branch .. //depot/projects/hammer/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.holiday#3 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.all#1 branch .. //depot/projects/hammer/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.holiday#1 branch .. //depot/projects/hammer/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.misc#1 branch .. //depot/projects/hammer/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.orthodox#1 branch .. //depot/projects/hammer/usr.bin/kdump/kdump.1#8 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.c#11 integrate .. //depot/projects/hammer/usr.bin/locale/locale.1#6 integrate .. //depot/projects/hammer/usr.bin/pr/pr.c#5 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.c#25 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar_platform.h#10 integrate .. //depot/projects/hammer/usr.bin/tar/write.c#18 integrate .. //depot/projects/hammer/usr.bin/tip/tip/tip.1#5 integrate .. //depot/projects/hammer/usr.sbin/acpi/Makefile.inc#4 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidb/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidb/acpidb.c#4 integrate .. //depot/projects/hammer/usr.sbin/acpi/iasl/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/arp/arp.c#12 integrate .. //depot/projects/hammer/usr.sbin/config/config.h#8 integrate .. //depot/projects/hammer/usr.sbin/config/config.y#10 integrate .. //depot/projects/hammer/usr.sbin/config/configvers.h#7 integrate .. //depot/projects/hammer/usr.sbin/config/lang.l#10 integrate .. //depot/projects/hammer/usr.sbin/config/main.c#10 integrate .. //depot/projects/hammer/usr.sbin/fdcontrol/fdcontrol.c#7 integrate .. //depot/projects/hammer/usr.sbin/fdformat/fdformat.1#3 integrate .. //depot/projects/hammer/usr.sbin/fdread/fdread.c#4 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.8#27 integrate .. //depot/projects/hammer/usr.sbin/ndiscvt/ndiscvt.c#7 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/main.c#12 integrate .. //depot/projects/hammer/usr.sbin/vipw/vipw.8#6 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#105 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.513 2005/10/20 11:22:30 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.514 2005/11/03 08:56:39 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -534,7 +534,7 @@ mkdir -p ${INSTALLTMP} for prog in [ awk cap_mkdb cat chflags chmod chown \ date echo egrep find grep install-info \ - ln make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ + ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ test true uname wc zic; do \ cp `which $$prog` ${INSTALLTMP}; \ done ==== //depot/projects/hammer/ObsoleteFiles.inc#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.20 2005/10/16 14:40:23 netchild Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.21 2005/10/29 05:27:32 yar 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,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20051029: rc.d/ppp-user renamed to rc.d/ppp for convenience +OLD_FILES+=etc/rc.d/ppp-user # 20051012: setkey(8) moved to /sbin/ OLD_FILES+=usr/sbin/setkey # 20050927: bridge(4) replaced by if_bridge(4) ==== //depot/projects/hammer/UPDATING#85 (text+ko) ==== @@ -21,6 +21,11 @@ developers choose to disable these features on build machines to maximize performance. +20051029: + /etc/rc.d/ppp-user has been renamed to /etc/rc.d/ppp. + Its /etc/rc.conf.d configuration file has been `ppp' from + the beginning, and hence there is no need to touch it. + 20051001: kern.polling.enable sysctl MIB is now deprecated. Use ifconfig(8) to turn polling(4) on your interfaces. @@ -419,4 +424,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.422 2005/10/01 20:53:51 glebius Exp $ +$FreeBSD: src/UPDATING,v 1.423 2005/10/29 05:27:32 yar Exp $ ==== //depot/projects/hammer/bin/date/date.1#13 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)date.1 8.3 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/date/date.1,v 1.72 2005/02/13 22:25:09 ru Exp $ +.\" $FreeBSD: src/bin/date/date.1,v 1.73 2005/11/01 19:31:25 trhodes Exp $ .\" -.Dd August 9, 2004 +.Dd November 1, 2005 .Dt DATE 1 .Os .Sh NAME @@ -404,6 +404,7 @@ .Xr timed 8 fails. .Sh SEE ALSO +.Xr locale 1 , .Xr gettimeofday 2 , .Xr strftime 3 , .Xr strptime 3 , @@ -419,6 +420,16 @@ .Nm utility is expected to be compatible with .St -p1003.2 . +The +.Fl d , +.Fl f , +.Fl j , +.Fl n , +.Fl r , +.Fl t , +and +.Fl v +options are all extensions to the standard. .Sh HISTORY A .Nm ==== //depot/projects/hammer/bin/sh/eval.c#10 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.46 2005/09/10 08:25:28 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.48 2005/10/29 07:19:11 stefanf Exp $"); #include #include @@ -976,6 +976,7 @@ struct strlist *sp; char *path; int ch; + int cmd = -1; for (sp = cmdenviron; sp ; sp = sp->next) setvareq(sp->text, VEXPORT|VSTACK); @@ -983,11 +984,17 @@ optind = optreset = 1; opterr = 0; - while ((ch = getopt(argc, argv, "p")) != -1) { + while ((ch = getopt(argc, argv, "pvV")) != -1) { switch (ch) { case 'p': path = stdpath; break; + case 'v': + cmd = TYPECMD_SMALLV; + break; + case 'V': + cmd = TYPECMD_BIGV; + break; case '?': default: error("unknown option: -%c", optopt); @@ -996,6 +1003,11 @@ argc -= optind; argv += optind; + if (cmd != -1) { + if (argc != 1) + error("wrong number of arguments"); + return typecmd_impl(2, argv - 1, cmd); + } if (argc != 0) { old = handler; handler = &loc; ==== //depot/projects/hammer/bin/sh/exec.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.26 2005/08/13 08:12:18 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.28 2005/10/29 07:19:11 stefanf Exp $"); #include #include @@ -705,11 +705,12 @@ } /* - * Locate and print what a word is... + * Shared code for the following builtin commands: + * type, command -v, command -V */ int -typecmd(int argc, char **argv) +typecmd_impl(int argc, char **argv, int cmd) { struct cmdentry entry; struct tblentry *cmdp; @@ -720,20 +721,28 @@ extern char *const parsekwd[]; for (i = 1; i < argc; i++) { - out1str(argv[i]); + if (cmd != TYPECMD_SMALLV) + out1str(argv[i]); + /* First look at the keywords */ for (pp = (char **)parsekwd; *pp; pp++) if (**pp == *argv[i] && equal(*pp, argv[i])) break; if (*pp) { - out1str(" is a shell keyword\n"); + if (cmd == TYPECMD_SMALLV) + out1fmt("%s\n", argv[i]); + else + out1str(" is a shell keyword\n"); continue; } /* Then look at the aliases */ if ((ap = lookupalias(argv[i], 1)) != NULL) { - out1fmt(" is an alias for %s\n", ap->val); + if (cmd == TYPECMD_SMALLV) + out1fmt("alias %s='%s'\n", argv[i], ap->val); + else + out1fmt(" is an alias for %s\n", ap->val); continue; } @@ -756,29 +765,55 @@ name = padvance(&path, argv[i]); stunalloc(name); } while (--j >= 0); - out1fmt(" is%s %s\n", - cmdp ? " a tracked alias for" : "", name); + if (cmd == TYPECMD_SMALLV) + out1fmt("%s\n", name); + else + out1fmt(" is%s %s\n", + (cmdp && cmd == TYPECMD_TYPE) ? + " a tracked alias for" : "", + name); } else { - if (access(argv[i], X_OK) == 0) - out1fmt(" is %s\n", argv[i]); + if (access(argv[i], X_OK) == 0) { + if (cmd == TYPECMD_SMALLV) + out1fmt("%s\n", argv[i]); + else + out1fmt(" is %s\n", argv[i]); + } else out1fmt(": %s\n", strerror(errno)); } break; } case CMDFUNCTION: - out1str(" is a shell function\n"); + if (cmd == TYPECMD_SMALLV) + out1fmt("%s\n", argv[i]); + else + out1str(" is a shell function\n"); break; case CMDBUILTIN: - out1str(" is a shell builtin\n"); + if (cmd == TYPECMD_SMALLV) + out1fmt("%s\n", argv[i]); + else + out1str(" is a shell builtin\n"); break; default: - out1str(": not found\n"); + if (cmd != TYPECMD_SMALLV) + out1str(": not found\n"); error |= 127; break; } } return error; } + +/* + * Locate and print what a word is... + */ + +int +typecmd(int argc, char **argv) +{ + return typecmd_impl(argc, argv, TYPECMD_TYPE); +} ==== //depot/projects/hammer/bin/sh/exec.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)exec.h 8.3 (Berkeley) 6/8/95 - * $FreeBSD: src/bin/sh/exec.h,v 1.12 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/exec.h,v 1.14 2005/10/29 07:19:11 stefanf Exp $ */ /* values of cmdtype */ @@ -39,6 +39,12 @@ #define CMDBUILTIN 1 /* command is a shell builtin */ #define CMDFUNCTION 2 /* command is a shell function */ +/* values for typecmd_impl's third parameter */ +enum { + TYPECMD_SMALLV, /* command -v */ + TYPECMD_BIGV, /* command -V */ + TYPECMD_TYPE /* type */ +}; struct cmdentry { int cmdtype; @@ -63,5 +69,6 @@ void addcmdentry(char *, struct cmdentry *); void defun(char *, union node *); int unsetfunc(char *); +int typecmd_impl(int, char **, int); int typecmd(int, char **); void clearcmdentry(int); ==== //depot/projects/hammer/bin/sh/memalloc.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/memalloc.c,v 1.26 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/memalloc.c,v 1.27 2005/10/28 10:45:19 stefanf Exp $"); #include #include "shell.h" @@ -57,7 +57,10 @@ { pointer p; - if ((p = malloc(nbytes)) == NULL) + INTOFF; + p = malloc(nbytes); + INTON; + if (p == NULL) error("Out of space"); return p; } @@ -70,11 +73,22 @@ pointer ckrealloc(pointer p, int nbytes) { - if ((p = realloc(p, nbytes)) == NULL) + INTOFF; + p = realloc(p, nbytes); + INTON; + if (p == NULL) error("Out of space"); return p; } +void +ckfree(pointer p) +{ + INTOFF; + free(p); + INTON; +} + /* * Make a copy of a string in safe storage. ==== //depot/projects/hammer/bin/sh/memalloc.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)memalloc.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/memalloc.h,v 1.9 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/memalloc.h,v 1.10 2005/10/28 10:45:19 stefanf Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Nov 4 23:58:05 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 425CD16A421; Fri, 4 Nov 2005 23:58:05 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 18B5E16A41F for ; Fri, 4 Nov 2005 23:58:05 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C61DC43D49 for ; Fri, 4 Nov 2005 23:58:04 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jA4Nw4wR055874 for ; Fri, 4 Nov 2005 23:58:04 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA4Nw4EL055870 for perforce@freebsd.org; Fri, 4 Nov 2005 23:58:04 GMT (envelope-from peter@freebsd.org) Date: Fri, 4 Nov 2005 23:58:04 GMT Message-Id: <200511042358.jA4Nw4EL055870@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 86354 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, 04 Nov 2005 23:58:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=86354 Change 86354 by peter@peter_daintree on 2005/11/04 23:57:47 Integ -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/madt.c#44 integrate .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#31 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#45 integrate .. //depot/projects/hammer/sys/amd64/amd64/initcpu.c#16 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#40 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#42 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#59 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#145 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#109 integrate .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#43 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#79 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#83 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#81 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#85 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#36 integrate .. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#19 integrate .. //depot/projects/hammer/sys/amd64/include/md_var.h#36 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#27 integrate .. //depot/projects/hammer/sys/amd64/include/specialreg.h#18 integrate .. //depot/projects/hammer/sys/amd64/include/trap.h#7 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#50 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/madt.c#44 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#31 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#45 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/initcpu.c#16 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#40 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#42 (text+ko) ==== @@ -65,7 +65,7 @@ #define TODO printf("%s: not implemented!\n", __func__) -static MALLOC_DEFINE(M_IOAPIC, "ioapic", "I/O APIC structures"); +static MALLOC_DEFINE(M_IOAPIC, "io_apic", "I/O APIC structures"); /* * I/O APIC interrupt source driver. Each pin is assigned an IRQ cookie ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#59 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#145 (text+ko) ==== @@ -245,8 +245,8 @@ struct sigacts *psp; char *sp; struct trapframe *regs; + int sig; int oonstack; - int sig; td = curthread; p = td->td_proc; ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#109 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#43 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#79 (text+ko) ==== @@ -867,7 +867,6 @@ */ if (orig_tf_rflags & PSL_T) { frame.tf_rflags &= ~PSL_T; - ksiginfo_init_trap(&ksi); ksi.ksi_signo = SIGTRAP; ksi.ksi_code = TRAP_TRACE; ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#83 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#81 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/NOTES#85 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1205) +# (XXX from i386:NOTES,v 1.1210) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.47 2005/10/31 20:45:37 jhb Exp $ # ==== //depot/projects/hammer/sys/amd64/include/apicvar.h#36 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/intr_machdep.h#19 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/md_var.h#36 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/smp.h#27 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/specialreg.h#18 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/trap.h#7 (text+ko) ==== @@ -72,16 +72,6 @@ #define ILL_ALIGN_FAULT T_ALIGNFLT #define ILL_FPOP_FAULT T_FPOPFLT /* coprocessor operand fault */ -/* portable macros for SIGFPE/ARITHTRAP */ -#define FPE_INTOVF 1 /* integer overflow */ -#define FPE_INTDIV 2 /* integer divide by zero */ -#define FPE_FLTDIV 3 /* floating point divide by zero */ -#define FPE_FLTOVF 4 /* floating point overflow */ -#define FPE_FLTUND 5 /* floating point underflow */ -#define FPE_FLTRES 6 /* floating point inexact result */ -#define FPE_FLTINV 7 /* invalid floating point operation */ -#define FPE_FLTSUB 8 /* subscript out of range */ - /* old FreeBSD macros, deprecated */ #define FPE_INTOVF_TRAP 0x1 /* integer overflow */ #define FPE_INTDIV_TRAP 0x2 /* integer divide by zero */ ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#50 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sat Nov 5 11:47:05 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 836E916A421; Sat, 5 Nov 2005 11:47:04 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4ACAB16A41F for ; Sat, 5 Nov 2005 11:47:04 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C2FE943D45 for ; Sat, 5 Nov 2005 11:47:03 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jA5Bl3I8059193 for ; Sat, 5 Nov 2005 11:47:03 GMT (envelope-from gnn@neville-neil.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA5Bl3mf059190 for perforce@freebsd.org; Sat, 5 Nov 2005 11:47:03 GMT (envelope-from gnn@neville-neil.com) Date: Sat, 5 Nov 2005 11:47:03 GMT Message-Id: <200511051147.jA5Bl3mf059190@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gnn@neville-neil.com using -f From: "George V. Neville-Neil" To: Perforce Change Reviews Cc: Subject: PERFORCE change 86366 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, 05 Nov 2005 11:47:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=86366 Change 86366 by gnn@gnn_loopback_loopback on 2005/11/05 11:45:38 Initial integration of HEAD into my loopback view. Affected files ... .. //depot/projects/loopback/src/sys/Makefile#1 branch .. //depot/projects/loopback/src/sys/alpha/Makefile#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/api_up1000.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/atomic.s#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/autoconf.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/busdma_machdep.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/busspace.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/clock.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/clock_if.m#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/cpuconf.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/db_disasm.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/db_instruction.h#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/db_interface.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/db_trace.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/dec_1000a.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/dec_2100_a50.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/dec_2100_a500.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/dec_3000_300.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/dec_3000_500.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/dec_axppci_33.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/dec_eb164.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/dec_eb64plus.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/dec_kn20aa.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/dec_kn300.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/dec_kn8ae.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/dec_st550.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/dec_st6600.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/divrem.m4#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/dump_machdep.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/elf_machdep.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/exception.s#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/fp_emulate.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/gdb_machdep.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/genassym.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/ieee_float.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/ieee_float.h#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/in_cksum.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/interrupt.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/locore.s#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/machdep.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/mem.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/mp_machdep.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/pal.s#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/pmap.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/prom.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/prom_disp.s#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/promcons.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/sgmap.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/support.s#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/swtch.s#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/sys_machdep.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/trap.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/uio_machdep.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/uma_machdep.c#1 branch .. //depot/projects/loopback/src/sys/alpha/alpha/vm_machdep.c#1 branch .. //depot/projects/loopback/src/sys/alpha/compile/.cvsignore#1 branch .. //depot/projects/loopback/src/sys/alpha/conf/.cvsignore#1 branch .. //depot/projects/loopback/src/sys/alpha/conf/GENERIC#1 branch .. //depot/projects/loopback/src/sys/alpha/conf/GENERIC.hints#1 branch .. //depot/projects/loopback/src/sys/alpha/conf/MAC#1 branch .. //depot/projects/loopback/src/sys/alpha/conf/Makefile#1 branch .. //depot/projects/loopback/src/sys/alpha/conf/NOTES#1 branch .. //depot/projects/loopback/src/sys/alpha/include/_bus.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/_inttypes.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/_limits.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/_stdint.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/_types.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/alpha_cpu.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/asm.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/atomic.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/bootinfo.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/bus.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/bus_dma.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/bwx.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/chipset.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/clock.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/clockvar.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/cpu.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/cpuconf.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/cpufunc.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/db_machdep.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/elf.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/endian.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/exec.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/float.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/floatingpoint.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/fpu.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/frame.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/gdb_machdep.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/ieee.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/ieeefp.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/in_cksum.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/inst.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/intr.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/intrcnt.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/ioctl_bt848.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/ioctl_meteor.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/kdb.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/limits.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/md_var.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/memdev.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/mutex.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/pal.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/param.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/pc/bios.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/pc/display.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/pc/vesa.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/pcb.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/pcpu.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/pmap.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/pmc_mdep.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/ppireg.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/proc.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/profile.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/prom.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/pte.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/ptrace.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/reg.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/reloc.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/resource.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/rpb.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/runq.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/setjmp.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/sf_buf.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/sgmap.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/sigframe.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/signal.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/smp.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/stdarg.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/swiz.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/sysarch.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/timerreg.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/ucontext.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/varargs.h#1 branch .. //depot/projects/loopback/src/sys/alpha/include/vmparam.h#1 branch .. //depot/projects/loopback/src/sys/alpha/isa/isa.c#1 branch .. //depot/projects/loopback/src/sys/alpha/isa/isa_dma.c#1 branch .. //depot/projects/loopback/src/sys/alpha/isa/isavar.h#1 branch .. //depot/projects/loopback/src/sys/alpha/isa/mcclock_isa.c#1 branch .. //depot/projects/loopback/src/sys/alpha/linux/Makefile#1 branch .. //depot/projects/loopback/src/sys/alpha/linux/linux.h#1 branch .. //depot/projects/loopback/src/sys/alpha/linux/linux_dummy.c#1 branch .. //depot/projects/loopback/src/sys/alpha/linux/linux_genassym.c#1 branch .. //depot/projects/loopback/src/sys/alpha/linux/linux_ipc64.h#1 branch .. //depot/projects/loopback/src/sys/alpha/linux/linux_locore.s#1 branch .. //depot/projects/loopback/src/sys/alpha/linux/linux_machdep.c#1 branch .. //depot/projects/loopback/src/sys/alpha/linux/linux_proto.h#1 branch .. //depot/projects/loopback/src/sys/alpha/linux/linux_syscall.h#1 branch .. //depot/projects/loopback/src/sys/alpha/linux/linux_sysent.c#1 branch .. //depot/projects/loopback/src/sys/alpha/linux/linux_sysvec.c#1 branch .. //depot/projects/loopback/src/sys/alpha/linux/syscalls.conf#1 branch .. //depot/projects/loopback/src/sys/alpha/linux/syscalls.master#1 branch .. //depot/projects/loopback/src/sys/alpha/mcbus/mcbus.c#1 branch .. //depot/projects/loopback/src/sys/alpha/mcbus/mcbusreg.h#1 branch .. //depot/projects/loopback/src/sys/alpha/mcbus/mcbusvar.h#1 branch .. //depot/projects/loopback/src/sys/alpha/mcbus/mcmem.c#1 branch .. //depot/projects/loopback/src/sys/alpha/mcbus/mcpcia.c#1 branch .. //depot/projects/loopback/src/sys/alpha/mcbus/mcpciareg.h#1 branch .. //depot/projects/loopback/src/sys/alpha/mcbus/mcpciavar.h#1 branch .. //depot/projects/loopback/src/sys/alpha/osf1/Makefile#1 branch .. //depot/projects/loopback/src/sys/alpha/osf1/README.mach-traps#1 branch .. //depot/projects/loopback/src/sys/alpha/osf1/exec_ecoff.h#1 branch .. //depot/projects/loopback/src/sys/alpha/osf1/imgact_osf1.c#1 branch .. //depot/projects/loopback/src/sys/alpha/osf1/osf1.h#1 branch .. //depot/projects/loopback/src/sys/alpha/osf1/osf1_ioctl.c#1 branch .. //depot/projects/loopback/src/sys/alpha/osf1/osf1_misc.c#1 branch .. //depot/projects/loopback/src/sys/alpha/osf1/osf1_mount.c#1 branch .. //depot/projects/loopback/src/sys/alpha/osf1/osf1_proto.h#1 branch .. //depot/projects/loopback/src/sys/alpha/osf1/osf1_signal.c#1 branch .. //depot/projects/loopback/src/sys/alpha/osf1/osf1_signal.h#1 branch .. //depot/projects/loopback/src/sys/alpha/osf1/osf1_syscall.h#1 branch .. //depot/projects/loopback/src/sys/alpha/osf1/osf1_sysent.c#1 branch .. //depot/projects/loopback/src/sys/alpha/osf1/osf1_sysvec.c#1 branch .. //depot/projects/loopback/src/sys/alpha/osf1/osf1_util.h#1 branch .. //depot/projects/loopback/src/sys/alpha/osf1/syscalls.conf#1 branch .. //depot/projects/loopback/src/sys/alpha/osf1/syscalls.master#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/alphapci_if.m#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/apecs.c#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/apecs_pci.c#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/apecsreg.h#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/apecsvar.h#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/bwx.c#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/cia.c#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/cia_pci.c#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/ciareg.h#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/ciavar.h#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/irongate.c#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/irongate_pci.c#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/irongatereg.h#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/irongatevar.h#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/lca.c#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/lca_pci.c#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/lcareg.h#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/lcavar.h#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/pci_eb164_intr.s#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/pci_eb64plus_intr.s#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/pcibus.c#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/pcibus.h#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/swiz.c#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/t2.c#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/t2_pci.c#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/t2reg.h#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/t2var.h#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/tsunami.c#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/tsunami_pci.c#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/tsunamireg.h#1 branch .. //depot/projects/loopback/src/sys/alpha/pci/tsunamivar.h#1 branch .. //depot/projects/loopback/src/sys/alpha/tlsb/dwlpx.c#1 branch .. //depot/projects/loopback/src/sys/alpha/tlsb/dwlpxreg.h#1 branch .. //depot/projects/loopback/src/sys/alpha/tlsb/dwlpxvar.h#1 branch .. //depot/projects/loopback/src/sys/alpha/tlsb/gbus.c#1 branch .. //depot/projects/loopback/src/sys/alpha/tlsb/gbusreg.h#1 branch .. //depot/projects/loopback/src/sys/alpha/tlsb/gbusvar.h#1 branch .. //depot/projects/loopback/src/sys/alpha/tlsb/kftxx.c#1 branch .. //depot/projects/loopback/src/sys/alpha/tlsb/kftxxreg.h#1 branch .. //depot/projects/loopback/src/sys/alpha/tlsb/kftxxvar.h#1 branch .. //depot/projects/loopback/src/sys/alpha/tlsb/mcclock_tlsb.c#1 branch .. //depot/projects/loopback/src/sys/alpha/tlsb/tlsb.c#1 branch .. //depot/projects/loopback/src/sys/alpha/tlsb/tlsbcpu.c#1 branch .. //depot/projects/loopback/src/sys/alpha/tlsb/tlsbmem.c#1 branch .. //depot/projects/loopback/src/sys/alpha/tlsb/tlsbreg.h#1 branch .. //depot/projects/loopback/src/sys/alpha/tlsb/tlsbvar.h#1 branch .. //depot/projects/loopback/src/sys/alpha/tlsb/zs_tlsb.c#1 branch .. //depot/projects/loopback/src/sys/alpha/tlsb/zsreg.h#1 branch .. //depot/projects/loopback/src/sys/alpha/tlsb/zsvar.h#1 branch .. //depot/projects/loopback/src/sys/amd64/Makefile#1 branch .. //depot/projects/loopback/src/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/loopback/src/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/loopback/src/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/loopback/src/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/io.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/support.S#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/loopback/src/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/loopback/src/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/loopback/src/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/loopback/src/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/loopback/src/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/loopback/src/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/loopback/src/sys/amd64/conf/MAC#1 branch .. //depot/projects/loopback/src/sys/amd64/conf/Makefile#1 branch .. //depot/projects/loopback/src/sys/amd64/conf/NOTES#1 branch .. //depot/projects/loopback/src/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/loopback/src/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/loopback/src/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/loopback/src/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/loopback/src/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/loopback/src/sys/amd64/include/_bus.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/_limits.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/_types.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/asm.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/atomic.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/bus.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/clock.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/cpu.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/elf.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/endian.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/exec.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/float.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/fpu.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/frame.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/iodev.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/kdb.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/limits.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/md_var.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/memdev.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/metadata.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/mptable.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/mutex.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/param.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/pcb.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/pmap.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/proc.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/profile.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/psl.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/reg.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/reloc.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/resource.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/runq.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/segments.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/signal.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/smp.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/trap.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/tss.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/varargs.h#1 branch .. //depot/projects/loopback/src/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/loopback/src/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/loopback/src/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/loopback/src/sys/amd64/isa/clock.c#1 branch .. //depot/projects/loopback/src/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/loopback/src/sys/amd64/isa/icu.h#1 branch .. //depot/projects/loopback/src/sys/amd64/isa/isa.c#1 branch .. //depot/projects/loopback/src/sys/amd64/isa/isa.h#1 branch .. //depot/projects/loopback/src/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/loopback/src/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/loopback/src/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/loopback/src/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/loopback/src/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/loopback/src/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/loopback/src/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/loopback/src/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/loopback/src/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/loopback/src/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/loopback/src/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/loopback/src/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/loopback/src/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/loopback/src/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/loopback/src/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/loopback/src/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/loopback/src/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/blockio.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/copystr.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/disassem.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/exception.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/fiq.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/fusu.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/genassym.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/inckern.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/intr.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/locore.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/machdep.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/mem.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/nexus.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/pmap.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/setstack.s#1 branch .. //depot/projects/loopback/src/sys/arm/arm/support.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/swtch.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/trap.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/undefined.c#1 branch .. //depot/projects/loopback/src/sys/arm/arm/vectors.S#1 branch .. //depot/projects/loopback/src/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/loopback/src/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/loopback/src/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/loopback/src/sys/arm/conf/IQ31244#1 branch .. //depot/projects/loopback/src/sys/arm/conf/SIMICS#1 branch .. //depot/projects/loopback/src/sys/arm/include/_bus.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/_limits.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/_stdint.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/_types.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/armreg.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/asm.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/asmacros.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/atomic.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/blockio.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/bus.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/clock.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/cpu.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/disassem.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/elf.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/endian.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/exec.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/fiq.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/float.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/fp.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/frame.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/ieee.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/intr.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/katelib.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/kdb.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/limits.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/machdep.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/md_var.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/memdev.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/metadata.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/mutex.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/param.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/pcb.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/pcpu.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/pmap.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/proc.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/profile.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/psl.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/pte.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/ptrace.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/reg.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/reloc.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/resource.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/runq.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/setjmp.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/sigframe.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/signal.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/smp.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/stdarg.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/swi.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/sysarch.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/trap.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/ucontext.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/undefined.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/utrap.h#1 branch .. //depot/projects/loopback/src/sys/arm/include/vmparam.h#1 branch .. //depot/projects/loopback/src/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/loopback/src/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/loopback/src/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/loopback/src/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/loopback/src/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/loopback/src/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/loopback/src/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/loopback/src/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/loopback/src/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/loopback/src/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/loopback/src/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/loopback/src/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/loopback/src/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/loopback/src/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/loopback/src/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/loopback/src/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/loopback/src/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/loopback/src/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/loopback/src/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/xscalereg.h#1 branch .. //depot/projects/loopback/src/sys/arm/xscale/xscalevar.h#1 branch .. //depot/projects/loopback/src/sys/boot/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/README#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/Makefile.inc#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/boot1/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/boot1/boot1.c#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/cdboot/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/cdboot/version#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/common/Makefile.common#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/common/conf.c#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/common/help.alpha#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/common/ldscript#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/common/main.c#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/libalpha/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/libalpha/OSFpal.c#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/libalpha/alpha_copy.c#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/libalpha/alpha_module.c#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/libalpha/bbinfo.h#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/libalpha/bootinfo.c#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/libalpha/common.h#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/libalpha/delay.c#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/libalpha/devicename.c#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/libalpha/elf_freebsd.c#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/libalpha/getsecs.c#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/libalpha/libalpha.h#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/libalpha/pal.S#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/libalpha/prom.c#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/libalpha/prom_disp.S#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/libalpha/prom_swpal.S#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/libalpha/reboot.c#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/libalpha/srmdisk.c#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/libalpha/srmnet.c#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/libalpha/start.S#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/libalpha/time.c#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/loader/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/loader/version#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/netboot/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/alpha/netboot/version#1 branch .. //depot/projects/loopback/src/sys/boot/arc/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/arc/Makefile.inc#1 branch .. //depot/projects/loopback/src/sys/boot/arc/include/arcfuncs.h#1 branch .. //depot/projects/loopback/src/sys/boot/arc/include/arctypes.h#1 branch .. //depot/projects/loopback/src/sys/boot/arc/include/libarc.h#1 branch .. //depot/projects/loopback/src/sys/boot/arc/lib/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/arc/lib/abort.c#1 branch .. //depot/projects/loopback/src/sys/boot/arc/lib/arcconsole.c#1 branch .. //depot/projects/loopback/src/sys/boot/arc/lib/arcdisk.c#1 branch .. //depot/projects/loopback/src/sys/boot/arc/lib/arch/alpha/copy.c#1 branch .. //depot/projects/loopback/src/sys/boot/arc/lib/arch/alpha/rpb.c#1 branch .. //depot/projects/loopback/src/sys/boot/arc/lib/arch/alpha/setjmp.S#1 branch .. //depot/projects/loopback/src/sys/boot/arc/lib/arch/alpha/start.S#1 branch .. //depot/projects/loopback/src/sys/boot/arc/lib/bootinfo.c#1 branch .. //depot/projects/loopback/src/sys/boot/arc/lib/delay.c#1 branch .. //depot/projects/loopback/src/sys/boot/arc/lib/devicename.c#1 branch .. //depot/projects/loopback/src/sys/boot/arc/lib/elf_freebsd.c#1 branch .. //depot/projects/loopback/src/sys/boot/arc/lib/module.c#1 branch .. //depot/projects/loopback/src/sys/boot/arc/lib/prom.c#1 branch .. //depot/projects/loopback/src/sys/boot/arc/lib/setjmperr.c#1 branch .. //depot/projects/loopback/src/sys/boot/arc/lib/time.c#1 branch .. //depot/projects/loopback/src/sys/boot/arc/loader/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/arc/loader/conf.c#1 branch .. //depot/projects/loopback/src/sys/boot/arc/loader/help.alpha#1 branch .. //depot/projects/loopback/src/sys/boot/arc/loader/main.c#1 branch .. //depot/projects/loopback/src/sys/boot/arc/loader/version#1 branch .. //depot/projects/loopback/src/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/loopback/src/sys/boot/common/bcache.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/boot.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/loopback/src/sys/boot/common/commands.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/console.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/dev_net.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/dev_net.h#1 branch .. //depot/projects/loopback/src/sys/boot/common/devopen.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/help.common#1 branch .. //depot/projects/loopback/src/sys/boot/common/interp.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/isapnp.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/isapnp.h#1 branch .. //depot/projects/loopback/src/sys/boot/common/load.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/load_elf.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/loader.8#1 branch .. //depot/projects/loopback/src/sys/boot/common/ls.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/loopback/src/sys/boot/common/misc.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/module.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/newvers.sh#1 branch .. //depot/projects/loopback/src/sys/boot/common/panic.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/pnp.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/pnpdata#1 branch .. //depot/projects/loopback/src/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/loopback/src/sys/boot/common/ufsread.c#1 branch .. //depot/projects/loopback/src/sys/boot/efi/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/loopback/src/sys/boot/efi/include/README#1 branch .. //depot/projects/loopback/src/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/loopback/src/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/loopback/src/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/loopback/src/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/loopback/src/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/loopback/src/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/loopback/src/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/loopback/src/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/loopback/src/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/loopback/src/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/loopback/src/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/loopback/src/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/loopback/src/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/loopback/src/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/loopback/src/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/loopback/src/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/loopback/src/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/loopback/src/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/loopback/src/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/loopback/src/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/loopback/src/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/loopback/src/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/efi/libefi/bootinfo.c#1 branch .. //depot/projects/loopback/src/sys/boot/efi/libefi/copy.c#1 branch .. //depot/projects/loopback/src/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/loopback/src/sys/boot/efi/libefi/devicename.c#1 branch .. //depot/projects/loopback/src/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/loopback/src/sys/boot/efi/libefi/efiboot.h#1 branch .. //depot/projects/loopback/src/sys/boot/efi/libefi/efifpswa.c#1 branch .. //depot/projects/loopback/src/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/loopback/src/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/loopback/src/sys/boot/efi/libefi/elf_freebsd.c#1 branch .. //depot/projects/loopback/src/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/loopback/src/sys/boot/efi/libefi/module.c#1 branch .. //depot/projects/loopback/src/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/alpha/sysdep.c#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/alpha/sysdep.h#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/dict.c#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/float.c#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/loader.c#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/math64.c#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/math64.h#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/search.c#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/stack.c#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/tools.c#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/unix.c#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/vm.c#1 branch .. //depot/projects/loopback/src/sys/boot/ficl/words.c#1 branch .. //depot/projects/loopback/src/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/loopback/src/sys/boot/forth/frames.4th#1 branch .. //depot/projects/loopback/src/sys/boot/forth/loader.4th#1 branch .. //depot/projects/loopback/src/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/loopback/src/sys/boot/forth/loader.conf#1 branch .. //depot/projects/loopback/src/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/loopback/src/sys/boot/forth/loader.rc#1 branch .. //depot/projects/loopback/src/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/loopback/src/sys/boot/forth/screen.4th#1 branch .. //depot/projects/loopback/src/sys/boot/forth/support.4th#1 branch .. //depot/projects/loopback/src/sys/boot/i386/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/loopback/src/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/loopback/src/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/loopback/src/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/loopback/src/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/loopback/src/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/loopback/src/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/loopback/src/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/loopback/src/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/loopback/src/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/loopback/src/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/loopback/src/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/loopback/src/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/loopback/src/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/loopback/src/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/loopback/src/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/loopback/src/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/loopback/src/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/gatea20.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/loopback/src/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/loopback/src/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/loopback/src/sys/boot/i386/loader/version#1 branch .. //depot/projects/loopback/src/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/loopback/src/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/loopback/src/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/efi/version#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/ski/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/ski/bootinfo.c#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/ski/conf.c#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/ski/copy.c#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/ski/delay.c#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/ski/devicename.c#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/ski/elf_freebsd.c#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/ski/exit.c#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/ski/libski.h#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/ski/main.c#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/ski/start.S#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/ski/time.c#1 branch .. //depot/projects/loopback/src/sys/boot/ia64/ski/version#1 branch .. //depot/projects/loopback/src/sys/boot/ofw/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/loopback/src/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/loopback/src/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/loopback/src/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/loopback/src/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/loopback/src/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/loopback/src/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/loopback/src/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/loopback/src/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/loopback/src/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/loopback/src/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/loopback/src/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/loopback/src/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/loopback/src/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/loopback/src/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/Makefile.inc#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot2/io.c#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot2/start.S#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/boot2/table.c#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/btx/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/libpc98/gatea20.c#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/loader/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/loopback/src/sys/boot/pc98/loader/main.c#1 branch .. //depot/projects/loopback/src/sys/boot/powerpc/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/powerpc/loader/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/powerpc/loader/conf.c#1 branch .. //depot/projects/loopback/src/sys/boot/powerpc/loader/help.ofw#1 branch .. //depot/projects/loopback/src/sys/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/projects/loopback/src/sys/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/loopback/src/sys/boot/powerpc/loader/start.c#1 branch .. //depot/projects/loopback/src/sys/boot/powerpc/loader/version#1 branch .. //depot/projects/loopback/src/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/loopback/src/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/loopback/src/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/loopback/src/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/loopback/src/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/loopback/src/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/loopback/src/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/loopback/src/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/loopback/src/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/loopback/src/sys/bsm/audit.h#1 branch .. //depot/projects/loopback/src/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/loopback/src/sys/cam/cam.c#1 branch .. //depot/projects/loopback/src/sys/cam/cam.h#1 branch .. //depot/projects/loopback/src/sys/cam/cam_ccb.h#1 branch .. //depot/projects/loopback/src/sys/cam/cam_debug.h#1 branch .. //depot/projects/loopback/src/sys/cam/cam_periph.c#1 branch .. //depot/projects/loopback/src/sys/cam/cam_periph.h#1 branch .. //depot/projects/loopback/src/sys/cam/cam_queue.c#1 branch .. //depot/projects/loopback/src/sys/cam/cam_queue.h#1 branch .. //depot/projects/loopback/src/sys/cam/cam_sim.c#1 branch .. //depot/projects/loopback/src/sys/cam/cam_sim.h#1 branch .. //depot/projects/loopback/src/sys/cam/cam_xpt.c#1 branch .. //depot/projects/loopback/src/sys/cam/cam_xpt.h#1 branch .. //depot/projects/loopback/src/sys/cam/cam_xpt_periph.h#1 branch .. //depot/projects/loopback/src/sys/cam/cam_xpt_sim.h#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_all.c#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_all.h#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_da.c#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_da.h#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_low.c#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_low.h#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_message.h#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_target.c#1 branch .. //depot/projects/loopback/src/sys/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/loopback/src/sys/coda/00READ#1 branch .. //depot/projects/loopback/src/sys/coda/README#1 branch .. //depot/projects/loopback/src/sys/coda/TODO#1 branch .. //depot/projects/loopback/src/sys/coda/cnode.h#1 branch .. //depot/projects/loopback/src/sys/coda/coda.h#1 branch .. //depot/projects/loopback/src/sys/coda/coda_fbsd.c#1 branch .. //depot/projects/loopback/src/sys/coda/coda_io.h#1 branch .. //depot/projects/loopback/src/sys/coda/coda_kernel.h#1 branch .. //depot/projects/loopback/src/sys/coda/coda_namecache.c#1 branch .. //depot/projects/loopback/src/sys/coda/coda_namecache.h#1 branch .. //depot/projects/loopback/src/sys/coda/coda_opstats.h#1 branch .. //depot/projects/loopback/src/sys/coda/coda_pioctl.h#1 branch .. //depot/projects/loopback/src/sys/coda/coda_psdev.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<<