From owner-p4-projects@FreeBSD.ORG Sun Mar 21 09:32:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF71E16A4D0; Sun, 21 Mar 2004 09:32:47 -0800 (PST) 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 741C016A4CE for ; Sun, 21 Mar 2004 09:32:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 69A1343D45 for ; Sun, 21 Mar 2004 09:32:47 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2LHWlGe051611 for ; Sun, 21 Mar 2004 09:32:47 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2LHWkdY051608 for perforce@freebsd.org; Sun, 21 Mar 2004 09:32:46 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 21 Mar 2004 09:32:46 -0800 (PST) Message-Id: <200403211732.i2LHWkdY051608@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 49471 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Mar 2004 17:32:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=49471 Change 49471 by rwatson@rwatson_paprika on 2004/03/21 09:32:43 Integrate netperf_socket: - Tweak KSE thread/proc bounds. - Add AF_ARP support. - Less network-specific stuff in if_ether.c Affected files ... .. //depot/projects/netperf_socket/sys/conf/kern.pre.mk#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#5 integrate .. //depot/projects/netperf_socket/sys/net/if_arcsubr.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/if_ether.c#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/conf/kern.pre.mk#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.47 2004/03/19 17:40:45 obrien Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.48 2004/03/21 05:10:34 marcel Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -21,6 +21,8 @@ .else . if ${MACHINE_ARCH} == "amd64" COPTFLAGS?=-O2 -frename-registers -pipe +. elif ${MACHINE_ARCH} == "ia64" +COPTFLAGS?=-O2 -pipe . else COPTFLAGS?=-O -pipe . endif ==== //depot/projects/netperf_socket/sys/kern/kern_thread.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.173 2004/03/13 22:31:39 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.174 2004/03/21 09:22:38 julian Exp $"); #include #include @@ -74,11 +74,11 @@ SYSCTL_INT(_kern_threads, OID_AUTO, debug, CTLFLAG_RW, &thread_debug, 0, "thread debug"); -static int max_threads_per_proc = 150; +static int max_threads_per_proc = 1500; SYSCTL_INT(_kern_threads, OID_AUTO, max_threads_per_proc, CTLFLAG_RW, &max_threads_per_proc, 0, "Limit on threads per proc"); -static int max_groups_per_proc = 50; +static int max_groups_per_proc = 500; SYSCTL_INT(_kern_threads, OID_AUTO, max_groups_per_proc, CTLFLAG_RW, &max_groups_per_proc, 0, "Limit on thread groups per proc"); ==== //depot/projects/netperf_socket/sys/net/if_arcsubr.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: if_arcsubr.c,v 1.36 2001/06/14 05:44:23 itojun Exp $ */ -/* $FreeBSD: src/sys/net/if_arcsubr.c,v 1.15 2003/11/14 21:02:22 andre Exp $ */ +/* $FreeBSD: src/sys/net/if_arcsubr.c,v 1.16 2004/03/21 06:34:34 mdodd Exp $ */ /* * Copyright (c) 1994, 1995 Ignatios Souvatzis @@ -142,6 +142,33 @@ atype = (ifp->if_flags & IFF_LINK0) ? ARCTYPE_IP_OLD : ARCTYPE_IP; break; + case AF_ARP: + { + struct arphdr *ah; + ah = mtod(m, struct arphdr *); + ah->ar_hrd = htons(ARPHRD_ARCNET); + + loop_copy = -1; /* if this is for us, don't do it */ + + switch(ntohs(ah->ar_op)) { + case ARPOP_REVREQUEST: + case ARPOP_REVREPLY: + type = htons(ARCTYPE_REVARP); + break; + case ARPOP_REQUEST: + case ARPOP_REPLY: + default: + type = htons(ARCTYPE_ARP); + break; + } + + if (m->m_flags & M_BCAST) + bcopy(ifp->if_broadcastaddr, adst, ARC_ADDR_LEN); + else + bcopy(ar_tha(ah), adst, ARC_ADDR_LEN); + + } + break; #endif #ifdef INET6 case AF_INET6: ==== //depot/projects/netperf_socket/sys/netinet/if_ether.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_ether.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/netinet/if_ether.c,v 1.118 2004/03/14 00:44:11 mdodd Exp $ + * $FreeBSD: src/sys/netinet/if_ether.c,v 1.119 2004/03/21 06:36:05 mdodd Exp $ */ /* @@ -307,88 +307,33 @@ u_char *enaddr; { struct mbuf *m; - struct ether_header *eh; - struct arc_header *arh; struct arphdr *ah; struct sockaddr sa; - static u_char llcx[] = { 0x82, 0x40, LLC_SNAP_LSAP, LLC_SNAP_LSAP, - LLC_UI, 0x00, 0x00, 0x00, 0x08, 0x06 }; - u_short ar_hrd; if ((m = m_gethdr(M_DONTWAIT, MT_DATA)) == NULL) return; - m->m_pkthdr.rcvif = (struct ifnet *)0; + m->m_len = sizeof(*ah) + 2*sizeof(struct in_addr) + + 2*ifp->if_data.ifi_addrlen; + m->m_pkthdr.len = m->m_len; + MH_ALIGN(m, m->m_len); + ah = mtod(m, struct arphdr *); + bzero((caddr_t)ah, m->m_len); #ifdef MAC mac_create_mbuf_linklayer(ifp, m); #endif - switch (ifp->if_type) { - case IFT_ARCNET: - ar_hrd = htons(ARPHRD_ARCNET); - - m->m_len = arphdr_len2(ifp->if_addrlen, sizeof(struct in_addr)); - m->m_pkthdr.len = m->m_len; - MH_ALIGN(m, m->m_len); - - arh = (struct arc_header *)sa.sa_data; - arh->arc_dhost = *ifp->if_broadcastaddr; - arh->arc_type = ARCTYPE_ARP; - - ah = mtod(m, struct arphdr *); - break; - - case IFT_ISO88025: - ar_hrd = htons(ARPHRD_IEEE802); - - m->m_len = sizeof(llcx) + - arphdr_len2(ifp->if_addrlen, sizeof(struct in_addr)); - m->m_pkthdr.len = m->m_len; - MH_ALIGN(m, m->m_len); - - (void)memcpy(mtod(m, caddr_t), llcx, sizeof(llcx)); - (void)memcpy(sa.sa_data, ifp->if_broadcastaddr, 6); - (void)memcpy(sa.sa_data + 6, enaddr, 6); - sa.sa_data[6] |= TR_RII; - sa.sa_data[12] = TR_AC; - sa.sa_data[13] = TR_LLC_FRAME; - - ah = (struct arphdr *)(mtod(m, char *) + sizeof(llcx)); - break; - case IFT_FDDI: - case IFT_ETHER: - /* - * This may not be correct for types not explicitly - * listed, but this is our best guess - */ - default: - ar_hrd = htons(ARPHRD_ETHER); - - m->m_len = arphdr_len2(ifp->if_addrlen, sizeof(struct in_addr)); - m->m_pkthdr.len = m->m_len; - MH_ALIGN(m, m->m_len); - - eh = (struct ether_header *)sa.sa_data; - /* if_output will not swap */ - eh->ether_type = htons(ETHERTYPE_ARP); - (void)memcpy(eh->ether_dhost, ifp->if_broadcastaddr, - sizeof(eh->ether_dhost)); - - ah = mtod(m, struct arphdr *); - break; - } - - ah->ar_hrd = ar_hrd; ah->ar_pro = htons(ETHERTYPE_IP); ah->ar_hln = ifp->if_addrlen; /* hardware address length */ ah->ar_pln = sizeof(struct in_addr); /* protocol address length */ ah->ar_op = htons(ARPOP_REQUEST); - (void)memcpy(ar_sha(ah), enaddr, ah->ar_hln); - memset(ar_tha(ah), 0, ah->ar_hln); - (void)memcpy(ar_spa(ah), sip, ah->ar_pln); - (void)memcpy(ar_tpa(ah), tip, ah->ar_pln); + bcopy((caddr_t)enaddr, (caddr_t)ar_sha(ah), ah->ar_hln); + bcopy((caddr_t)sip, (caddr_t)ar_spa(ah), ah->ar_pln); + bcopy((caddr_t)tip, (caddr_t)ar_tpa(ah), ah->ar_pln); + sa.sa_family = AF_ARP; + sa.sa_len = 2; + m->m_flags |= M_BCAST; + (*ifp->if_output)(ifp, m, &sa, (struct rtentry *)0); - sa.sa_family = AF_UNSPEC; - sa.sa_len = sizeof(sa); - (*ifp->if_output)(ifp, m, &sa, (struct rtentry *)0); + return; } /* @@ -581,8 +526,6 @@ { struct arphdr *ah; struct ifnet *ifp = m->m_pkthdr.rcvif; - struct ether_header *eh; - struct arc_header *arh; struct iso88025_header *th = (struct iso88025_header *)0; struct iso88025_sockaddr_dl_data *trld; struct llinfo_arp *la = 0; @@ -840,46 +783,11 @@ (void)memcpy(ar_spa(ah), &itaddr, ah->ar_pln); ah->ar_op = htons(ARPOP_REPLY); ah->ar_pro = htons(ETHERTYPE_IP); /* let's be sure! */ - switch (ifp->if_type) { - case IFT_ARCNET: - arh = (struct arc_header *)sa.sa_data; - arh->arc_dhost = *ar_tha(ah); - arh->arc_type = ARCTYPE_ARP; - break; - - case IFT_ISO88025: - /* Re-arrange the source/dest address */ - memcpy(th->iso88025_dhost, th->iso88025_shost, - sizeof(th->iso88025_dhost)); - memcpy(th->iso88025_shost, IF_LLADDR(ifp), - sizeof(th->iso88025_shost)); - /* Set the source routing bit if neccesary */ - if (th->iso88025_dhost[0] & TR_RII) { - th->iso88025_dhost[0] &= ~TR_RII; - if (TR_RCF_RIFLEN(th->rcf) > 2) - th->iso88025_shost[0] |= TR_RII; - } - /* Copy the addresses, ac and fc into sa_data */ - memcpy(sa.sa_data, th->iso88025_dhost, - sizeof(th->iso88025_dhost) * 2); - sa.sa_data[(sizeof(th->iso88025_dhost) * 2)] = TR_AC; - sa.sa_data[(sizeof(th->iso88025_dhost) * 2) + 1] = TR_LLC_FRAME; - break; - case IFT_ETHER: - case IFT_FDDI: - /* - * May not be correct for types not explictly - * listed, but it is our best guess. - */ - default: - eh = (struct ether_header *)sa.sa_data; - (void)memcpy(eh->ether_dhost, ar_tha(ah), - sizeof(eh->ether_dhost)); - eh->ether_type = htons(ETHERTYPE_ARP); - break; - } - sa.sa_family = AF_UNSPEC; - sa.sa_len = sizeof(sa); + m->m_flags &= ~(M_BCAST|M_MCAST); /* never reply by broadcast */ + m->m_len = sizeof(*ah) + (2 * ah->ar_pln) + (2 * ah->ar_hln); + m->m_pkthdr.len = m->m_len; + sa.sa_family = AF_ARP; + sa.sa_len = 2; (*ifp->if_output)(ifp, m, &sa, (struct rtentry *)0); return; } From owner-p4-projects@FreeBSD.ORG Sun Mar 21 17:33:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8E4816A4D1; Sun, 21 Mar 2004 17:33:07 -0800 (PST) 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 9996A16A4CE for ; Sun, 21 Mar 2004 17:33:07 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F35143D39 for ; Sun, 21 Mar 2004 17:33:07 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2M1X7Ge069130 for ; Sun, 21 Mar 2004 17:33:07 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2M1X7sM069127 for perforce@freebsd.org; Sun, 21 Mar 2004 17:33:07 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 21 Mar 2004 17:33:07 -0800 (PST) Message-Id: <200403220133.i2M1X7sM069127@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 49487 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Mar 2004 01:33:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=49487 Change 49487 by rwatson@rwatson_tislabs on 2004/03/21 17:32:13 NDIS driver has increased stack size. NDIS timer events run from NDIS swi instead of timer. NDIS goes back to using bus_alloc_resource() for source code compat reasons. KSE hack in sched_ule. Affected files ... .. //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#7 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/ntoskrnl_var.h#5 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#8 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#9 integrate .. //depot/projects/netperf_socket/sys/conf/kern.post.mk#4 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pccard.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/uio_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/i386/i386/vm_machdep.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/sched_ule.c#3 integrate .. //depot/projects/netperf_socket/sys/net/if_arcsubr.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_tee.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/if_ether.c#4 integrate Differences ... ==== //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.43 2004/03/20 23:39:43 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.44 2004/03/22 00:41:41 wpaul Exp $"); #include #include @@ -268,14 +268,16 @@ ndis_tproc.np_q = &ndis_ttodo; ndis_tproc.np_state = NDIS_PSTATE_SLEEPING; error = kthread_create(ndis_runq, &ndis_tproc, - &ndis_tproc.np_p, RFHIGHPID, 0, "ndis taskqueue"); + &ndis_tproc.np_p, RFHIGHPID, + NDIS_KSTACK_PAGES, "ndis taskqueue"); } if (error == 0) { ndis_iproc.np_q = &ndis_itodo; ndis_iproc.np_state = NDIS_PSTATE_SLEEPING; error = kthread_create(ndis_runq, &ndis_iproc, - &ndis_iproc.np_p, RFHIGHPID, 0, "ndis swi"); + &ndis_iproc.np_p, RFHIGHPID, + NDIS_KSTACK_PAGES, "ndis swi"); } if (error) { ==== //depot/projects/netperf_socket/sys/compat/ndis/ntoskrnl_var.h#5 (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/compat/ndis/ntoskrnl_var.h,v 1.10 2004/03/20 23:39:43 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.11 2004/03/22 00:41:41 wpaul Exp $ */ #ifndef _NTOSKRNL_VAR_H_ @@ -466,6 +466,13 @@ #define STATUS_WAIT_0 0x00000000 +/* + * FreeBSD's kernel stack is 2 pages in size by default. The + * Windows stack is larger, so we need to give our threads more + * stack pages. 4 should be enough, we use 8 just to extra safe. + */ +#define NDIS_KSTACK_PAGES 8 + extern image_patch_table ntoskrnl_functbl[]; extern struct mtx *ntoskrnl_dispatchlock; ==== //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.29 2004/03/20 23:39:43 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.30 2004/03/22 00:41:41 wpaul Exp $"); #include #include @@ -85,6 +85,7 @@ int64_t *, wait_block *); static void ntoskrnl_wakeup(void *); static void ntoskrnl_timercall(void *); +static void ntoskrnl_timersched(void *); __stdcall static void ntoskrnl_writereg_ushort(uint16_t *, uint16_t); __stdcall static uint16_t ntoskrnl_readreg_ushort(uint16_t *); __stdcall static void ntoskrnl_writereg_ulong(uint32_t *, uint32_t); @@ -1585,7 +1586,7 @@ sprintf(tname, "windows kthread %d", ntoskrnl_kth); error = kthread_create(ntoskrnl_thrfunc, tc, &p, - RFHIGHPID, 0, tname); + RFHIGHPID, NDIS_KSTACK_PAGES, tname); *handle = p; ntoskrnl_kth++; @@ -1641,9 +1642,23 @@ return; } +/* + * We run all timer callouts in the ndis swi thread to take + * advantage of its larger stack size. If we don't do this, + * the callout will run in the clock ithread context. + */ + static void +ntoskrnl_timersched(arg) + void *arg; +{ + ndis_sched(ntoskrnl_timercall, arg, NDIS_SWI); + return; +} + +static void ntoskrnl_timercall(arg) - void *arg; + void *arg; { ktimer *timer; __stdcall kdpc_func timerfunc; @@ -1666,7 +1681,7 @@ tv.tv_sec = 0; tv.tv_usec = timer->k_period * 1000; timer->k_handle = - timeout(ntoskrnl_timercall, timer, tvtohz(&tv)); + timeout(ntoskrnl_timersched, timer, tvtohz(&tv)); } if (dpc != NULL) { @@ -1744,7 +1759,7 @@ if (timer->k_handle.callout != NULL && callout_pending(timer->k_handle.callout)) { - untimeout(ntoskrnl_timercall, timer, timer->k_handle); + untimeout(ntoskrnl_timersched, timer, timer->k_handle); pending = TRUE; } else pending = FALSE; @@ -1769,7 +1784,7 @@ } } - timer->k_handle = timeout(ntoskrnl_timercall, timer, tvtohz(&tv)); + timer->k_handle = timeout(ntoskrnl_timersched, timer, tvtohz(&tv)); return(pending); } @@ -1798,7 +1813,7 @@ else pending = FALSE; - untimeout(ntoskrnl_timercall, timer, timer->k_handle); + untimeout(ntoskrnl_timersched, timer, timer->k_handle); return(pending); } ==== //depot/projects/netperf_socket/sys/conf/files.i386#9 (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.479 2004/03/15 22:24:27 fjoe Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.480 2004/03/21 20:28:36 alc Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -239,6 +239,7 @@ i386/i386/sys_machdep.c standard i386/i386/trap.c standard i386/i386/tsc.c standard +i386/i386/uio_machdep.c standard i386/i386/vm86.c standard i386/i386/vm_machdep.c standard i386/ibcs2/ibcs2_errno.c optional ibcs2 ==== //depot/projects/netperf_socket/sys/conf/kern.post.mk#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.63 2004/03/20 22:47:30 marcel Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.64 2004/03/21 19:06:54 obrien 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 @@ -116,7 +116,7 @@ ./assym.s: assym.s assym.s: $S/kern/genassym.sh genassym.o - NM=${NM} sh $S/kern/genassym.sh genassym.o > ${.TARGET} + NM="${NM}" sh $S/kern/genassym.sh genassym.o > ${.TARGET} genassym.o: $S/$M/$M/genassym.c ${CC} -c ${CFLAGS:N-fno-common} $S/$M/$M/genassym.c ==== //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pccard.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pccard.c,v 1.3 2004/03/17 17:50:35 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pccard.c,v 1.4 2004/03/21 19:56:41 wpaul Exp $"); #include #include @@ -194,9 +194,9 @@ sc->ndis_dev = dev; sc->ndis_io_rid = 0; - sc->ndis_res_io = bus_alloc_resource_any(dev, + sc->ndis_res_io = bus_alloc_resource(dev, SYS_RES_IOPORT, &sc->ndis_io_rid, - RF_ACTIVE); + 0, ~0, 1, RF_ACTIVE); if (sc->ndis_res_io == NULL) { device_printf(dev, "couldn't map iospace\n"); @@ -206,8 +206,8 @@ sc->ndis_rescnt++; rid = 0; - sc->ndis_irq = bus_alloc_resource_any(dev, - SYS_RES_IRQ, &rid, + sc->ndis_irq = bus_alloc_resource(dev, + SYS_RES_IRQ, &rid, 0, ~0, 1, RF_SHAREABLE | RF_ACTIVE); if (sc->ndis_irq == NULL) { device_printf(dev, ==== //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pci.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.4 2004/03/17 17:50:35 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.5 2004/03/21 19:56:41 wpaul Exp $"); #include #include @@ -184,9 +184,9 @@ switch (rle->type) { case SYS_RES_IOPORT: sc->ndis_io_rid = rle->rid; - sc->ndis_res_io = bus_alloc_resource_any(dev, + sc->ndis_res_io = bus_alloc_resource(dev, SYS_RES_IOPORT, &sc->ndis_io_rid, - RF_ACTIVE); + 0, ~0, 1, RF_ACTIVE); if (sc->ndis_res_io == NULL) { device_printf(dev, "couldn't map iospace\n"); @@ -205,10 +205,10 @@ if (rle->rid == PCIR_BAR(2)) { sc->ndis_altmem_rid = rle->rid; sc->ndis_res_altmem = - bus_alloc_resource_any(dev, + bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->ndis_altmem_rid, - RF_ACTIVE); + 0, ~0, 1, RF_ACTIVE); if (sc->ndis_res_altmem == NULL) { device_printf(dev, "couldn't map alt " @@ -219,10 +219,10 @@ } else { sc->ndis_mem_rid = rle->rid; sc->ndis_res_mem = - bus_alloc_resource_any(dev, + bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->ndis_mem_rid, - RF_ACTIVE); + 0, ~0, 1, RF_ACTIVE); if (sc->ndis_res_mem == NULL) { device_printf(dev, "couldn't map memory\n"); @@ -233,8 +233,8 @@ break; case SYS_RES_IRQ: rid = rle->rid; - sc->ndis_irq = bus_alloc_resource_any(dev, - SYS_RES_IRQ, &rid, + sc->ndis_irq = bus_alloc_resource(dev, + SYS_RES_IRQ, &rid, 0, ~0, 1, RF_SHAREABLE | RF_ACTIVE); if (sc->ndis_irq == NULL) { device_printf(dev, ==== //depot/projects/netperf_socket/sys/dev/ispfw/ispfw.c#2 (text+ko) ==== @@ -1,7 +1,4 @@ -/* - -#include -__FBSDID("$FreeBSD: src/sys/dev/ispfw/ispfw.c,v 1.10 2003/08/24 17:49:14 obrien Exp $"); +/*- * ISP Firmware Helper Pseudo Device for FreeBSD * * Copyright (c) 2000, 2001, by Matthew Jacob @@ -29,6 +26,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/dev/ispfw/ispfw.c,v 1.11 2004/03/21 18:16:49 obrien Exp $"); + #include #include #include ==== //depot/projects/netperf_socket/sys/i386/i386/vm_machdep.c#7 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.232 2004/03/16 19:04:27 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.233 2004/03/22 00:28:38 wpaul Exp $"); #include "opt_isa.h" #include "opt_kstack_pages.h" @@ -172,7 +172,8 @@ #endif /* Point the pcb to the top of the stack */ - pcb2 = (struct pcb *)(td2->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; + pcb2 = (struct pcb *)(td2->td_kstack + + td2->td_kstack_pages * PAGE_SIZE) - 1; td2->td_pcb = pcb2; /* Copy p1's pcb */ @@ -346,8 +347,8 @@ cpu_thread_setup(struct thread *td) { - td->td_pcb = - (struct pcb *)(td->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; + td->td_pcb = (struct pcb *)(td->td_kstack + + td->td_kstack_pages * PAGE_SIZE) - 1; td->td_frame = (struct trapframe *)((caddr_t)td->td_pcb - 16) - 1; td->td_pcb->pcb_ext = NULL; } ==== //depot/projects/netperf_socket/sys/kern/sched_ule.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.100 2004/02/27 18:52:43 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.101 2004/03/21 18:53:29 obrien Exp $"); #include #include @@ -186,7 +186,7 @@ #define SCHED_INTERACTIVE(kg) \ (sched_interact_score(kg) < SCHED_INTERACT_THRESH) #define SCHED_CURR(kg, ke) \ - (ke->ke_thread->td_priority != kg->kg_user_pri || \ + (ke->ke_thread->td_priority < kg->kg_user_pri || \ SCHED_INTERACTIVE(kg)) /* @@ -1166,11 +1166,8 @@ */ if ((ke->ke_flags & KEF_ASSIGNED) == 0) { if (TD_IS_RUNNING(td)) { - if (td->td_proc->p_flag & P_SA) { - kseq_load_rem(KSEQ_CPU(ke->ke_cpu), ke); - setrunqueue(td); - } else - kseq_runq_add(KSEQ_SELF(), ke); + kseq_load_rem(KSEQ_CPU(ke->ke_cpu), ke); + setrunqueue(td); } else { if (ke->ke_runq) { kseq_load_rem(KSEQ_CPU(ke->ke_cpu), ke); ==== //depot/projects/netperf_socket/sys/net/if_arcsubr.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: if_arcsubr.c,v 1.36 2001/06/14 05:44:23 itojun Exp $ */ -/* $FreeBSD: src/sys/net/if_arcsubr.c,v 1.16 2004/03/21 06:34:34 mdodd Exp $ */ +/* $FreeBSD: src/sys/net/if_arcsubr.c,v 1.17 2004/03/21 17:27:41 mdodd Exp $ */ /* * Copyright (c) 1994, 1995 Ignatios Souvatzis @@ -153,12 +153,12 @@ switch(ntohs(ah->ar_op)) { case ARPOP_REVREQUEST: case ARPOP_REVREPLY: - type = htons(ARCTYPE_REVARP); + atype = ARCTYPE_REVARP; break; case ARPOP_REQUEST: case ARPOP_REPLY: default: - type = htons(ARCTYPE_ARP); + atype = ARCTYPE_ARP; break; } ==== //depot/projects/netperf_socket/sys/netgraph/ng_tee.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ * * Author: Julian Elischer * - * $FreeBSD: src/sys/netgraph/ng_tee.c,v 1.25 2003/07/03 22:09:47 julian Exp $ + * $FreeBSD: src/sys/netgraph/ng_tee.c,v 1.26 2004/03/22 01:15:28 julian Exp $ * $Whistle: ng_tee.c,v 1.18 1999/11/01 09:24:52 julian Exp $ */ @@ -351,11 +351,11 @@ } } /* Deliver frame out destination hook */ - dest->stats.outOctets += m->m_pkthdr.len; - dest->stats.outFrames++; - if (dest->hook) + if (dest->hook) { + dest->stats.outOctets += m->m_pkthdr.len; + dest->stats.outFrames++; NG_FWD_ITEM_HOOK(error, item, dest->hook); - else + } else NG_FREE_ITEM(item); return (error); } ==== //depot/projects/netperf_socket/sys/netinet/if_ether.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_ether.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/netinet/if_ether.c,v 1.119 2004/03/21 06:36:05 mdodd Exp $ + * $FreeBSD: src/sys/netinet/if_ether.c,v 1.120 2004/03/21 18:51:26 mdodd Exp $ */ /* @@ -314,9 +314,9 @@ return; m->m_len = sizeof(*ah) + 2*sizeof(struct in_addr) + 2*ifp->if_data.ifi_addrlen; - m->m_pkthdr.len = m->m_len; - MH_ALIGN(m, m->m_len); - ah = mtod(m, struct arphdr *); + m->m_pkthdr.len = m->m_len; + MH_ALIGN(m, m->m_len); + ah = mtod(m, struct arphdr *); bzero((caddr_t)ah, m->m_len); #ifdef MAC mac_create_mbuf_linklayer(ifp, m); @@ -695,8 +695,7 @@ la->la_asked = 0; la->la_preempt = arp_maxtries; if (la->la_hold) { - (*ifp->if_output)(ifp, la->la_hold, - rt_key(rt), rt); + (*ifp->if_output)(ifp, la->la_hold, rt_key(rt), rt); la->la_hold = 0; } } From owner-p4-projects@FreeBSD.ORG Sun Mar 21 18:12:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AA1F16A4D0; Sun, 21 Mar 2004 18:12:57 -0800 (PST) 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 4EC4C16A4CE for ; Sun, 21 Mar 2004 18:12:57 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 447E143D2D for ; Sun, 21 Mar 2004 18:12:57 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2M2CvGe078612 for ; Sun, 21 Mar 2004 18:12:57 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2M2CuS3078609 for perforce@freebsd.org; Sun, 21 Mar 2004 18:12:56 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sun, 21 Mar 2004 18:12:56 -0800 (PST) Message-Id: <200403220212.i2M2CuS3078609@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 49490 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Mar 2004 02:12:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=49490 Change 49490 by marcel@marcel_nfs on 2004/03/21 18:12:41 Turn DDB into a backend. Add db_main.c for this. Move db_trap() from db_trap.c to db_main.c. It doesn't need its own file and fits better in db_main.c now. Do not compile db_kld.c and db_elf.c. Both contain db_init(), but only one of them takes effect (controlled by DDB_NOKLDSYM). Desupport DDB_NOKLDSYM. I don't see any reason why the kernel's symbol table and the linker cannot be used at the same time. DDB support multiple symbol tables, so we can always start with the kernel's symbol tables and add the kernel when it's ready. Currently only i386 compiles. It doesn't quite work, but I'm more concerned with the structure anyway at this time. More to come... Affected files ... .. //depot/projects/gdb/sys/conf/files#9 edit .. //depot/projects/gdb/sys/conf/options#8 edit .. //depot/projects/gdb/sys/ddb/db_main.c#1 add .. //depot/projects/gdb/sys/ddb/db_output.c#3 edit .. //depot/projects/gdb/sys/ddb/ddb.h#3 edit .. //depot/projects/gdb/sys/i386/i386/db_interface.c#5 edit .. //depot/projects/gdb/sys/i386/i386/trap.c#5 edit .. //depot/projects/gdb/sys/i386/isa/clock.c#2 edit .. //depot/projects/gdb/sys/kern/kern_mutex.c#3 edit .. //depot/projects/gdb/sys/kern/kern_synch.c#6 edit .. //depot/projects/gdb/sys/kern/subr_prf.c#3 edit .. //depot/projects/gdb/sys/kern/tty_cons.c#4 edit Differences ... ==== //depot/projects/gdb/sys/conf/files#9 (text+ko) ==== @@ -224,24 +224,22 @@ opencrypto/rmd160.c optional ipsec crypto/sha1.c optional ipsec crypto/sha2/sha2.c optional ipsec -ddb/db_access.c optional ddb -ddb/db_break.c optional ddb -ddb/db_command.c optional ddb -ddb/db_elf.c optional ddb -ddb/db_examine.c optional ddb -ddb/db_expr.c optional ddb -ddb/db_input.c optional ddb -ddb/db_kld.c optional ddb -ddb/db_lex.c optional ddb -ddb/db_output.c optional ddb -ddb/db_print.c optional ddb -ddb/db_ps.c optional ddb -ddb/db_run.c optional ddb -ddb/db_sym.c optional ddb -ddb/db_trap.c optional ddb -ddb/db_variables.c optional ddb -ddb/db_watch.c optional ddb -ddb/db_write_cmd.c optional ddb +ddb/db_access.c optional ddb +ddb/db_break.c optional ddb +ddb/db_command.c optional ddb +ddb/db_examine.c optional ddb +ddb/db_expr.c optional ddb +ddb/db_input.c optional ddb +ddb/db_lex.c optional ddb +ddb/db_main.c optional ddb +ddb/db_output.c optional ddb +ddb/db_print.c optional ddb +ddb/db_ps.c optional ddb +ddb/db_run.c optional ddb +ddb/db_sym.c optional ddb +ddb/db_variables.c optional ddb +ddb/db_watch.c optional ddb +ddb/db_write_cmd.c optional ddb dev/aac/aac.c optional aac dev/aac/aac_debug.c optional aac dev/aac/aac_disk.c optional aac ==== //depot/projects/gdb/sys/conf/options#8 (text+ko) ==== @@ -73,7 +73,6 @@ # Debugging options. DDB -DDB_NOKLDSYM opt_ddb.h DDB_NUMSYM opt_ddb.h GDB GDBSPEED opt_gdb.h ==== //depot/projects/gdb/sys/ddb/db_output.c#3 (text+ko) ==== @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -112,9 +113,9 @@ * If not in the debugger or the user requests it, output data to * both the console and the message buffer. */ - if (!db_active || ddb_use_printf) { + if (!kdb_active || ddb_use_printf) { printf("%c", c); - if (!db_active) + if (!kdb_active) return; if (c == '\r' || c == '\n') db_check_interrupt(); ==== //depot/projects/gdb/sys/ddb/ddb.h#3 (text+ko) ==== @@ -83,11 +83,9 @@ struct vm_map; -#ifdef ALT_BREAK_TO_DEBUGGER -int db_alt_break(int, int *); -#endif void db_check_interrupt(void); void db_clear_watchpoints(void); +void db_cpu_trap(int, int, struct trapframe *); db_addr_t db_disasm(db_addr_t loc, boolean_t altfmt); /* instruction disassembler */ void db_error(const char *s); @@ -109,13 +107,13 @@ void db_skip_to_eol(void); boolean_t db_stop_at_pc(boolean_t *is_breakpoint); #define db_strcpy strcpy -void db_trap(int type, int code); int db_value_of_name(const char *name, db_expr_t *valuep); void db_write_bytes(vm_offset_t addr, size_t size, char *data); /* machine-dependent */ void db_stack_thread(db_expr_t addr, boolean_t have_addr, db_expr_t count, char *modif); -void db_init(void); + +void _db_init(void); db_cmdfcn_t db_breakpoint_cmd; db_cmdfcn_t db_continue_cmd; ==== //depot/projects/gdb/sys/i386/i386/db_interface.c#5 (text+ko) ==== @@ -48,20 +48,6 @@ #include -#include - -static jmp_buf *db_nofault = 0; -extern jmp_buf db_jmpbuf; - -#if 0 -extern void gdb_handle_exception(db_regs_t *, int, int); -static jmp_buf db_global_jmpbuf; -#endif - -int db_active; -db_regs_t ddb_regs; - - static __inline u_short rss(void) { @@ -75,162 +61,15 @@ return ss; } -#if 0 -/* - * ddb_trap - field a TRACE or BPT trap - */ -int -ddb_trap(int type, int code, struct i386_saved_state *regs) +void +db_cpu_trap(int type, int code, struct trapframe *tf) { - u_int ef; - volatile int ddb_mode = !(boothowto & RB_GDB); - - /* - * XXX try to do nothing if the console is in graphics mode. - * Handle trace traps (and hardware breakpoints...) by ignoring - * them except for forgetting about them. Return 0 for other - * traps to say that we haven't done anything. The trap handler - * will usually panic. We should handle breakpoint traps for - * our breakpoints by disarming our breakpoints and fixing up - * %eip. - */ - if (cnunavailable() != 0 && ddb_mode) { - if (type == T_TRCTRAP) { - regs->tf_eflags &= ~PSL_T; - return (1); - } - return (0); + /* If in kernel mode, esp and ss are not saved, so dummy them up. */ + if (ISPL(tf->tf_cs) == 0) { + tf->tf_esp = (int)&tf->tf_esp; + tf->tf_ss = rss(); } - - ef = read_eflags(); - disable_intr(); - -#ifdef SMP -#ifdef CPUSTOP_ON_DDBBREAK - -#if defined(VERBOSE_CPUSTOP_ON_DDBBREAK) - db_printf("\nCPU%d stopping CPUs: 0x%08x...", PCPU_GET(cpuid), - PCPU_GET(other_cpus)); -#endif /* VERBOSE_CPUSTOP_ON_DDBBREAK */ - - /* We stop all CPUs except ourselves (obviously) */ - stop_cpus(PCPU_GET(other_cpus)); - -#if defined(VERBOSE_CPUSTOP_ON_DDBBREAK) - db_printf(" stopped.\n"); -#endif /* VERBOSE_CPUSTOP_ON_DDBBREAK */ - -#endif /* CPUSTOP_ON_DDBBREAK */ -#endif /* SMP */ - - switch (type) { - case T_BPTFLT: /* breakpoint */ - case T_TRCTRAP: /* debug exception */ - break; - - default: - /* - * XXX this is almost useless now. In most cases, - * trap_fatal() has already printed a much more verbose - * message. However, it is dangerous to print things in - * trap_fatal() - printf() might be reentered and trap. - * The debugger should be given control first. - */ - if (ddb_mode) - db_printf("kernel: type %d trap, code=%x\n", type, code); - - if (db_nofault) { - jmp_buf *no_fault = db_nofault; - db_nofault = 0; - longjmp(*no_fault, 1); - } - } - - /* - * This handles unexpected traps in ddb commands, including calls to - * non-ddb functions. db_nofault only applies to memory accesses by - * internal ddb commands. - */ - if (db_active) - longjmp(db_global_jmpbuf, 1); - - /* - * XXX We really should switch to a local stack here. - */ - ddb_regs = *regs; - - /* - * If in kernel mode, esp and ss are not saved, so dummy them up. - */ - if (ISPL(regs->tf_cs) == 0) { - ddb_regs.tf_esp = (int)®s->tf_esp; - ddb_regs.tf_ss = rss(); - } - - (void) setjmp(db_global_jmpbuf); - if (ddb_mode) { - if (!db_active) - cndbctl(TRUE); - db_active = 1; - db_trap(type, code); - cndbctl(FALSE); - } else { - db_active = 1; - gdb_handle_exception(&ddb_regs, type, code); - } - db_active = 0; - - regs->tf_eip = ddb_regs.tf_eip; - regs->tf_eflags = ddb_regs.tf_eflags; - regs->tf_eax = ddb_regs.tf_eax; - regs->tf_ecx = ddb_regs.tf_ecx; - regs->tf_edx = ddb_regs.tf_edx; - regs->tf_ebx = ddb_regs.tf_ebx; - - /* - * If in user mode, the saved ESP and SS were valid, restore them. - */ - if (ISPL(regs->tf_cs)) { - regs->tf_esp = ddb_regs.tf_esp; - regs->tf_ss = ddb_regs.tf_ss & 0xffff; - } - - regs->tf_ebp = ddb_regs.tf_ebp; - regs->tf_esi = ddb_regs.tf_esi; - regs->tf_edi = ddb_regs.tf_edi; - regs->tf_es = ddb_regs.tf_es & 0xffff; - regs->tf_fs = ddb_regs.tf_fs & 0xffff; - regs->tf_cs = ddb_regs.tf_cs & 0xffff; - regs->tf_ds = ddb_regs.tf_ds & 0xffff; - -#ifdef SMP -#ifdef CPUSTOP_ON_DDBBREAK - -#if defined(VERBOSE_CPUSTOP_ON_DDBBREAK) - db_printf("\nCPU%d restarting CPUs: 0x%08x...", PCPU_GET(cpuid), - stopped_cpus); -#endif /* VERBOSE_CPUSTOP_ON_DDBBREAK */ - - /* Restart all the CPUs we previously stopped */ - if (stopped_cpus != PCPU_GET(other_cpus) && smp_started != 0) { - db_printf("whoa, other_cpus: 0x%08x, stopped_cpus: 0x%08x\n", - PCPU_GET(other_cpus), stopped_cpus); - panic("stop_cpus() failed"); - } - restart_cpus(stopped_cpus); - -#if defined(VERBOSE_CPUSTOP_ON_DDBBREAK) - db_printf(" restarted.\n"); -#endif /* VERBOSE_CPUSTOP_ON_DDBBREAK */ - -#endif /* CPUSTOP_ON_DDBBREAK */ -#endif /* SMP */ - - write_eflags(ef); - - return (1); } -#endif /* * Read bytes from kernel address space for debugger. @@ -240,13 +79,13 @@ { char *src; - db_nofault = &db_jmpbuf; + /* db_nofault = &db_jmpbuf; */ src = (char *)addr; while (size-- > 0) *data++ = *src++; - db_nofault = 0; + /* db_nofault = 0; */ } /* @@ -263,7 +102,7 @@ pt_entry_t *ptep1 = NULL; pt_entry_t oldmap1 = 0; - db_nofault = &db_jmpbuf; + /* db_nofault = &db_jmpbuf; */ if (addr > trunc_page((vm_offset_t)btext) - size && addr < round_page((vm_offset_t)etext)) { @@ -297,7 +136,7 @@ while (size-- > 0) *dst++ = *data++; - db_nofault = 0; + /* db_nofault = 0; */ if (ptep0) { *ptep0 = oldmap0; ==== //depot/projects/gdb/sys/i386/i386/trap.c#5 (text+ko) ==== @@ -189,8 +189,8 @@ atomic_add_int(&cnt.v_trap, 1); type = frame.tf_trapno; -#ifdef DDB - if (db_active) { +#ifdef KDB + if (kdb_active) { eva = (type == T_PAGEFLT ? rcr2() : 0); trap_fatal(&frame, eva); goto out; @@ -807,8 +807,8 @@ printf("Idle\n"); } -#ifdef DDB - if ((debugger_on_panic || db_active) && kdb_trap(type, 0, frame)) +#ifdef KDB + if ((debugger_on_panic || kdb_active) && kdb_trap(type, 0, frame)) return; #endif printf("trap number = %d\n", type); ==== //depot/projects/gdb/sys/i386/isa/clock.c#2 (text+ko) ==== @@ -58,6 +58,7 @@ #include #include #include +#include #include #include #include @@ -457,8 +458,8 @@ * locking for many reasons, but it calls here for at least atkbd * input. */ -#ifdef DDB - if (db_active) +#ifdef KDB + if (kdb_active) prev_tick = 0; else #endif @@ -489,8 +490,8 @@ / 1000000; while (ticks_left > 0) { -#ifdef DDB - if (db_active) { +#ifdef KDB + if (kdb_active) { inb(0x84); tick = prev_tick + 1; } else ==== //depot/projects/gdb/sys/kern/kern_mutex.c#3 (text+ko) ==== @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -580,11 +581,7 @@ } if (i < 60000000) DELAY(1); -#ifdef DDB - else if (!db_active) { -#else - else { -#endif + else if (!kdb_active) { printf("spin lock %s held by %p for > 5 seconds\n", m->mtx_object.lo_name, (void *)m->mtx_lock); #ifdef WITNESS ==== //depot/projects/gdb/sys/kern/kern_synch.c#6 (text+ko) ==== @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -334,16 +335,14 @@ td->td_generation++; /* bump preempt-detect counter */ -#ifdef DDB /* * Don't perform context switches from the debugger. */ - if (db_active) { + if (kdb_active) { mtx_unlock_spin(&sched_lock); db_print_backtrace(); db_error("Context switches not allowed in the debugger"); } -#endif /* * Check if the process exceeds its cpu resource allocation. If ==== //depot/projects/gdb/sys/kern/subr_prf.c#3 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -339,10 +340,8 @@ /* Don't use the tty code after a panic or while in ddb. */ if (panicstr) consdirect = 1; -#ifdef DDB - if (db_active) + if (kdb_active) consdirect = 1; -#endif if (consdirect) { if (c != '\0') cnputc(c); ==== //depot/projects/gdb/sys/kern/tty_cons.c#4 (text+ko) ==== @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #include @@ -566,16 +567,12 @@ return (-1); STAILQ_FOREACH(cnd, &cn_devlist, cnd_next) { cn = cnd->cnd_cn; -#ifdef DDB - if (!db_active || !(cn->cn_flags & CN_FLAG_NODEBUG)) { -#endif + if (!kdb_active || !(cn->cn_flags & CN_FLAG_NODEBUG)) { c = cn->cn_checkc(cn); if (c != -1) { return (c); } -#ifdef DDB } -#endif } return (-1); } @@ -591,21 +588,13 @@ return; STAILQ_FOREACH(cnd, &cn_devlist, cnd_next) { cn = cnd->cnd_cn; -#ifdef DDB - if (!db_active || !(cn->cn_flags & CN_FLAG_NODEBUG)) { -#endif + if (!kdb_active || !(cn->cn_flags & CN_FLAG_NODEBUG)) { if (c == '\n') cn->cn_putc(cn, '\r'); cn->cn_putc(cn, c); -#ifdef DDB } -#endif } -#ifdef DDB - if (console_pausing && !db_active && (c == '\n')) { -#else - if (console_pausing && (c == '\n')) { -#endif + if (console_pausing && c == '\n' && !kdb_active) { for (cp = console_pausestr; *cp != '\0'; cp++) cnputc(*cp); if (cngetc() == '.') From owner-p4-projects@FreeBSD.ORG Sun Mar 21 19:26:29 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BBC516A4D0; Sun, 21 Mar 2004 19:26:29 -0800 (PST) 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 0478A16A4CE for ; Sun, 21 Mar 2004 19:26:29 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC7DD43D1D for ; Sun, 21 Mar 2004 19:26:28 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2M3QSGe093653 for ; Sun, 21 Mar 2004 19:26:28 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2M3QScV093649 for perforce@freebsd.org; Sun, 21 Mar 2004 19:26:28 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 21 Mar 2004 19:26:28 -0800 (PST) Message-Id: <200403220326.i2M3QScV093649@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 49494 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Mar 2004 03:26:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=49494 Change 49494 by rwatson@rwatson_paprika on 2004/03/21 19:26:04 Integrate gratuitous style reformatting of netatalk code, largely relating to parenthesis. Affected files ... .. //depot/projects/netperf_socket/sys/netatalk/aarp.c#3 integrate .. //depot/projects/netperf_socket/sys/netatalk/at_control.c#3 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_output.c#3 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_pcb.c#3 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_usrreq.c#6 integrate Differences ... ==== //depot/projects/netperf_socket/sys/netatalk/aarp.c#3 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1990,1991 Regents of The University of Michigan. * All Rights Reserved. * - * $FreeBSD: src/sys/netatalk/aarp.c,v 1.25 2004/03/13 05:27:17 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/aarp.c,v 1.26 2004/03/22 03:24:10 rwatson Exp $ */ #include "opt_atalk.h" @@ -28,8 +28,8 @@ #include #include -static void aarptfree( struct aarptab *aat); -static void at_aarpinput( struct arpcom *ac, struct mbuf *m); +static void aarptfree(struct aarptab *aat); +static void at_aarpinput(struct arpcom *ac, struct mbuf *m); #define AARPTAB_BSIZ 9 #define AARPTAB_NB 19 @@ -37,16 +37,16 @@ static struct aarptab aarptab[AARPTAB_SIZE]; #define AARPTAB_HASH(a) \ - ((((a).s_net << 8 ) + (a).s_node ) % AARPTAB_NB ) + ((((a).s_net << 8) + (a).s_node) % AARPTAB_NB) #define AARPTAB_LOOK(aat,addr) { \ int n; \ aat = &aarptab[ AARPTAB_HASH(addr) * AARPTAB_BSIZ ]; \ - for ( n = 0; n < AARPTAB_BSIZ; n++, aat++ ) \ - if ( aat->aat_ataddr.s_net == (addr).s_net && \ - aat->aat_ataddr.s_node == (addr).s_node ) \ + for (n = 0; n < AARPTAB_BSIZ; n++, aat++) \ + if (aat->aat_ataddr.s_net == (addr).s_net && \ + aat->aat_ataddr.s_node == (addr).s_node) \ break; \ - if ( n >= AARPTAB_BSIZ ) \ + if (n >= AARPTAB_BSIZ) \ aat = 0; \ } @@ -54,7 +54,7 @@ #define AARPT_KILLC 20 #define AARPT_KILLI 3 -# if !defined( __FreeBSD__ ) +# if !defined(__FreeBSD__) extern u_char etherbroadcastaddr[6]; # endif /* __FreeBSD__ */ @@ -81,17 +81,17 @@ struct aarptab *aat; int i, s; - aarptimer_ch = timeout( aarptimer, (caddr_t)0, AARPT_AGE * hz ); + aarptimer_ch = timeout(aarptimer, (caddr_t)0, AARPT_AGE * hz); aat = aarptab; - for ( i = 0; i < AARPTAB_SIZE; i++, aat++ ) { - if ( aat->aat_flags == 0 || ( aat->aat_flags & ATF_PERM )) + for (i = 0; i < AARPTAB_SIZE; i++, aat++) { + if (aat->aat_flags == 0 || (aat->aat_flags & ATF_PERM)) continue; - if ( ++aat->aat_timer < (( aat->aat_flags & ATF_COM ) ? - AARPT_KILLC : AARPT_KILLI )) + if (++aat->aat_timer < ((aat->aat_flags & ATF_COM) ? + AARPT_KILLC : AARPT_KILLI)) continue; s = splimp(); - aarptfree( aat ); - splx( s ); + aarptfree(aat); + splx(s); } } @@ -101,27 +101,27 @@ * consideration. */ struct at_ifaddr * -at_ifawithnet(struct sockaddr_at *sat ) +at_ifawithnet(struct sockaddr_at *sat) { struct at_ifaddr *aa; struct sockaddr_at *sat2; - for ( aa = at_ifaddr; aa; aa = aa->aa_next ) { + for (aa = at_ifaddr; aa; aa = aa->aa_next) { sat2 = &(aa->aa_addr); - if ( sat2->sat_addr.s_net == sat->sat_addr.s_net ) { + if (sat2->sat_addr.s_net == sat->sat_addr.s_net) { break; } - if( (aa->aa_flags & AFA_PHASE2 ) + if((aa->aa_flags & AFA_PHASE2) && (ntohs(aa->aa_firstnet) <= ntohs(sat->sat_addr.s_net)) && (ntohs(aa->aa_lastnet) >= ntohs(sat->sat_addr.s_net))) { break; } } - return( aa ); + return (aa); } static void -aarpwhohas( struct arpcom *ac, struct sockaddr_at *sat ) +aarpwhohas(struct arpcom *ac, struct sockaddr_at *sat) { struct mbuf *m; struct ether_header *eh; @@ -130,26 +130,26 @@ struct llc *llc; struct sockaddr sa; - if (( m = m_gethdr( M_DONTWAIT, MT_DATA )) == NULL ) { + if ((m = m_gethdr(M_DONTWAIT, MT_DATA)) == NULL) { return; } #ifdef MAC mac_create_mbuf_linklayer(&ac->ac_if, m); #endif - m->m_len = sizeof( *ea ); - m->m_pkthdr.len = sizeof( *ea ); - MH_ALIGN( m, sizeof( *ea )); + m->m_len = sizeof(*ea); + m->m_pkthdr.len = sizeof(*ea); + MH_ALIGN(m, sizeof(*ea)); - ea = mtod( m, struct ether_aarp *); - bzero((caddr_t)ea, sizeof( *ea )); + ea = mtod(m, struct ether_aarp *); + bzero((caddr_t)ea, sizeof(*ea)); - ea->aarp_hrd = htons( AARPHRD_ETHER ); - ea->aarp_pro = htons( ETHERTYPE_AT ); - ea->aarp_hln = sizeof( ea->aarp_sha ); - ea->aarp_pln = sizeof( ea->aarp_spu ); - ea->aarp_op = htons( AARPOP_REQUEST ); + ea->aarp_hrd = htons(AARPHRD_ETHER); + ea->aarp_pro = htons(ETHERTYPE_AT); + ea->aarp_hln = sizeof(ea->aarp_sha); + ea->aarp_pln = sizeof(ea->aarp_spu); + ea->aarp_op = htons(AARPOP_REQUEST); bcopy((caddr_t)ac->ac_enaddr, (caddr_t)ea->aarp_sha, - sizeof( ea->aarp_sha )); + sizeof(ea->aarp_sha)); /* * We need to check whether the output ethernet type should @@ -158,55 +158,55 @@ * interface with the same address as we're looking for. If the * net is phase 2, generate an 802.2 and SNAP header. */ - if ((aa = at_ifawithnet( sat )) == NULL) { - m_freem( m ); + if ((aa = at_ifawithnet(sat)) == NULL) { + m_freem(m); return; } eh = (struct ether_header *)sa.sa_data; - if ( aa->aa_flags & AFA_PHASE2 ) { - bcopy(atmulticastaddr, eh->ether_dhost, sizeof( eh->ether_dhost )); + if (aa->aa_flags & AFA_PHASE2) { + bcopy(atmulticastaddr, eh->ether_dhost, sizeof(eh->ether_dhost)); eh->ether_type = htons(sizeof(struct llc) + sizeof(struct ether_aarp)); - M_PREPEND( m, sizeof( struct llc ), M_TRYWAIT ); - if ( m == NULL ) { + M_PREPEND(m, sizeof(struct llc), M_TRYWAIT); + if (m == NULL) { return; } - llc = mtod( m, struct llc *); + llc = mtod(m, struct llc *); llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP; llc->llc_control = LLC_UI; bcopy(aarp_org_code, llc->llc_org_code, sizeof(aarp_org_code)); - llc->llc_ether_type = htons( ETHERTYPE_AARP ); + llc->llc_ether_type = htons(ETHERTYPE_AARP); - bcopy( &AA_SAT( aa )->sat_addr.s_net, ea->aarp_spnet, - sizeof( ea->aarp_spnet )); - bcopy( &sat->sat_addr.s_net, ea->aarp_tpnet, - sizeof( ea->aarp_tpnet )); - ea->aarp_spnode = AA_SAT( aa )->sat_addr.s_node; + bcopy(&AA_SAT(aa)->sat_addr.s_net, ea->aarp_spnet, + sizeof(ea->aarp_spnet)); + bcopy(&sat->sat_addr.s_net, ea->aarp_tpnet, + sizeof(ea->aarp_tpnet)); + ea->aarp_spnode = AA_SAT(aa)->sat_addr.s_node; ea->aarp_tpnode = sat->sat_addr.s_node; } else { bcopy(ac->ac_if.if_broadcastaddr, (caddr_t)eh->ether_dhost, - sizeof( eh->ether_dhost )); - eh->ether_type = htons( ETHERTYPE_AARP ); + sizeof(eh->ether_dhost)); + eh->ether_type = htons(ETHERTYPE_AARP); - ea->aarp_spa = AA_SAT( aa )->sat_addr.s_node; + ea->aarp_spa = AA_SAT(aa)->sat_addr.s_node; ea->aarp_tpa = sat->sat_addr.s_node; } #ifdef NETATALKDEBUG printf("aarp: sending request for %u.%u\n", - ntohs(AA_SAT( aa )->sat_addr.s_net), - AA_SAT( aa )->sat_addr.s_node); + ntohs(AA_SAT(aa)->sat_addr.s_net), + AA_SAT(aa)->sat_addr.s_node); #endif /* NETATALKDEBUG */ - sa.sa_len = sizeof( struct sockaddr ); + sa.sa_len = sizeof(struct sockaddr); sa.sa_family = AF_UNSPEC; (*ac->ac_if.if_output)(&ac->ac_if, m, &sa, NULL); /* XXX NULL should be routing information */ } int -aarpresolve( ac, m, destsat, desten ) +aarpresolve(ac, m, destsat, desten) struct arpcom *ac; struct mbuf *m; struct sockaddr_at *destsat; @@ -216,79 +216,79 @@ struct aarptab *aat; int s; - if ( at_broadcast( destsat )) { + if (at_broadcast(destsat)) { m->m_flags |= M_BCAST; - if ((aa = at_ifawithnet( destsat )) == NULL) { - m_freem( m ); - return( 0 ); + if ((aa = at_ifawithnet(destsat)) == NULL) { + m_freem(m); + return (0); } - if ( aa->aa_flags & AFA_PHASE2 ) { + if (aa->aa_flags & AFA_PHASE2) { bcopy(atmulticastaddr, (caddr_t)desten, sizeof(atmulticastaddr)); } else { - bcopy( ac->ac_if.if_broadcastaddr, (caddr_t)desten, - sizeof( ac->ac_if.if_addrlen )); + bcopy(ac->ac_if.if_broadcastaddr, (caddr_t)desten, + sizeof(ac->ac_if.if_addrlen)); } - return( 1 ); + return (1); } s = splimp(); - AARPTAB_LOOK( aat, destsat->sat_addr ); - if ( aat == 0 ) { /* No entry */ - aat = aarptnew( &destsat->sat_addr ); - if ( aat == 0 ) { - panic( "aarpresolve: no free entry" ); + AARPTAB_LOOK(aat, destsat->sat_addr); + if (aat == 0) { /* No entry */ + aat = aarptnew(&destsat->sat_addr); + if (aat == 0) { + panic("aarpresolve: no free entry"); } aat->aat_hold = m; - aarpwhohas( ac, destsat ); - splx( s ); - return( 0 ); + aarpwhohas(ac, destsat); + splx(s); + return (0); } /* found an entry */ aat->aat_timer = 0; - if ( aat->aat_flags & ATF_COM ) { /* entry is COMplete */ - bcopy( (caddr_t)aat->aat_enaddr, (caddr_t)desten, - sizeof( aat->aat_enaddr )); - splx( s ); - return( 1 ); + if (aat->aat_flags & ATF_COM) { /* entry is COMplete */ + bcopy((caddr_t)aat->aat_enaddr, (caddr_t)desten, + sizeof(aat->aat_enaddr)); + splx(s); + return (1); } /* entry has not completed */ - if ( aat->aat_hold ) { - m_freem( aat->aat_hold ); + if (aat->aat_hold) { + m_freem(aat->aat_hold); } aat->aat_hold = m; - aarpwhohas( ac, destsat ); - splx( s ); - return( 0 ); + aarpwhohas(ac, destsat); + splx(s); + return (0); } void -aarpintr( m ) +aarpintr(m) struct mbuf *m; { struct arphdr *ar; struct arpcom *ac; ac = (struct arpcom *)m->m_pkthdr.rcvif; - if ( ac->ac_if.if_flags & IFF_NOARP ) + if (ac->ac_if.if_flags & IFF_NOARP) goto out; - if ( m->m_len < sizeof( struct arphdr )) { + if (m->m_len < sizeof(struct arphdr)) { goto out; } - ar = mtod( m, struct arphdr *); - if ( ntohs( ar->ar_hrd ) != AARPHRD_ETHER ) { + ar = mtod(m, struct arphdr *); + if (ntohs(ar->ar_hrd) != AARPHRD_ETHER) { goto out; } - if ( m->m_len < sizeof( struct arphdr ) + 2 * ar->ar_hln + - 2 * ar->ar_pln ) { + if (m->m_len < sizeof(struct arphdr) + 2 * ar->ar_hln + + 2 * ar->ar_pln) { goto out; } - switch( ntohs( ar->ar_pro )) { + switch(ntohs(ar->ar_pro)) { case ETHERTYPE_AT : - at_aarpinput( ac, m ); + at_aarpinput(ac, m); return; default: @@ -296,11 +296,11 @@ } out: - m_freem( m ); + m_freem(m); } static void -at_aarpinput( struct arpcom *ac, struct mbuf *m) +at_aarpinput(struct arpcom *ac, struct mbuf *m) { struct ether_aarp *ea; struct at_ifaddr *aa; @@ -315,28 +315,28 @@ GIANT_REQUIRED; - ea = mtod( m, struct ether_aarp *); + ea = mtod(m, struct ether_aarp *); /* Check to see if from my hardware address */ - if ( !bcmp(( caddr_t )ea->aarp_sha, ( caddr_t )ac->ac_enaddr, - sizeof( ac->ac_enaddr ))) { - m_freem( m ); + if (!bcmp((caddr_t)ea->aarp_sha, (caddr_t)ac->ac_enaddr, + sizeof(ac->ac_enaddr))) { + m_freem(m); return; } - op = ntohs( ea->aarp_op ); - bcopy( ea->aarp_tpnet, &net, sizeof( net )); + op = ntohs(ea->aarp_op); + bcopy(ea->aarp_tpnet, &net, sizeof(net)); - if ( net != 0 ) { /* should be ATADDR_ANYNET? */ + if (net != 0) { /* should be ATADDR_ANYNET? */ sat.sat_len = sizeof(struct sockaddr_at); sat.sat_family = AF_APPLETALK; sat.sat_addr.s_net = net; - if ((aa = at_ifawithnet( &sat )) == NULL) { - m_freem( m ); + if ((aa = at_ifawithnet(&sat)) == NULL) { + m_freem(m); return; } - bcopy( ea->aarp_spnet, &spa.s_net, sizeof( spa.s_net )); - bcopy( ea->aarp_tpnet, &tpa.s_net, sizeof( tpa.s_net )); + bcopy(ea->aarp_spnet, &spa.s_net, sizeof(spa.s_net)); + bcopy(ea->aarp_tpnet, &tpa.s_net, sizeof(tpa.s_net)); } else { /* * Since we don't know the net, we just look for the first @@ -344,141 +344,141 @@ */ for (aa = (struct at_ifaddr *)TAILQ_FIRST(&ac->ac_if.if_addrhead); aa; aa = (struct at_ifaddr *)aa->aa_ifa.ifa_link.tqe_next) { - if ( AA_SAT( aa )->sat_family == AF_APPLETALK && - ( aa->aa_flags & AFA_PHASE2 ) == 0 ) { + if (AA_SAT(aa)->sat_family == AF_APPLETALK && + (aa->aa_flags & AFA_PHASE2) == 0) { break; } } - if ( aa == NULL ) { - m_freem( m ); + if (aa == NULL) { + m_freem(m); return; } - tpa.s_net = spa.s_net = AA_SAT( aa )->sat_addr.s_net; + tpa.s_net = spa.s_net = AA_SAT(aa)->sat_addr.s_net; } spa.s_node = ea->aarp_spnode; tpa.s_node = ea->aarp_tpnode; - ma.s_net = AA_SAT( aa )->sat_addr.s_net; - ma.s_node = AA_SAT( aa )->sat_addr.s_node; + ma.s_net = AA_SAT(aa)->sat_addr.s_net; + ma.s_node = AA_SAT(aa)->sat_addr.s_node; /* * This looks like it's from us. */ - if ( spa.s_net == ma.s_net && spa.s_node == ma.s_node ) { - if ( aa->aa_flags & AFA_PROBING ) { + if (spa.s_net == ma.s_net && spa.s_node == ma.s_node) { + if (aa->aa_flags & AFA_PROBING) { /* * We're probing, someone either responded to our probe, or * probed for the same address we'd like to use. Change the * address we're probing for. */ - untimeout( aarpprobe, ac, aa->aa_ch ); - wakeup( aa ); - m_freem( m ); + untimeout(aarpprobe, ac, aa->aa_ch); + wakeup(aa); + m_freem(m); return; - } else if ( op != AARPOP_PROBE ) { + } else if (op != AARPOP_PROBE) { /* * This is not a probe, and we're not probing. This means * that someone's saying they have the same source address * as the one we're using. Get upset... */ - log( LOG_ERR, + log(LOG_ERR, "aarp: duplicate AT address!! %x:%x:%x:%x:%x:%x\n", ea->aarp_sha[ 0 ], ea->aarp_sha[ 1 ], ea->aarp_sha[ 2 ], ea->aarp_sha[ 3 ], ea->aarp_sha[ 4 ], ea->aarp_sha[ 5 ]); - m_freem( m ); + m_freem(m); return; } } - AARPTAB_LOOK( aat, spa ); - if ( aat ) { - if ( op == AARPOP_PROBE ) { + AARPTAB_LOOK(aat, spa); + if (aat) { + if (op == AARPOP_PROBE) { /* * Someone's probing for spa, dealocate the one we've got, * so that if the prober keeps the address, we'll be able * to arp for him. */ - aarptfree( aat ); - m_freem( m ); + aarptfree(aat); + m_freem(m); return; } - bcopy(( caddr_t )ea->aarp_sha, ( caddr_t )aat->aat_enaddr, - sizeof( ea->aarp_sha )); + bcopy((caddr_t)ea->aarp_sha, (caddr_t)aat->aat_enaddr, + sizeof(ea->aarp_sha)); aat->aat_flags |= ATF_COM; - if ( aat->aat_hold ) { + if (aat->aat_hold) { struct mbuf *mhold = aat->aat_hold; aat->aat_hold = NULL; sat.sat_len = sizeof(struct sockaddr_at); sat.sat_family = AF_APPLETALK; sat.sat_addr = spa; - (*ac->ac_if.if_output)( &ac->ac_if, mhold, + (*ac->ac_if.if_output)(&ac->ac_if, mhold, (struct sockaddr *)&sat, NULL); /* XXX */ } } else if ((tpa.s_net == ma.s_net) && (tpa.s_node == ma.s_node) && (op != AARPOP_PROBE) - && ((aat = aarptnew( &spa )) != NULL)) { - bcopy(( caddr_t )ea->aarp_sha, ( caddr_t )aat->aat_enaddr, - sizeof( ea->aarp_sha )); - aat->aat_flags |= ATF_COM; + && ((aat = aarptnew(&spa)) != NULL)) { + bcopy((caddr_t)ea->aarp_sha, (caddr_t)aat->aat_enaddr, + sizeof(ea->aarp_sha)); + aat->aat_flags |= ATF_COM; } /* * Don't respond to responses, and never respond if we're * still probing. */ - if ( tpa.s_net != ma.s_net || tpa.s_node != ma.s_node || - op == AARPOP_RESPONSE || ( aa->aa_flags & AFA_PROBING )) { - m_freem( m ); + if (tpa.s_net != ma.s_net || tpa.s_node != ma.s_node || + op == AARPOP_RESPONSE || (aa->aa_flags & AFA_PROBING)) { + m_freem(m); return; } - bcopy(( caddr_t )ea->aarp_sha, ( caddr_t )ea->aarp_tha, - sizeof( ea->aarp_sha )); - bcopy(( caddr_t )ac->ac_enaddr, ( caddr_t )ea->aarp_sha, - sizeof( ea->aarp_sha )); + bcopy((caddr_t)ea->aarp_sha, (caddr_t)ea->aarp_tha, + sizeof(ea->aarp_sha)); + bcopy((caddr_t)ac->ac_enaddr, (caddr_t)ea->aarp_sha, + sizeof(ea->aarp_sha)); /* XXX */ eh = (struct ether_header *)sa.sa_data; - bcopy(( caddr_t )ea->aarp_tha, ( caddr_t )eh->ether_dhost, - sizeof( eh->ether_dhost )); + bcopy((caddr_t)ea->aarp_tha, (caddr_t)eh->ether_dhost, + sizeof(eh->ether_dhost)); - if ( aa->aa_flags & AFA_PHASE2 ) { - eh->ether_type = htons( sizeof( struct llc ) + - sizeof( struct ether_aarp )); - M_PREPEND( m, sizeof( struct llc ), M_DONTWAIT ); - if ( m == NULL ) { + if (aa->aa_flags & AFA_PHASE2) { + eh->ether_type = htons(sizeof(struct llc) + + sizeof(struct ether_aarp)); + M_PREPEND(m, sizeof(struct llc), M_DONTWAIT); + if (m == NULL) { return; } - llc = mtod( m, struct llc *); + llc = mtod(m, struct llc *); llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP; llc->llc_control = LLC_UI; - bcopy( aarp_org_code, llc->llc_org_code, sizeof( aarp_org_code )); - llc->llc_ether_type = htons( ETHERTYPE_AARP ); + bcopy(aarp_org_code, llc->llc_org_code, sizeof(aarp_org_code)); + llc->llc_ether_type = htons(ETHERTYPE_AARP); - bcopy( ea->aarp_spnet, ea->aarp_tpnet, sizeof( ea->aarp_tpnet )); - bcopy( &ma.s_net, ea->aarp_spnet, sizeof( ea->aarp_spnet )); + bcopy(ea->aarp_spnet, ea->aarp_tpnet, sizeof(ea->aarp_tpnet)); + bcopy(&ma.s_net, ea->aarp_spnet, sizeof(ea->aarp_spnet)); } else { - eh->ether_type = htons( ETHERTYPE_AARP ); + eh->ether_type = htons(ETHERTYPE_AARP); } ea->aarp_tpnode = ea->aarp_spnode; ea->aarp_spnode = ma.s_node; - ea->aarp_op = htons( AARPOP_RESPONSE ); + ea->aarp_op = htons(AARPOP_RESPONSE); - sa.sa_len = sizeof( struct sockaddr ); + sa.sa_len = sizeof(struct sockaddr); sa.sa_family = AF_UNSPEC; - (*ac->ac_if.if_output)( &ac->ac_if, m, &sa, NULL); /* XXX */ + (*ac->ac_if.if_output)(&ac->ac_if, m, &sa, NULL); /* XXX */ return; } static void -aarptfree( struct aarptab *aat) +aarptfree(struct aarptab *aat) { - if ( aat->aat_hold ) - m_freem( aat->aat_hold ); + if (aat->aat_hold) + m_freem(aat->aat_hold); aat->aat_hold = NULL; aat->aat_timer = aat->aat_flags = 0; aat->aat_ataddr.s_net = 0; @@ -486,7 +486,7 @@ } struct aarptab * -aarptnew( addr ) +aarptnew(addr) struct at_addr *addr; { int n; @@ -494,34 +494,34 @@ struct aarptab *aat, *aato = NULL; static int first = 1; - if ( first ) { + if (first) { first = 0; - aarptimer_ch = timeout( aarptimer, (caddr_t)0, hz ); + aarptimer_ch = timeout(aarptimer, (caddr_t)0, hz); } - aat = &aarptab[ AARPTAB_HASH( *addr ) * AARPTAB_BSIZ ]; - for ( n = 0; n < AARPTAB_BSIZ; n++, aat++ ) { - if ( aat->aat_flags == 0 ) + aat = &aarptab[ AARPTAB_HASH(*addr) * AARPTAB_BSIZ ]; + for (n = 0; n < AARPTAB_BSIZ; n++, aat++) { + if (aat->aat_flags == 0) goto out; - if ( aat->aat_flags & ATF_PERM ) + if (aat->aat_flags & ATF_PERM) continue; - if ((int) aat->aat_timer > oldest ) { + if ((int) aat->aat_timer > oldest) { oldest = aat->aat_timer; aato = aat; } } - if ( aato == NULL ) - return( NULL ); + if (aato == NULL) + return (NULL); aat = aato; - aarptfree( aat ); + aarptfree(aat); out: aat->aat_ataddr = *addr; aat->aat_flags = ATF_INUSE; - return( aat ); + return (aat); } void -aarpprobe( void *arg ) +aarpprobe(void *arg) { struct arpcom *ac = arg; struct mbuf *m; @@ -540,80 +540,80 @@ */ for (aa = (struct at_ifaddr *)TAILQ_FIRST(&ac->ac_if.if_addrhead); aa; aa = (struct at_ifaddr *)aa->aa_ifa.ifa_link.tqe_next) { - if ( AA_SAT( aa )->sat_family == AF_APPLETALK && - ( aa->aa_flags & AFA_PROBING )) { + if (AA_SAT(aa)->sat_family == AF_APPLETALK && + (aa->aa_flags & AFA_PROBING)) { break; } } - if ( aa == NULL ) { /* serious error XXX */ - printf( "aarpprobe why did this happen?!\n" ); + if (aa == NULL) { /* serious error XXX */ + printf("aarpprobe why did this happen?!\n"); return; } - if ( aa->aa_probcnt <= 0 ) { + if (aa->aa_probcnt <= 0) { aa->aa_flags &= ~AFA_PROBING; - wakeup( aa ); + wakeup(aa); return; } else { - aa->aa_ch = timeout( aarpprobe, (caddr_t)ac, hz / 5 ); + aa->aa_ch = timeout(aarpprobe, (caddr_t)ac, hz / 5); } - if (( m = m_gethdr( M_DONTWAIT, MT_DATA )) == NULL ) { + if ((m = m_gethdr(M_DONTWAIT, MT_DATA)) == NULL) { return; } #ifdef MAC mac_create_mbuf_linklayer(&ac->ac_if, m); #endif - m->m_len = sizeof( *ea ); - m->m_pkthdr.len = sizeof( *ea ); - MH_ALIGN( m, sizeof( *ea )); + m->m_len = sizeof(*ea); + m->m_pkthdr.len = sizeof(*ea); + MH_ALIGN(m, sizeof(*ea)); - ea = mtod( m, struct ether_aarp *); - bzero((caddr_t)ea, sizeof( *ea )); + ea = mtod(m, struct ether_aarp *); + bzero((caddr_t)ea, sizeof(*ea)); - ea->aarp_hrd = htons( AARPHRD_ETHER ); - ea->aarp_pro = htons( ETHERTYPE_AT ); - ea->aarp_hln = sizeof( ea->aarp_sha ); - ea->aarp_pln = sizeof( ea->aarp_spu ); - ea->aarp_op = htons( AARPOP_PROBE ); + ea->aarp_hrd = htons(AARPHRD_ETHER); + ea->aarp_pro = htons(ETHERTYPE_AT); + ea->aarp_hln = sizeof(ea->aarp_sha); + ea->aarp_pln = sizeof(ea->aarp_spu); + ea->aarp_op = htons(AARPOP_PROBE); bcopy((caddr_t)ac->ac_enaddr, (caddr_t)ea->aarp_sha, - sizeof( ea->aarp_sha )); + sizeof(ea->aarp_sha)); eh = (struct ether_header *)sa.sa_data; - if ( aa->aa_flags & AFA_PHASE2 ) { - bcopy(atmulticastaddr, eh->ether_dhost, sizeof( eh->ether_dhost )); - eh->ether_type = htons( sizeof( struct llc ) + - sizeof( struct ether_aarp )); - M_PREPEND( m, sizeof( struct llc ), M_TRYWAIT ); - if ( m == NULL ) { + if (aa->aa_flags & AFA_PHASE2) { + bcopy(atmulticastaddr, eh->ether_dhost, sizeof(eh->ether_dhost)); + eh->ether_type = htons(sizeof(struct llc) + + sizeof(struct ether_aarp)); + M_PREPEND(m, sizeof(struct llc), M_TRYWAIT); + if (m == NULL) { return; } - llc = mtod( m, struct llc *); + llc = mtod(m, struct llc *); llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP; llc->llc_control = LLC_UI; - bcopy( aarp_org_code, llc->llc_org_code, sizeof( aarp_org_code )); - llc->llc_ether_type = htons( ETHERTYPE_AARP ); + bcopy(aarp_org_code, llc->llc_org_code, sizeof(aarp_org_code)); + llc->llc_ether_type = htons(ETHERTYPE_AARP); - bcopy( &AA_SAT( aa )->sat_addr.s_net, ea->aarp_spnet, - sizeof( ea->aarp_spnet )); - bcopy( &AA_SAT( aa )->sat_addr.s_net, ea->aarp_tpnet, - sizeof( ea->aarp_tpnet )); - ea->aarp_spnode = ea->aarp_tpnode = AA_SAT( aa )->sat_addr.s_node; + bcopy(&AA_SAT(aa)->sat_addr.s_net, ea->aarp_spnet, + sizeof(ea->aarp_spnet)); + bcopy(&AA_SAT(aa)->sat_addr.s_net, ea->aarp_tpnet, + sizeof(ea->aarp_tpnet)); + ea->aarp_spnode = ea->aarp_tpnode = AA_SAT(aa)->sat_addr.s_node; } else { bcopy(ac->ac_if.if_broadcastaddr, (caddr_t)eh->ether_dhost, - sizeof( eh->ether_dhost )); - eh->ether_type = htons( ETHERTYPE_AARP ); - ea->aarp_spa = ea->aarp_tpa = AA_SAT( aa )->sat_addr.s_node; + sizeof(eh->ether_dhost)); + eh->ether_type = htons(ETHERTYPE_AARP); + ea->aarp_spa = ea->aarp_tpa = AA_SAT(aa)->sat_addr.s_node; } #ifdef NETATALKDEBUG printf("aarp: sending probe for %u.%u\n", - ntohs(AA_SAT( aa )->sat_addr.s_net), - AA_SAT( aa )->sat_addr.s_node); + ntohs(AA_SAT(aa)->sat_addr.s_net), + AA_SAT(aa)->sat_addr.s_node); #endif /* NETATALKDEBUG */ - sa.sa_len = sizeof( struct sockaddr ); + sa.sa_len = sizeof(struct sockaddr); sa.sa_family = AF_UNSPEC; (*ac->ac_if.if_output)(&ac->ac_if, m, &sa, NULL); /* XXX */ aa->aa_probcnt--; @@ -625,10 +625,10 @@ struct aarptab *aat; int i; - untimeout( aarptimer, 0, aarptimer_ch ); - for ( i = 0, aat = aarptab; i < AARPTAB_SIZE; i++, aat++ ) { - if ( aat->aat_hold ) { - m_freem( aat->aat_hold ); + untimeout(aarptimer, 0, aarptimer_ch); + for (i = 0, aat = aarptab; i < AARPTAB_SIZE; i++, aat++) { + if (aat->aat_hold) { + m_freem(aat->aat_hold); aat->aat_hold = NULL; } } ==== //depot/projects/netperf_socket/sys/netatalk/at_control.c#3 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1990,1991 Regents of The University of Michigan. * All Rights Reserved. * - * $FreeBSD: src/sys/netatalk/at_control.c,v 1.36 2004/03/21 03:28:08 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/at_control.c,v 1.37 2004/03/22 03:24:10 rwatson Exp $ */ #include @@ -31,19 +31,19 @@ struct at_addr *addr, struct at_addr *mask); static int aa_dosingleroute(struct ifaddr *ifa, struct at_addr *addr, struct at_addr *mask, int cmd, int flags); -static int at_scrub( struct ifnet *ifp, struct at_ifaddr *aa ); -static int at_ifinit( struct ifnet *ifp, struct at_ifaddr *aa, - struct sockaddr_at *sat ); +static int at_scrub(struct ifnet *ifp, struct at_ifaddr *aa); +static int at_ifinit(struct ifnet *ifp, struct at_ifaddr *aa, + struct sockaddr_at *sat); static int aa_claim_addr(struct ifaddr *ifa, struct sockaddr *gw); # define sateqaddr(a,b) ((a)->sat_len == (b)->sat_len && \ (a)->sat_family == (b)->sat_family && \ (a)->sat_addr.s_net == (b)->sat_addr.s_net && \ - (a)->sat_addr.s_node == (b)->sat_addr.s_node ) + (a)->sat_addr.s_node == (b)->sat_addr.s_node) int at_control(struct socket *so, u_long cmd, caddr_t data, - struct ifnet *ifp, struct thread *td ) + struct ifnet *ifp, struct thread *td) { struct ifreq *ifr = (struct ifreq *)data; struct sockaddr_at *sat; @@ -56,9 +56,9 @@ /* * If we have an ifp, then find the matching at_ifaddr if it exists */ - if ( ifp ) { - for ( aa = at_ifaddr; aa; aa = aa->aa_next ) { - if ( aa->aa_ifp == ifp ) break; + if (ifp) { + for (aa = at_ifaddr; aa; aa = aa->aa_next) { + if (aa->aa_ifp == ifp) break; } } @@ -68,7 +68,7 @@ * so that they start to look more similar to other protocols etc. */ - switch ( cmd ) { + switch (cmd) { case SIOCAIFADDR: case SIOCDIFADDR: /* @@ -78,10 +78,10 @@ * This may leave aa pointing to the first address on the * NEXT interface! */ - if ( ifra->ifra_addr.sat_family == AF_APPLETALK ) { - for ( ; aa; aa = aa->aa_next ) { - if ( aa->aa_ifp == ifp && - sateqaddr( &aa->aa_addr, &ifra->ifra_addr )) { + if (ifra->ifra_addr.sat_family == AF_APPLETALK) { + for (; aa; aa = aa->aa_next) { + if (aa->aa_ifp == ifp && + sateqaddr(&aa->aa_addr, &ifra->ifra_addr)) { break; } } @@ -90,8 +90,8 @@ * If we a retrying to delete an addres but didn't find such, * then rewurn with an error */ - if ( cmd == SIOCDIFADDR && aa == NULL ) { - return( EADDRNOTAVAIL ); + if (cmd == SIOCDIFADDR && aa == NULL) { + return (EADDRNOTAVAIL); } /*FALLTHROUGH*/ @@ -99,21 +99,21 @@ /* * If we are not superuser, then we don't get to do these ops. */ - if ( suser(td) ) { - return( EPERM ); + if (suser(td)) { + return (EPERM); } - sat = satosat( &ifr->ifr_addr ); + sat = satosat(&ifr->ifr_addr); nr = (struct netrange *)sat->sat_zero; - if ( nr->nr_phase == 1 ) { + if (nr->nr_phase == 1) { /* * Look for a phase 1 address on this interface. * This may leave aa pointing to the first address on the * NEXT interface! */ - for ( ; aa; aa = aa->aa_next ) { - if ( aa->aa_ifp == ifp && - ( aa->aa_flags & AFA_PHASE2 ) == 0 ) { + for (; aa; aa = aa->aa_next) { + if (aa->aa_ifp == ifp && + (aa->aa_flags & AFA_PHASE2) == 0) { break; } } @@ -123,23 +123,23 @@ * This may leave aa pointing to the first address on the * NEXT interface! */ - for ( ; aa; aa = aa->aa_next ) { - if ( aa->aa_ifp == ifp && ( aa->aa_flags & AFA_PHASE2 )) { + for (; aa; aa = aa->aa_next) { + if (aa->aa_ifp == ifp && (aa->aa_flags & AFA_PHASE2)) { break; } } } - if ( ifp == NULL ) - panic( "at_control" ); + if (ifp == NULL) + panic("at_control"); /* * If we failed to find an existing at_ifaddr entry, then we * allocate a fresh one. */ - if ( aa == NULL ) { + if (aa == NULL) { aa0 = malloc(sizeof(struct at_ifaddr), M_IFADDR, M_WAITOK | M_ZERO); - if (( aa = at_ifaddr ) != NULL ) { + if ((aa = at_ifaddr) != NULL) { /* * Don't let the loopback be first, since the first * address is the machine's default address for @@ -147,12 +147,12 @@ * If it is, stick ourself in front, otherwise * go to the back of the list. */ - if ( at_ifaddr->aa_ifp->if_flags & IFF_LOOPBACK ) { + if (at_ifaddr->aa_ifp->if_flags & IFF_LOOPBACK) { aa = aa0; aa->aa_next = at_ifaddr; at_ifaddr = aa; } else { - for ( ; aa->aa_next; aa = aa->aa_next ) + for (; aa->aa_next; aa = aa->aa_next) ; aa->aa_next = aa0; } @@ -181,7 +181,7 @@ /* * Set/clear the phase 2 bit. */ - if ( nr->nr_phase == 1 ) { + if (nr->nr_phase == 1) { aa->aa_flags &= ~AFA_PHASE2; } else { aa->aa_flags |= AFA_PHASE2; @@ -195,21 +195,21 @@ /* * If we DID find one then we clobber any routes dependent on it.. */ - at_scrub( ifp, aa ); + at_scrub(ifp, aa); } break; case SIOCGIFADDR : - sat = satosat( &ifr->ifr_addr ); + sat = satosat(&ifr->ifr_addr); nr = (struct netrange *)sat->sat_zero; - if ( nr->nr_phase == 1 ) { + if (nr->nr_phase == 1) { /* * If the request is specifying phase 1, then * only look at a phase one address */ - for ( ; aa; aa = aa->aa_next ) { - if ( aa->aa_ifp == ifp && - ( aa->aa_flags & AFA_PHASE2 ) == 0 ) { + for (; aa; aa = aa->aa_next) { + if (aa->aa_ifp == ifp && + (aa->aa_flags & AFA_PHASE2) == 0) { break; } } @@ -217,15 +217,15 @@ /* * default to phase 2 */ - for ( ; aa; aa = aa->aa_next ) { - if ( aa->aa_ifp == ifp && ( aa->aa_flags & AFA_PHASE2 )) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 21 19:41:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D30D516A4D0; Sun, 21 Mar 2004 19:41:48 -0800 (PST) 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 AD67016A4CE for ; Sun, 21 Mar 2004 19:41:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A67D843D31 for ; Sun, 21 Mar 2004 19:41:48 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2M3fmGe097042 for ; Sun, 21 Mar 2004 19:41:48 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2M3fmcb097036 for perforce@freebsd.org; Sun, 21 Mar 2004 19:41:48 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sun, 21 Mar 2004 19:41:48 -0800 (PST) Message-Id: <200403220341.i2M3fmcb097036@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 49496 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Mar 2004 03:41:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=49496 Change 49496 by marcel@marcel_nfs on 2004/03/21 19:40:53 Axe db_alt_break(). It has been moved to the frontend as kdb_alt_break() where it's present unconditionally so that you can actually depend on it in modules. Affected files ... .. //depot/projects/gdb/sys/ddb/db_break.c#2 edit Differences ... ==== //depot/projects/gdb/sys/ddb/db_break.c#2 (text+ko) ==== @@ -367,46 +367,3 @@ #endif return kernel_map; } - -#ifdef ALT_BREAK_TO_DEBUGGER -/* - * Solaris implements a new BREAK which is initiated by a character sequence - * CR ~ ^b which is similar to a familiar pattern used on Sun servers by the - * Remote Console. - * - * Note that this function may be called from almost anywhere, with interrupts - * disabled and with unknown locks held, so it must not access data other than - * its arguments. Its up to the caller to ensure that the state variable is - * consistent. - */ - -#define KEY_CR 13 /* CR '\r' */ -#define KEY_TILDE 126 /* ~ */ -#define KEY_CRTLB 2 /* ^B */ - -int -db_alt_break(int data, int *state) -{ - int brk = 0; - - switch (data) { - case KEY_CR: - *state = KEY_TILDE; - break; - case KEY_TILDE: - if (*state == KEY_TILDE) - *state = KEY_CRTLB; - else - *state = 0; - break; - case KEY_CRTLB: - if (*state == KEY_CRTLB) - brk = 1; - /* FALLTHROUGH */ - default: - *state = 0; - break; - } - return (brk); -} -#endif From owner-p4-projects@FreeBSD.ORG Sun Mar 21 19:50:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1224016A4D0; Sun, 21 Mar 2004 19:50:00 -0800 (PST) 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 D098A16A4CF for ; Sun, 21 Mar 2004 19:49:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C63BF43D1D for ; Sun, 21 Mar 2004 19:49:59 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2M3nxGe097824 for ; Sun, 21 Mar 2004 19:49:59 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2M3nx9a097821 for perforce@freebsd.org; Sun, 21 Mar 2004 19:49:59 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sun, 21 Mar 2004 19:49:59 -0800 (PST) Message-Id: <200403220349.i2M3nx9a097821@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 49498 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Mar 2004 03:50:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=49498 Change 49498 by marcel@marcel_nfs on 2004/03/21 19:49:31 o Remove inclusion of opt_ddb.h o Remove inclusion of ddb/ddb.h o Add inclusion of sys/kdb.h o s/db_alt_break/kdb_alt_break/ o s/DDB/KDB/g Affected files ... .. //depot/projects/gdb/sys/dev/uart/uart_core.c#3 edit Differences ... ==== //depot/projects/gdb/sys/dev/uart/uart_core.c#3 (text+ko) ==== @@ -29,7 +29,6 @@ #ifndef KLD_MODULE #include "opt_comconsole.h" -#include "opt_ddb.h" #endif #include @@ -39,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -50,8 +50,6 @@ #include #include -#include - #include #include #include @@ -85,9 +83,9 @@ uart_intr_break(struct uart_softc *sc) { -#if defined(DDB) && defined(BREAK_TO_DEBUGGER) +#if defined(KDB) && defined(BREAK_TO_DEBUGGER) if (sc->sc_sysdev != NULL && sc->sc_sysdev->type == UART_DEV_CONSOLE) { - breakpoint(); + kdb_enter("Line break on console"); return; } #endif @@ -133,11 +131,11 @@ rxp = sc->sc_rxput; UART_RECEIVE(sc); -#if defined(DDB) && defined(ALT_BREAK_TO_DEBUGGER) +#if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER) if (sc->sc_sysdev != NULL && sc->sc_sysdev->type == UART_DEV_CONSOLE) { while (rxp != sc->sc_rxput) { - if (db_alt_break(sc->sc_rxbuf[rxp++], &sc->sc_altbrk)) - breakpoint(); + if (kdb_alt_break(sc->sc_rxbuf[rxp++], &sc->sc_altbrk)) + kdb_enter("Break sequence on console"); if (rxp == sc->sc_rxbufsz) rxp = 0; } From owner-p4-projects@FreeBSD.ORG Sun Mar 21 19:57:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA55416A4D1; Sun, 21 Mar 2004 19:57:11 -0800 (PST) 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 52FB416A4D0 for ; Sun, 21 Mar 2004 19:57:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 381BA43D2D for ; Sun, 21 Mar 2004 19:57:11 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2M3vBGe099936 for ; Sun, 21 Mar 2004 19:57:11 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2M3vARC099933 for perforce@freebsd.org; Sun, 21 Mar 2004 19:57:10 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sun, 21 Mar 2004 19:57:10 -0800 (PST) Message-Id: <200403220357.i2M3vARC099933@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 49501 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Mar 2004 03:57:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=49501 Change 49501 by marcel@marcel_nfs on 2004/03/21 19:56:21 Make this compile in the new world order. A lot of axing, but add db_cpu_trap(). Affected files ... .. //depot/projects/gdb/sys/ia64/ia64/db_interface.c#4 edit Differences ... ==== //depot/projects/gdb/sys/ia64/ia64/db_interface.c#4 (text+ko) ==== @@ -64,11 +64,6 @@ static jmp_buf *db_nofault = 0; extern jmp_buf db_jmpbuf; -extern void gdb_handle_exception(db_regs_t *, int); - -int db_active; -db_regs_t ddb_regs; - static int db_get_rse_reg(struct db_variable *vp, db_expr_t *valuep, int op); static int db_get_ip_reg(struct db_variable *vp, db_expr_t *valuep, int op); @@ -225,6 +220,11 @@ }; struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]); +void +db_cpu_trap(int vector, int dummy, struct trapframe *tf) +{ +} + static int db_get_rse_reg(struct db_variable *vp, db_expr_t *valuep, int op) { @@ -261,141 +261,6 @@ return 0; } -#if 0 -/* - * Print trap reason. - */ -static void -ddbprinttrap(int vector) -{ - - /* XXX Implement. */ - - printf("ddbprinttrap(%d)\n", vector); -} -#endif - -#define CPUSTOP_ON_DDBBREAK -#define VERBOSE_CPUSTOP_ON_DDBBREAK - -#if 0 -/* - * ddb_trap - field a kernel trap - */ -int -ddb_trap(int vector, struct trapframe *regs) -{ - int ddb_mode = !(boothowto & RB_GDB); - register_t s; - - /* - * Don't bother checking for usermode, since a benign entry - * by the kernel (call to Debugger() or a breakpoint) has - * already checked for usermode. If neither of those - * conditions exist, something Bad has happened. - */ - - if (vector != IA64_VEC_BREAK - && vector != IA64_VEC_SINGLE_STEP_TRAP) { -#if 0 - if (ddb_mode) { - db_printf("ddbprinttrap from 0x%lx\n", /* XXX */ - regs->tf_regs[FRAME_PC]); - ddbprinttrap(a0, a1, a2, entry); - /* - * Tell caller "We did NOT handle the trap." - * Caller should panic, or whatever. - */ - return (0); - } -#endif - if (db_nofault) { - jmp_buf *no_fault = db_nofault; - db_nofault = 0; - longjmp(*no_fault, 1); - } - } - - /* - * XXX Should switch to DDB's own stack, here. - */ - - s = intr_disable(); - -#ifdef SMP -#ifdef CPUSTOP_ON_DDBBREAK - -#if defined(VERBOSE_CPUSTOP_ON_DDBBREAK) - db_printf("CPU%d stopping CPUs: 0x%08x...", PCPU_GET(cpuid), - PCPU_GET(other_cpus)); -#endif /* VERBOSE_CPUSTOP_ON_DDBBREAK */ - - /* We stop all CPUs except ourselves (obviously) */ - stop_cpus(PCPU_GET(other_cpus)); - -#if defined(VERBOSE_CPUSTOP_ON_DDBBREAK) - db_printf(" stopped.\n"); -#endif /* VERBOSE_CPUSTOP_ON_DDBBREAK */ - -#endif /* CPUSTOP_ON_DDBBREAK */ -#endif /* SMP */ - - ddb_regs = *regs; - - /* - * XXX pretend that registers outside the current frame don't exist. - */ - db_eregs = db_regs + DB_MISC_REGS + 3 + 27 + - (ddb_regs.tf_special.cfm & 0x7f); - - __asm __volatile("flushrs"); /* so we can look at them */ - - db_active++; - - if (ddb_mode) { - cndbctl(TRUE); /* DDB active, unblank video */ - db_trap(vector, 0); /* Where the work happens */ - cndbctl(FALSE); /* DDB inactive */ - } else - gdb_handle_exception(&ddb_regs, vector); - - db_active--; - -#ifdef SMP -#ifdef CPUSTOP_ON_DDBBREAK - -#if defined(VERBOSE_CPUSTOP_ON_DDBBREAK) - db_printf("CPU%d restarting CPUs: 0x%08x...", PCPU_GET(cpuid), - stopped_cpus); -#endif /* VERBOSE_CPUSTOP_ON_DDBBREAK */ - - /* Restart all the CPUs we previously stopped */ - if (stopped_cpus != PCPU_GET(other_cpus) && smp_started != 0) { - db_printf("whoa, other_cpus: 0x%08x, stopped_cpus: 0x%08x\n", - PCPU_GET(other_cpus), stopped_cpus); - panic("stop_cpus() failed"); - } - restart_cpus(stopped_cpus); - -#if defined(VERBOSE_CPUSTOP_ON_DDBBREAK) - db_printf(" restarted.\n"); -#endif /* VERBOSE_CPUSTOP_ON_DDBBREAK */ - -#endif /* CPUSTOP_ON_DDBBREAK */ -#endif /* SMP */ - - *regs = ddb_regs; - - intr_restore(s); - - - /* - * Tell caller "We HAVE handled the trap." - */ - return (1); -} -#endif - /* * Read bytes from kernel address space for debugger. */ From owner-p4-projects@FreeBSD.ORG Sun Mar 21 20:00:19 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57FB616A4D0; Sun, 21 Mar 2004 20:00:19 -0800 (PST) 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 1979616A4CE for ; Sun, 21 Mar 2004 20:00:19 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F2C7643D41 for ; Sun, 21 Mar 2004 20:00:15 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2M40FGe000161 for ; Sun, 21 Mar 2004 20:00:15 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2M40F2c000158 for perforce@freebsd.org; Sun, 21 Mar 2004 20:00:15 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sun, 21 Mar 2004 20:00:15 -0800 (PST) Message-Id: <200403220400.i2M40F2c000158@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 49502 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Mar 2004 04:00:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=49502 Change 49502 by marcel@marcel_nfs on 2004/03/21 20:00:14 s/db_active/kdb_active/g s/DDB/KDB/g Affected files ... .. //depot/projects/gdb/sys/ia64/ia64/unwind.c#2 edit Differences ... ==== //depot/projects/gdb/sys/ia64/ia64/unwind.c#2 (text+ko) ==== @@ -27,9 +27,8 @@ #include __FBSDID("$FreeBSD: src/sys/ia64/ia64/unwind.c,v 1.10 2003/10/09 03:11:37 marcel Exp $"); -#include "opt_ddb.h" - #include +#include #include #include #include @@ -60,8 +59,8 @@ static struct unw_table_list unw_tables; -#ifdef DDB -#define DDBHEAPSZ 8192 +#ifdef KDB +#define KDBHEAPSZ 8192 struct mhdr { uint32_t sig; @@ -72,35 +71,33 @@ int32_t prev; }; -extern int db_active; +static struct mhdr *kdbheap; +#endif /* KDB */ -static struct mhdr *ddbheap; -#endif /* DDB */ - static void * unw_alloc(size_t sz) { -#ifdef DDB +#ifdef KDB struct mhdr *hdr, *hfree; - if (db_active) { + if (kdb_active) { sz = (sz + 15) >> 4; - hdr = ddbheap; + hdr = kdbheap; while (hdr->sig != MSIG_FREE || hdr->size < sz) { if (hdr->next == -1) return (NULL); - hdr = ddbheap + hdr->next; + hdr = kdbheap + hdr->next; } if (hdr->size > sz + 1) { hfree = hdr + sz + 1; hfree->sig = MSIG_FREE; hfree->size = hdr->size - sz - 1; - hfree->prev = hdr - ddbheap; + hfree->prev = hdr - kdbheap; hfree->next = hdr->next; hdr->size = sz; - hdr->next = hfree - ddbheap; + hdr->next = hfree - kdbheap; if (hfree->next >= 0) { - hfree = ddbheap + hfree->next; + hfree = kdbheap + hfree->next; hfree->prev = hdr->next; } } @@ -114,30 +111,30 @@ static void unw_free(void *p) { -#ifdef DDB +#ifdef KDB struct mhdr *hdr, *hfree; - if (db_active) { + if (kdb_active) { hdr = (struct mhdr*)p - 1; if (hdr->sig != MSIG_USED) return; hdr->sig = MSIG_FREE; - if (hdr->prev >= 0 && ddbheap[hdr->prev].sig == MSIG_FREE) { - hfree = ddbheap + hdr->prev; + if (hdr->prev >= 0 && kdbheap[hdr->prev].sig == MSIG_FREE) { + hfree = kdbheap + hdr->prev; hfree->size += hdr->size + 1; hfree->next = hdr->next; if (hdr->next >= 0) { - hfree = ddbheap + hdr->next; + hfree = kdbheap + hdr->next; hfree->prev = hdr->prev; } } else if (hdr->next >= 0 && - ddbheap[hdr->next].sig == MSIG_FREE) { - hfree = ddbheap + hdr->next; + kdbheap[hdr->next].sig == MSIG_FREE) { + hfree = kdbheap + hdr->next; hdr->size += hfree->size + 1; hdr->next = hfree->next; if (hdr->next >= 0) { - hfree = ddbheap + hdr->next; - hfree->prev = hdr - ddbheap; + hfree = kdbheap + hdr->next; + hfree->prev = hdr - kdbheap; } } return; @@ -372,12 +369,12 @@ LIST_INIT(&unw_tables); uwx_register_alloc_cb(unw_alloc, unw_free); -#ifdef DDB - ddbheap = malloc(DDBHEAPSZ, M_UNWIND, M_WAITOK); - ddbheap->sig = MSIG_FREE; - ddbheap->size = (DDBHEAPSZ - sizeof(struct mhdr)) >> 4; - ddbheap->next = -1; - ddbheap->prev = -1; +#ifdef KDB + kdbheap = malloc(KDBHEAPSZ, M_UNWIND, M_WAITOK); + kdbheap->sig = MSIG_FREE; + kdbheap->size = (KDBHEAPSZ - sizeof(struct mhdr)) >> 4; + kdbheap->next = -1; + kdbheap->prev = -1; #endif } SYSINIT(unwind, SI_SUB_KMEM, SI_ORDER_ANY, unw_initialize, 0); From owner-p4-projects@FreeBSD.ORG Sun Mar 21 20:05:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E1E516A4D0; Sun, 21 Mar 2004 20:05:23 -0800 (PST) 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 3823F16A4CE for ; Sun, 21 Mar 2004 20:05:23 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C84543D1D for ; Sun, 21 Mar 2004 20:05:23 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2M45NGe003051 for ; Sun, 21 Mar 2004 20:05:23 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2M45MA8003048 for perforce@freebsd.org; Sun, 21 Mar 2004 20:05:22 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 21 Mar 2004 20:05:22 -0800 (PST) Message-Id: <200403220405.i2M45MA8003048@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 49504 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Mar 2004 04:05:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=49504 Change 49504 by rwatson@rwatson_paprika on 2004/03/21 20:04:41 Integrate netperf_socket: - if_arcsubr compile fix - More gratuitous style changes to netatalk Affected files ... .. //depot/projects/netperf_socket/sys/net/if_arcsubr.c#4 integrate .. //depot/projects/netperf_socket/sys/netatalk/aarp.c#4 integrate .. //depot/projects/netperf_socket/sys/netatalk/at_control.c#4 integrate .. //depot/projects/netperf_socket/sys/netatalk/at_rmx.c#2 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_input.c#3 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_pcb.c#4 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_usrreq.c#7 integrate Differences ... ==== //depot/projects/netperf_socket/sys/net/if_arcsubr.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: if_arcsubr.c,v 1.36 2001/06/14 05:44:23 itojun Exp $ */ -/* $FreeBSD: src/sys/net/if_arcsubr.c,v 1.17 2004/03/21 17:27:41 mdodd Exp $ */ +/* $FreeBSD: src/sys/net/if_arcsubr.c,v 1.18 2004/03/22 03:52:51 mdodd Exp $ */ /* * Copyright (c) 1994, 1995 Ignatios Souvatzis @@ -163,9 +163,9 @@ } if (m->m_flags & M_BCAST) - bcopy(ifp->if_broadcastaddr, adst, ARC_ADDR_LEN); + bcopy(ifp->if_broadcastaddr, &adst, ARC_ADDR_LEN); else - bcopy(ar_tha(ah), adst, ARC_ADDR_LEN); + bcopy(ar_tha(ah), &adst, ARC_ADDR_LEN); } break; ==== //depot/projects/netperf_socket/sys/netatalk/aarp.c#4 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1990,1991 Regents of The University of Michigan. * All Rights Reserved. * - * $FreeBSD: src/sys/netatalk/aarp.c,v 1.26 2004/03/22 03:24:10 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/aarp.c,v 1.27 2004/03/22 03:57:01 rwatson Exp $ */ #include "opt_atalk.h" @@ -39,7 +39,7 @@ #define AARPTAB_HASH(a) \ ((((a).s_net << 8) + (a).s_node) % AARPTAB_NB) -#define AARPTAB_LOOK(aat,addr) { \ +#define AARPTAB_LOOK(aat, addr) { \ int n; \ aat = &aarptab[ AARPTAB_HASH(addr) * AARPTAB_BSIZ ]; \ for (n = 0; n < AARPTAB_BSIZ; n++, aat++) \ @@ -47,7 +47,7 @@ aat->aat_ataddr.s_node == (addr).s_node) \ break; \ if (n >= AARPTAB_BSIZ) \ - aat = 0; \ + aat = NULL; \ } #define AARPT_AGE (60 * 1) @@ -233,9 +233,9 @@ s = splimp(); AARPTAB_LOOK(aat, destsat->sat_addr); - if (aat == 0) { /* No entry */ + if (aat == NULL) { /* No entry */ aat = aarptnew(&destsat->sat_addr); - if (aat == 0) { + if (aat == NULL) { panic("aarpresolve: no free entry"); } aat->aat_hold = m; @@ -391,7 +391,7 @@ } AARPTAB_LOOK(aat, spa); - if (aat) { + if (aat != NULL) { if (op == AARPOP_PROBE) { /* * Someone's probing for spa, dealocate the one we've got, ==== //depot/projects/netperf_socket/sys/netatalk/at_control.c#4 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1990,1991 Regents of The University of Michigan. * All Rights Reserved. * - * $FreeBSD: src/sys/netatalk/at_control.c,v 1.37 2004/03/22 03:24:10 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/at_control.c,v 1.38 2004/03/22 03:57:01 rwatson Exp $ */ #include @@ -56,7 +56,7 @@ /* * If we have an ifp, then find the matching at_ifaddr if it exists */ - if (ifp) { + if (ifp != NULL) { for (aa = at_ifaddr; aa; aa = aa->aa_next) { if (aa->aa_ifp == ifp) break; } @@ -554,7 +554,7 @@ * Now that we have selected an address, we need to tell the interface * about it, just in case it needs to adjust something. */ - if (ifp->if_ioctl && + if (ifp->if_ioctl != NULL&& (error = (*ifp->if_ioctl)(ifp, SIOCSIFADDR, (caddr_t)aa))) { /* * of course this could mean that it objects violently ==== //depot/projects/netperf_socket/sys/netatalk/at_rmx.c#2 (text+ko) ==== @@ -27,6 +27,7 @@ * SUCH DAMAGE. * * at_rmx.c,v 1.13 1995/05/30 08:09:31 rgrimes Exp + * $FreeBSD: src/sys/netatalk/at_rmx.c,v 1.7 2004/03/22 03:57:01 rwatson Exp $ */ /* This code generates debugging traces to the radix code */ @@ -47,7 +48,7 @@ char *bp = &hexbuf[0]; u_char *cp = v; - if (v) { + if (v != NULL) { int len = *cp; u_char *cplim = cp + len; ==== //depot/projects/netperf_socket/sys/netatalk/ddp_input.c#3 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. * - * $FreeBSD: src/sys/netatalk/ddp_input.c,v 1.20 2004/03/21 03:28:08 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/ddp_input.c,v 1.22 2004/03/22 03:57:01 rwatson Exp $ */ #include "opt_mac.h" @@ -79,7 +79,7 @@ } static void -ddp_input( m, ifp, elh, phase ) +ddp_input(m, ifp, elh, phase) struct mbuf *m; struct ifnet *ifp; struct elaphdr *elh; @@ -93,9 +93,9 @@ int dlen, mlen; u_short cksum = 0; - bzero( (caddr_t)&from, sizeof( struct sockaddr_at )); - bzero( (caddr_t)&to, sizeof( struct sockaddr_at )); - if ( elh ) { + bzero((caddr_t)&from, sizeof(struct sockaddr_at)); + bzero((caddr_t)&to, sizeof(struct sockaddr_at)); + if (elh != NULL) { /* * Extract the information in the short header. * netowrk information is defaulted to ATADDR_ANYNET @@ -104,15 +104,15 @@ */ ddpstat.ddps_short++; - if ( m->m_len < sizeof( struct ddpshdr ) && - (( m = m_pullup( m, sizeof( struct ddpshdr ))) == NULL )) { + if (m->m_len < sizeof(struct ddpshdr) && + ((m = m_pullup(m, sizeof(struct ddpshdr))) == NULL)) { ddpstat.ddps_tooshort++; return; } - dsh = mtod( m, struct ddpshdr *); - bcopy( (caddr_t)dsh, (caddr_t)&ddps, sizeof( struct ddpshdr )); - ddps.dsh_bytes = ntohl( ddps.dsh_bytes ); + dsh = mtod(m, struct ddpshdr *); + bcopy((caddr_t)dsh, (caddr_t)&ddps, sizeof(struct ddpshdr)); + ddps.dsh_bytes = ntohl(ddps.dsh_bytes); dlen = ddps.dsh_len; to.sat_addr.s_net = ATADDR_ANYNET; @@ -126,10 +126,10 @@ * Make sure that we point to the phase1 ifaddr info * and that it's valid for this packet. */ - for ( aa = at_ifaddr; aa; aa = aa->aa_next ) { - if ( (aa->aa_ifp == ifp) - && ( (aa->aa_flags & AFA_PHASE2) == 0) - && ( (to.sat_addr.s_node == AA_SAT( aa )->sat_addr.s_node) + for (aa = at_ifaddr; aa; aa = aa->aa_next) { + if ((aa->aa_ifp == ifp) + && ((aa->aa_flags & AFA_PHASE2) == 0) + && ((to.sat_addr.s_node == AA_SAT(aa)->sat_addr.s_node) || (to.sat_addr.s_node == ATADDR_BCAST))) { break; } @@ -137,8 +137,8 @@ /* * maybe we got a broadcast not meant for us.. ditch it. */ - if ( aa == NULL ) { - m_freem( m ); + if (aa == NULL) { + m_freem(m); return; } } else { @@ -150,18 +150,18 @@ */ ddpstat.ddps_long++; - if ( m->m_len < sizeof( struct ddpehdr ) && - (( m = m_pullup( m, sizeof( struct ddpehdr ))) == NULL )) { + if (m->m_len < sizeof(struct ddpehdr) && + ((m = m_pullup(m, sizeof(struct ddpehdr))) == NULL)) { ddpstat.ddps_tooshort++; return; } - deh = mtod( m, struct ddpehdr *); - bcopy( (caddr_t)deh, (caddr_t)&ddpe, sizeof( struct ddpehdr )); - ddpe.deh_bytes = ntohl( ddpe.deh_bytes ); + deh = mtod(m, struct ddpehdr *); + bcopy((caddr_t)deh, (caddr_t)&ddpe, sizeof(struct ddpehdr)); + ddpe.deh_bytes = ntohl(ddpe.deh_bytes); dlen = ddpe.deh_len; - if (( cksum = ddpe.deh_sum ) == 0 ) { + if ((cksum = ddpe.deh_sum) == 0) { ddpstat.ddps_nosum++; } @@ -172,7 +172,7 @@ to.sat_addr.s_node = ddpe.deh_dnode; to.sat_port = ddpe.deh_dport; - if ( to.sat_addr.s_net == ATADDR_ANYNET ) { + if (to.sat_addr.s_net == ATADDR_ANYNET) { /* * The TO address doesn't specify a net, * So by definition it's for this net. @@ -185,15 +185,15 @@ * this node number will match (which may NOT be what we want, * but it's probably safe in 99.999% of cases. */ - for ( aa = at_ifaddr; aa; aa = aa->aa_next ) { - if ( phase == 1 && ( aa->aa_flags & AFA_PHASE2 )) { + for (aa = at_ifaddr; aa; aa = aa->aa_next) { + if (phase == 1 && (aa->aa_flags & AFA_PHASE2)) { continue; } - if ( phase == 2 && ( aa->aa_flags & AFA_PHASE2 ) == 0 ) { + if (phase == 2 && (aa->aa_flags & AFA_PHASE2) == 0) { continue; } - if ( (aa->aa_ifp == ifp) - && ( (to.sat_addr.s_node == AA_SAT( aa )->sat_addr.s_node) + if ((aa->aa_ifp == ifp) + && ((to.sat_addr.s_node == AA_SAT(aa)->sat_addr.s_node) || (to.sat_addr.s_node == ATADDR_BCAST) || (ifp->if_flags & IFF_LOOPBACK))) { break; @@ -204,13 +204,13 @@ * A destination network was given. We just try to find * which ifaddr info matches it. */ - for ( aa = at_ifaddr; aa; aa = aa->aa_next ) { + for (aa = at_ifaddr; aa; aa = aa->aa_next) { /* * This is a kludge. Accept packets that are * for any router on a local netrange. */ - if ( to.sat_addr.s_net == aa->aa_firstnet && - to.sat_addr.s_node == 0 ) { + if (to.sat_addr.s_net == aa->aa_firstnet && + to.sat_addr.s_node == 0) { break; } /* @@ -219,10 +219,10 @@ * Startup packets are always implicitly allowed on to * the next test. */ - if ((( ntohs( to.sat_addr.s_net ) < ntohs( aa->aa_firstnet )) - || (ntohs( to.sat_addr.s_net ) > ntohs( aa->aa_lastnet ))) - && (( ntohs( to.sat_addr.s_net ) < 0xff00) - || (ntohs( to.sat_addr.s_net ) > 0xfffe ))) { + if (((ntohs(to.sat_addr.s_net) < ntohs(aa->aa_firstnet)) + || (ntohs(to.sat_addr.s_net) > ntohs(aa->aa_lastnet))) + && ((ntohs(to.sat_addr.s_net) < 0xff00) + || (ntohs(to.sat_addr.s_net) > 0xfffe))) { continue; } @@ -231,8 +231,8 @@ * in the node address. This can have if the interface * is in promiscuous mode for example. */ - if (( to.sat_addr.s_node != AA_SAT( aa )->sat_addr.s_node) - && (to.sat_addr.s_node != ATADDR_BCAST) ) { + if ((to.sat_addr.s_node != AA_SAT(aa)->sat_addr.s_node) + && (to.sat_addr.s_node != ATADDR_BCAST)) { continue; } break; @@ -246,13 +246,13 @@ * possibly on a different media. */ mlen = m->m_pkthdr.len; - if ( mlen < dlen ) { + if (mlen < dlen) { ddpstat.ddps_toosmall++; - m_freem( m ); + m_freem(m); return; } - if ( mlen > dlen ) { - m_adj( m, dlen - mlen ); + if (mlen > dlen) { + m_adj(m, dlen - mlen); } /* @@ -262,24 +262,24 @@ * As we are not really a router this is a bit cheeky, but it may be * useful some day. */ - if ( (aa == NULL) - || ( (to.sat_addr.s_node == ATADDR_BCAST) + if ((aa == NULL) + || ((to.sat_addr.s_node == ATADDR_BCAST) && (aa->aa_ifp != ifp) - && (( ifp->if_flags & IFF_LOOPBACK ) == 0 ))) { + && ((ifp->if_flags & IFF_LOOPBACK) == 0))) { /* * If we've explicitly disabled it, don't route anything */ - if ( ddp_forward == 0 ) { - m_freem( m ); + if (ddp_forward == 0) { + m_freem(m); return; } /* * If the cached forwarding route is still valid, use it. */ - if ( forwro.ro_rt - && ( satosat(&forwro.ro_dst)->sat_addr.s_net != to.sat_addr.s_net - || satosat(&forwro.ro_dst)->sat_addr.s_node != to.sat_addr.s_node )) { - RTFREE( forwro.ro_rt ); + if (forwro.ro_rt + && (satosat(&forwro.ro_dst)->sat_addr.s_net != to.sat_addr.s_net + || satosat(&forwro.ro_dst)->sat_addr.s_node != to.sat_addr.s_node)) { + RTFREE(forwro.ro_rt); forwro.ro_rt = NULL; } @@ -288,8 +288,8 @@ * Then get a new route. * XXX this could cause a 'route leak'. check this! */ - if ( forwro.ro_rt == NULL || forwro.ro_rt->rt_ifp == NULL ) { - forwro.ro_dst.sa_len = sizeof( struct sockaddr_at ); + if (forwro.ro_rt == NULL || forwro.ro_rt->rt_ifp == NULL) { + forwro.ro_dst.sa_len = sizeof(struct sockaddr_at); forwro.ro_dst.sa_family = AF_APPLETALK; satosat(&forwro.ro_dst)->sat_addr.s_net = to.sat_addr.s_net; satosat(&forwro.ro_dst)->sat_addr.s_node = to.sat_addr.s_node; @@ -300,9 +300,9 @@ * If it's not going to get there on this hop, and it's * already done too many hops, then throw it away. */ - if ( (to.sat_addr.s_net != satosat( &forwro.ro_dst )->sat_addr.s_net) - && (ddpe.deh_hops == DDP_MAXHOPS) ) { - m_freem( m ); + if ((to.sat_addr.s_net != satosat(&forwro.ro_dst)->sat_addr.s_net) + && (ddpe.deh_hops == DDP_MAXHOPS)) { + m_freem(m); return; } @@ -311,10 +311,10 @@ * to forward the packet, which this would not effect. * Don't allow packets to cross from one interface to another however. */ - if ( ddp_firewall - && ( (forwro.ro_rt == NULL) + if (ddp_firewall + && ((forwro.ro_rt == NULL) || (forwro.ro_rt->rt_ifp != ifp))) { - m_freem( m ); + m_freem(m); return; } @@ -325,9 +325,9 @@ * XXX what about promiscuous mode, etc... */ ddpe.deh_hops++; - ddpe.deh_bytes = htonl( ddpe.deh_bytes ); - bcopy( (caddr_t)&ddpe, (caddr_t)deh, sizeof( u_short )); /* XXX deh? */ - if ( ddp_route( m, &forwro )) { + ddpe.deh_bytes = htonl(ddpe.deh_bytes); + bcopy((caddr_t)&ddpe, (caddr_t)deh, sizeof(u_short)); /* XXX deh? */ + if (ddp_route(m, &forwro)) { ddpstat.ddps_cantforward++; } else { ddpstat.ddps_forward++; @@ -338,36 +338,36 @@ /* * It was for us, and we have an ifaddr to use with it. */ - from.sat_len = sizeof( struct sockaddr_at ); + from.sat_len = sizeof(struct sockaddr_at); from.sat_family = AF_APPLETALK; /* * We are no longer interested in the link layer. * so cut it off. */ - if ( elh ) { - m_adj( m, sizeof( struct ddpshdr )); + if (elh != NULL) { + m_adj(m, sizeof(struct ddpshdr)); } else { - if ( ddp_cksum && cksum && cksum != at_cksum( m, sizeof( int ))) { + if (ddp_cksum && cksum && cksum != at_cksum(m, sizeof(int))) { ddpstat.ddps_badsum++; - m_freem( m ); + m_freem(m); return; } - m_adj( m, sizeof( struct ddpehdr )); + m_adj(m, sizeof(struct ddpehdr)); } /* * Search for ddp protocol control blocks that match these * addresses. */ - if (( ddp = ddp_search( &from, &to, aa )) == NULL ) { - m_freem( m ); + if ((ddp = ddp_search(&from, &to, aa)) == NULL) { + m_freem(m); return; } #ifdef MAC if (mac_check_socket_deliver(ddp->ddp_socket, m) != 0) { - m_freem( m ); + m_freem(m); return; } #endif @@ -375,19 +375,19 @@ /* * If we found one, deliver th epacket to the socket */ - if ( sbappendaddr( &ddp->ddp_socket->so_rcv, (struct sockaddr *)&from, - m, NULL ) == 0 ) { + if (sbappendaddr(&ddp->ddp_socket->so_rcv, (struct sockaddr *)&from, + m, NULL) == 0) { /* * If the socket is full (or similar error) dump the packet. */ ddpstat.ddps_nosockspace++; - m_freem( m ); + m_freem(m); return; } /* * And wake up whatever might be waiting for it */ - sorwakeup( ddp->ddp_socket ); + sorwakeup(ddp->ddp_socket); } #if 0 @@ -400,27 +400,27 @@ char hexdig[] = "0123456789ABCDEF"; static void -bprint( char *data, int len ) +bprint(char *data, int len) { char xout[ BPXLEN ], aout[ BPALEN ]; int i = 0; - bzero( xout, BPXLEN ); - bzero( aout, BPALEN ); + bzero(xout, BPXLEN); + bzero(aout, BPALEN); - for ( ;; ) { - if ( len < 1 ) { - if ( i != 0 ) { - printf( "%s\t%s\n", xout, aout ); + for (;;) { + if (len < 1) { + if (i != 0) { + printf("%s\t%s\n", xout, aout); } - printf( "%s\n", "(end)" ); + printf("%s\n", "(end)"); break; } - xout[ (i*3) ] = hexdig[ ( *data & 0xf0 ) >> 4 ]; + xout[ (i*3) ] = hexdig[ (*data & 0xf0) >> 4 ]; xout[ (i*3) + 1 ] = hexdig[ *data & 0x0f ]; - if ( (u_char)*data < 0x7f && (u_char)*data > 0x20 ) { + if ((u_char)*data < 0x7f && (u_char)*data > 0x20) { aout[ i ] = *data; } else { aout[ i ] = '.'; @@ -432,10 +432,10 @@ len--; data++; - if ( i > BPALEN - 2 ) { - printf( "%s\t%s\n", xout, aout ); - bzero( xout, BPXLEN ); - bzero( aout, BPALEN ); + if (i > BPALEN - 2) { + printf("%s\t%s\n", xout, aout); + bzero(xout, BPXLEN); + bzero(aout, BPALEN); i = 0; continue; } @@ -443,10 +443,10 @@ } static void -m_printm( struct mbuf *m ) +m_printm(struct mbuf *m) { - for (; m; m = m->m_next ) { - bprint( mtod( m, char * ), m->m_len ); + for (; m; m = m->m_next) { + bprint(mtod(m, char *), m->m_len); } } #endif ==== //depot/projects/netperf_socket/sys/netatalk/ddp_pcb.c#4 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. * - * $FreeBSD: src/sys/netatalk/ddp_pcb.c,v 1.39 2004/03/22 03:24:10 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/ddp_pcb.c,v 1.40 2004/03/22 03:57:01 rwatson Exp $ */ #include @@ -239,7 +239,7 @@ ddp->ddp_prev = NULL; ddp->ddp_pprev = NULL; ddp->ddp_pnext = NULL; - if (ddpcb) { + if (ddpcb != NULL) { ddpcb->ddp_prev = ddp; } ddpcb = ddp; ==== //depot/projects/netperf_socket/sys/netatalk/ddp_usrreq.c#7 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. * - * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.37 2004/03/22 03:24:10 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.38 2004/03/22 03:57:01 rwatson Exp $ */ #include @@ -159,7 +159,7 @@ return (EINVAL); } - if (addr) { + if (addr != NULL) { if (ddp->ddp_fsat.sat_port != ATADDR_ANYPORT) { return (EISCONN); } @@ -178,7 +178,7 @@ s = splnet(); error = ddp_output(m, so); - if (addr) { + if (addr != NULL) { at_pcbdisconnect(ddp); } splx(s); From owner-p4-projects@FreeBSD.ORG Sun Mar 21 20:13:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D456F16A4D0; Sun, 21 Mar 2004 20:13:34 -0800 (PST) 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 AF61716A4CE for ; Sun, 21 Mar 2004 20:13:34 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A7F5A43D2D for ; Sun, 21 Mar 2004 20:13:34 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2M4DYGe005063 for ; Sun, 21 Mar 2004 20:13:34 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2M4DYJe005060 for perforce@freebsd.org; Sun, 21 Mar 2004 20:13:34 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sun, 21 Mar 2004 20:13:34 -0800 (PST) Message-Id: <200403220413.i2M4DYJe005060@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 49507 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Mar 2004 04:13:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=49507 Change 49507 by marcel@marcel_nfs on 2004/03/21 20:13:00 Make sparc64 compile. Affected files ... .. //depot/projects/gdb/sys/sparc64/sparc64/db_interface.c#4 edit .. //depot/projects/gdb/sys/sparc64/sparc64/mp_machdep.c#2 edit Differences ... ==== //depot/projects/gdb/sys/sparc64/sparc64/db_interface.c#4 (text+ko) ==== @@ -54,42 +54,11 @@ static jmp_buf *db_nofault = 0; extern jmp_buf db_jmpbuf; -int db_active; -db_regs_t ddb_regs; - -#if 0 -static jmp_buf db_global_jmpbuf; -static int db_global_jmpbuf_valid; - -int -ddb_trap(struct trapframe *tf) +void +db_cpu_trap(int type, int dummy, struct trapframe *tf) { - - if (db_global_jmpbuf_valid) - longjmp(db_global_jmpbuf, 1); flushw(); - ddb_regs = *tf; - critical_enter(); - setjmp(db_global_jmpbuf); - db_global_jmpbuf_valid = TRUE; - atomic_add_acq_int(&db_active, 1); -#ifdef SMP - stop_cpus(PCPU_GET(other_cpus)); -#endif - cndbctl(TRUE); - db_trap(tf->tf_type, 0); - cndbctl(FALSE); - db_active--; -#ifdef SMP - restart_cpus(stopped_cpus); -#endif - db_global_jmpbuf_valid = FALSE; - critical_exit(); - *tf = ddb_regs; - TF_DONE(tf); - return (1); } -#endif void db_read_bytes(vm_offset_t addr, size_t size, char *data) ==== //depot/projects/gdb/sys/sparc64/sparc64/mp_machdep.c#2 (text+ko) ==== @@ -55,11 +55,10 @@ * $FreeBSD: src/sys/sparc64/sparc64/mp_machdep.c,v 1.25 2003/12/03 14:57:25 jhb Exp $ */ -#include "opt_ddb.h" - #include #include #include +#include #include #include #include @@ -76,8 +75,6 @@ #include -#include - #include #include #include @@ -446,8 +443,8 @@ return; } if ( -#ifdef DDB - db_active || +#ifdef KDB + kdb_active || #endif panicstr != NULL) printf("ipi_send: couldn't send ipi to module %u\n", mid); From owner-p4-projects@FreeBSD.ORG Sun Mar 21 21:10:48 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E14316A4E1; Sun, 21 Mar 2004 21:10:48 -0800 (PST) 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 D3B6516A4D2 for ; Sun, 21 Mar 2004 21:10:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C7E7343D46 for ; Sun, 21 Mar 2004 21:10:47 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2M5AlGe022374 for ; Sun, 21 Mar 2004 21:10:47 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2M5AkJh022371 for perforce@freebsd.org; Sun, 21 Mar 2004 21:10:46 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 21 Mar 2004 21:10:46 -0800 (PST) Message-Id: <200403220510.i2M5AkJh022371@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 49510 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Mar 2004 05:10:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=49510 Change 49510 by rwatson@rwatson_paprika on 2004/03/21 21:10:15 Integ ntperf_socket: - loop back rename of if_addr to if_addr_list - loop back rename of ddpcb to ddpcb_list Affected files ... .. //depot/projects/netperf_socket/sys/netatalk/aarp.c#5 integrate .. //depot/projects/netperf_socket/sys/netatalk/at_control.c#5 integrate .. //depot/projects/netperf_socket/sys/netatalk/at_var.h#2 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_input.c#4 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_output.c#4 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_pcb.c#5 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_usrreq.c#8 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_var.h#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/netatalk/aarp.c#5 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1990,1991 Regents of The University of Michigan. * All Rights Reserved. * - * $FreeBSD: src/sys/netatalk/aarp.c,v 1.27 2004/03/22 03:57:01 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/aarp.c,v 1.28 2004/03/22 04:50:36 rwatson Exp $ */ #include "opt_atalk.h" @@ -106,7 +106,7 @@ struct at_ifaddr *aa; struct sockaddr_at *sat2; - for (aa = at_ifaddr; aa; aa = aa->aa_next) { + for (aa = at_ifaddr_list; aa != NULL; aa = aa->aa_next) { sat2 = &(aa->aa_addr); if (sat2->sat_addr.s_net == sat->sat_addr.s_net) { break; ==== //depot/projects/netperf_socket/sys/netatalk/at_control.c#5 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1990,1991 Regents of The University of Michigan. * All Rights Reserved. * - * $FreeBSD: src/sys/netatalk/at_control.c,v 1.38 2004/03/22 03:57:01 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/at_control.c,v 1.39 2004/03/22 04:50:36 rwatson Exp $ */ #include @@ -21,7 +21,7 @@ #include #include -struct at_ifaddr *at_ifaddr; +struct at_ifaddr *at_ifaddr_list; static int aa_dorangeroute(struct ifaddr *ifa, u_int first, u_int last, int cmd); @@ -57,7 +57,7 @@ * If we have an ifp, then find the matching at_ifaddr if it exists */ if (ifp != NULL) { - for (aa = at_ifaddr; aa; aa = aa->aa_next) { + for (aa = at_ifaddr_list; aa != NULL; aa = aa->aa_next) { if (aa->aa_ifp == ifp) break; } } @@ -139,7 +139,7 @@ */ if (aa == NULL) { aa0 = malloc(sizeof(struct at_ifaddr), M_IFADDR, M_WAITOK | M_ZERO); - if ((aa = at_ifaddr) != NULL) { + if ((aa = at_ifaddr_list) != NULL) { /* * Don't let the loopback be first, since the first * address is the machine's default address for @@ -147,17 +147,17 @@ * If it is, stick ourself in front, otherwise * go to the back of the list. */ - if (at_ifaddr->aa_ifp->if_flags & IFF_LOOPBACK) { + if (at_ifaddr_list->aa_ifp->if_flags & IFF_LOOPBACK) { aa = aa0; - aa->aa_next = at_ifaddr; - at_ifaddr = aa; + aa->aa_next = at_ifaddr_list; + at_ifaddr_list = aa; } else { for (; aa->aa_next; aa = aa->aa_next) ; aa->aa_next = aa0; } } else { - at_ifaddr = aa0; + at_ifaddr_list = aa0; } aa = aa0; @@ -277,8 +277,8 @@ * as well, or we'd be in deep trouble */ aa0 = aa; - if (aa0 == (aa = at_ifaddr)) { - at_ifaddr = aa->aa_next; + if (aa0 == (aa = at_ifaddr_list)) { + at_ifaddr_list = aa->aa_next; } else { while (aa->aa_next && (aa->aa_next != aa0)) { aa = aa->aa_next; @@ -670,7 +670,7 @@ /* * failing that, if the net is one we have, it's a broadcast as well. */ - for (aa = at_ifaddr; aa; aa = aa->aa_next) { + for (aa = at_ifaddr_list; aa != NULL; aa = aa->aa_next) { if ((aa->aa_ifp->if_flags & IFF_BROADCAST) && (ntohs(sat->sat_addr.s_net) >= ntohs(aa->aa_firstnet) && ntohs(sat->sat_addr.s_net) <= ntohs(aa->aa_lastnet))) { @@ -801,10 +801,10 @@ struct ifaddr *ifa; struct ifnet *ifp; - while (aa = at_ifaddr) { + while ((aa = at_ifaddr_list) != NULL) { ifp = aa->aa_ifp; at_scrub(ifp, aa); - at_ifaddr = aa->aa_next; + at_ifaddr_list = aa->aa_next; if ((ifa = ifp->if_addrlist) == (struct ifaddr *)aa) { ifp->if_addrlist = ifa->ifa_next; } else { ==== //depot/projects/netperf_socket/sys/netatalk/at_var.h#2 (text+ko) ==== @@ -20,7 +20,7 @@ * +1-313-763-0525 * netatalk@itd.umich.edu * - * $FreeBSD: src/sys/netatalk/at_var.h,v 1.11 2003/03/04 23:19:51 jlemon Exp $ + * $FreeBSD: src/sys/netatalk/at_var.h,v 1.12 2004/03/22 04:50:36 rwatson Exp $ */ #ifndef _NETATALK_AT_VAR_H_ @@ -60,7 +60,7 @@ #define AFA_PHASE2 0x0004 #ifdef _KERNEL -extern struct at_ifaddr *at_ifaddr; +extern struct at_ifaddr *at_ifaddr_list; #endif #endif /* _NETATALK_AT_VAR_H_ */ ==== //depot/projects/netperf_socket/sys/netatalk/ddp_input.c#4 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. * - * $FreeBSD: src/sys/netatalk/ddp_input.c,v 1.22 2004/03/22 03:57:01 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/ddp_input.c,v 1.23 2004/03/22 04:50:36 rwatson Exp $ */ #include "opt_mac.h" @@ -126,7 +126,7 @@ * Make sure that we point to the phase1 ifaddr info * and that it's valid for this packet. */ - for (aa = at_ifaddr; aa; aa = aa->aa_next) { + for (aa = at_ifaddr_list; aa != NULL; aa = aa->aa_next) { if ((aa->aa_ifp == ifp) && ((aa->aa_flags & AFA_PHASE2) == 0) && ((to.sat_addr.s_node == AA_SAT(aa)->sat_addr.s_node) @@ -185,7 +185,7 @@ * this node number will match (which may NOT be what we want, * but it's probably safe in 99.999% of cases. */ - for (aa = at_ifaddr; aa; aa = aa->aa_next) { + for (aa = at_ifaddr_list; aa != NULL; aa = aa->aa_next) { if (phase == 1 && (aa->aa_flags & AFA_PHASE2)) { continue; } @@ -204,7 +204,7 @@ * A destination network was given. We just try to find * which ifaddr info matches it. */ - for (aa = at_ifaddr; aa; aa = aa->aa_next) { + for (aa = at_ifaddr_list; aa != NULL; aa = aa->aa_next) { /* * This is a kludge. Accept packets that are * for any router on a local netrange. ==== //depot/projects/netperf_socket/sys/netatalk/ddp_output.c#4 (text+ko) ==== @@ -21,7 +21,7 @@ * netatalk@itd.umich.edu */ -/* $FreeBSD: src/sys/netatalk/ddp_output.c,v 1.22 2004/03/22 03:24:10 rwatson Exp $ */ +/* $FreeBSD: src/sys/netatalk/ddp_output.c,v 1.23 2004/03/22 04:50:36 rwatson Exp $ */ #include "opt_mac.h" @@ -149,7 +149,7 @@ && (ro->ro_rt->rt_ifa) && (ifp = ro->ro_rt->rt_ifa->ifa_ifp)) { net = ntohs(satosat(ro->ro_rt->rt_gateway)->sat_addr.s_net); - for (aa = at_ifaddr; aa; aa = aa->aa_next) { + for (aa = at_ifaddr_list; aa != NULL; aa = aa->aa_next) { if (((net == 0) || (aa->aa_ifp == ifp)) && net >= ntohs(aa->aa_firstnet) && net <= ntohs(aa->aa_lastnet)) { ==== //depot/projects/netperf_socket/sys/netatalk/ddp_pcb.c#5 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. * - * $FreeBSD: src/sys/netatalk/ddp_pcb.c,v 1.40 2004/03/22 03:57:01 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/ddp_pcb.c,v 1.42 2004/03/22 04:54:36 rwatson Exp $ */ #include @@ -23,7 +23,7 @@ #include static struct ddpcb *ddp_ports[ ATPORT_LAST ]; -struct ddpcb *ddpcb = NULL; +struct ddpcb *ddpcb_list = NULL; void at_sockaddr(struct ddpcb *ddp, struct sockaddr **addr) @@ -50,7 +50,7 @@ if (sat->sat_addr.s_node != ATADDR_ANYNODE || sat->sat_addr.s_net != ATADDR_ANYNET) { - for (aa = at_ifaddr; aa; aa = aa->aa_next) { + for (aa = at_ifaddr_list; aa != NULL; aa = aa->aa_next) { if ((sat->sat_addr.s_net == AA_SAT(aa)->sat_addr.s_net) && (sat->sat_addr.s_node == AA_SAT(aa)->sat_addr.s_node)) { break; @@ -82,10 +82,10 @@ if (sat->sat_addr.s_node == ATADDR_ANYNODE && sat->sat_addr.s_net == ATADDR_ANYNET) { - if (at_ifaddr == NULL) { + if (at_ifaddr_list == NULL) { return (EADDRNOTAVAIL); } - sat->sat_addr = AA_SAT(at_ifaddr)->sat_addr; + sat->sat_addr = AA_SAT(at_ifaddr_list)->sat_addr; } ddp->ddp_lsat = *sat; @@ -165,7 +165,7 @@ } aa = NULL; if ((ifp = ro->ro_rt->rt_ifp) != NULL) { - for (aa = at_ifaddr; aa; aa = aa->aa_next) { + for (aa = at_ifaddr_list; aa != NULL; aa = aa->aa_next) { if (aa->aa_ifp == ifp && ntohs(net) >= ntohs(aa->aa_firstnet) && ntohs(net) <= ntohs(aa->aa_lastnet)) { @@ -202,7 +202,7 @@ */ aa = NULL; if (ro->ro_rt && (ifp = ro->ro_rt->rt_ifp)) { - for (aa = at_ifaddr; aa; aa = aa->aa_next) { + for (aa = at_ifaddr_list; aa != NULL; aa = aa->aa_next) { if (aa->aa_ifp == ifp) { break; } @@ -235,14 +235,14 @@ MALLOC(ddp, struct ddpcb *, sizeof *ddp, M_PCB, M_WAITOK | M_ZERO); ddp->ddp_lsat.sat_port = ATADDR_ANYPORT; - ddp->ddp_next = ddpcb; + ddp->ddp_next = ddpcb_list; ddp->ddp_prev = NULL; ddp->ddp_pprev = NULL; ddp->ddp_pnext = NULL; - if (ddpcb != NULL) { - ddpcb->ddp_prev = ddp; + if (ddpcb_list != NULL) { + ddpcb_list->ddp_prev = ddp; } - ddpcb = ddp; + ddpcb_list = ddp; ddp->ddp_socket = so; so->so_pcb = (caddr_t)ddp; @@ -276,7 +276,7 @@ if (ddp->ddp_prev) { ddp->ddp_prev->ddp_next = ddp->ddp_next; } else { - ddpcb = ddp->ddp_next; + ddpcb_list = ddp->ddp_next; } if (ddp->ddp_next) { ddp->ddp_next->ddp_prev = ddp->ddp_prev; ==== //depot/projects/netperf_socket/sys/netatalk/ddp_usrreq.c#8 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. * - * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.38 2004/03/22 03:57:01 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.39 2004/03/22 04:54:36 rwatson Exp $ */ #include @@ -223,7 +223,7 @@ { struct ddpcb *ddp; - for (ddp = ddpcb; ddp; ddp = ddp->ddp_next) { + for (ddp = ddpcb_list; ddp != NULL; ddp = ddp->ddp_next) { at_pcbdetach(ddp->ddp_socket, ddp); } } ==== //depot/projects/netperf_socket/sys/netatalk/ddp_var.h#3 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. * - * $FreeBSD: src/sys/netatalk/ddp_var.h,v 1.5 2004/03/17 12:54:21 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/ddp_var.h,v 1.6 2004/03/22 04:54:36 rwatson Exp $ */ #ifndef _NETATALK_DDP_VAR_H_ @@ -32,7 +32,7 @@ #ifdef _KERNEL extern int ddp_cksum; -extern struct ddpcb *ddpcb; +extern struct ddpcb *ddpcb_list; extern struct pr_usrreqs ddp_usrreqs; #endif #endif /* _NETATALK_DDP_VAR_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Mar 21 21:15:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF5BC16A4D0; Sun, 21 Mar 2004 21:15:55 -0800 (PST) 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 87AE216A4CE for ; Sun, 21 Mar 2004 21:15:55 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E1D243D41 for ; Sun, 21 Mar 2004 21:15:55 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2M5FtGe024282 for ; Sun, 21 Mar 2004 21:15:55 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2M5FsCe024279 for perforce@freebsd.org; Sun, 21 Mar 2004 21:15:54 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sun, 21 Mar 2004 21:15:54 -0800 (PST) Message-Id: <200403220515.i2M5FsCe024279@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 49512 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Mar 2004 05:15:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=49512 Change 49512 by marcel@marcel_nfs on 2004/03/21 21:14:57 Make alpha compile. With this commit we have a kdb frontend and ddb and gdb backends. The structure seems to be right, but things don't work. Some but not all of the "#ifdef DDB" have been replaced, so we need to clean that up further. In short: in between the mess, there's something that looks like a structure. Note that amd64 has been put on the side for now. Once I have alpha, i386, ia64 and sparc64 in a fairly good shape, code will be stabilized. This means that I can more effectively work on amd64, because I need someone to help with testing. I think it's about time I'll make the debuggers thread aware. The approach I'm going to go for is to create a kdb_thread variable and use that as as the context. MD code can get to the trapframe and PCB by dereferencing kdb_thread. On SMP machines this also works well, because stopped CPUs only have to save the current context in the PCB. Once I've got that working with gdb(1), I should have a better picture of what we need from the MD code. This is also the time to flesh out the MD code and get to a point where the debugger is actually working. From there is all about the details... Affected files ... .. //depot/projects/gdb/sys/alpha/alpha/db_interface.c#4 edit .. //depot/projects/gdb/sys/alpha/alpha/machdep.c#5 edit Differences ... ==== //depot/projects/gdb/sys/alpha/alpha/db_interface.c#4 (text+ko) ==== @@ -78,18 +78,6 @@ static jmp_buf *db_nofault = 0; extern jmp_buf db_jmpbuf; -extern void gdb_handle_exception(db_regs_t *, int, int); - -#if 0 -extern char *trap_type[]; -extern int trap_types; -#endif - -int db_active; - -void ddbprinttrap(unsigned long, unsigned long, unsigned long, - unsigned long); - struct db_variable db_regs[] = { { "v0", &ddb_regs.tf_regs[FRAME_V0], FCN_NULL }, { "t0", &ddb_regs.tf_regs[FRAME_T0], FCN_NULL }, @@ -129,104 +117,10 @@ }; struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]); -/* - * Print trap reason. - */ void -ddbprinttrap(a0, a1, a2, entry) - unsigned long a0, a1, a2, entry; -{ - - /* XXX Implement. */ - - printf("ddbprinttrap(0x%lx, 0x%lx, 0x%lx, 0x%lx)\n", a0, a1, a2, - entry); -} - -#if 0 -/* - * ddb_trap - field a kernel trap - */ -int -ddb_trap(a0, a1, a2, entry, regs) - unsigned long a0, a1, a2, entry; - db_regs_t *regs; +db_cpu_trap(int entry, int code, struct trapframe *tf) { - int ddb_mode = !(boothowto & RB_GDB); - register_t s; - - /* - * Don't bother checking for usermode, since a benign entry - * by the kernel (call to kdb_enter() or a breakpoint) has - * already checked for usermode. If neither of those - * conditions exist, something Bad has happened. - */ - - if (entry != ALPHA_KENTRY_IF || - (a0 != ALPHA_IF_CODE_BUGCHK && a0 != ALPHA_IF_CODE_BPT - && a0 != ALPHA_IF_CODE_GENTRAP)) { -#if 0 - if (ddb_mode) { - db_printf("ddbprinttrap from 0x%lx\n", /* XXX */ - regs->tf_regs[FRAME_PC]); - ddbprinttrap(a0, a1, a2, entry); - /* - * Tell caller "We did NOT handle the trap." - * Caller should panic, or whatever. - */ - return (0); - } -#endif - if (db_nofault) { - jmp_buf *no_fault = db_nofault; - db_nofault = 0; - longjmp(*no_fault, 1); - } - } - - /* - * XXX Should switch to DDB's own stack, here. - */ - - ddb_regs = *regs; - - s = intr_disable(); - -#ifdef SMP -#ifdef DIAGNOSTIC - db_printf("stopping %x\n", PCPU_GET(other_cpus)); -#endif - stop_cpus(PCPU_GET(other_cpus)); -#ifdef DIAGNOSTIC - db_printf("stopped_cpus=%x\n", stopped_cpus); -#endif -#endif - - db_active++; - - if (ddb_mode) { - cndbctl(TRUE); /* DDB active, unblank video */ - db_trap(entry, a0); /* Where the work happens */ - cndbctl(FALSE); /* DDB inactive */ - } else - gdb_handle_exception(&ddb_regs, entry, a0); - - db_active--; - -#ifdef SMP - restart_cpus(stopped_cpus); -#endif - - intr_restore(s); - - *regs = ddb_regs; - - /* - * Tell caller "We HAVE handled the trap." - */ - return (1); } -#endif /* * Read bytes from kernel address space for debugger. ==== //depot/projects/gdb/sys/alpha/alpha/machdep.c#5 (text+ko) ==== @@ -91,7 +91,6 @@ __FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.218 2004/03/01 19:19:15 kensmith Exp $"); #include "opt_compat.h" -#include "opt_ddb.h" #include "opt_kstack_pages.h" #include "opt_msgbuf.h" #include "opt_maxmem.h" @@ -146,7 +145,6 @@ #include #include #include -#include #include #include #include @@ -170,10 +168,9 @@ static char cpu_model[128]; SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, cpu_model, 0, ""); -#ifdef DDB +#ifdef KDB /* start and end of kernel symbol table */ void *ksym_start, *ksym_end; -db_regs_t ddb_regs; #endif int alpha_unaligned_print = 1; /* warn about unaligned accesses */ @@ -607,7 +604,7 @@ * stack). */ kernstart = trunc_page(kernel_text) - 2 * PAGE_SIZE; -#ifdef DDB +#ifdef KDB ksym_start = (void *)bootinfo.ssym; ksym_end = (void *)bootinfo.esym; kernend = (vm_offset_t)round_page(ksym_end); @@ -957,7 +954,6 @@ break; #endif -#if defined(DDB) case 'd': /* break into the kernel debugger ASAP */ case 'D': boothowto |= RB_KDB; @@ -966,7 +962,6 @@ case 'G': boothowto |= RB_GDB; break; -#endif case 'h': /* always halt, never reboot */ case 'H': From owner-p4-projects@FreeBSD.ORG Mon Mar 22 08:14:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BEEE16A4D0; Mon, 22 Mar 2004 08:14:24 -0800 (PST) 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 20A5A16A4CE for ; Mon, 22 Mar 2004 08:14:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 14CCB43D39 for ; Mon, 22 Mar 2004 08:14:24 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2MGENGe086329 for ; Mon, 22 Mar 2004 08:14:23 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2MGELAk086326 for perforce@freebsd.org; Mon, 22 Mar 2004 08:14:21 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 22 Mar 2004 08:14:21 -0800 (PST) Message-Id: <200403221614.i2MGELAk086326@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 49530 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Mar 2004 16:14:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=49530 Change 49530 by rwatson@rwatson_paprika on 2004/03/22 08:13:26 Integrate netperf_socket: - uio_machdep for various architectures. - Remove NetBSDism from uipc_socket2.c (m_claim()). - Loop back global variable locking for if_gif, if_gre. Affected files ... .. //depot/projects/netperf_socket/sys/conf/files.pc98#6 integrate .. //depot/projects/netperf_socket/sys/conf/files.sparc64#2 integrate .. //depot/projects/netperf_socket/sys/conf/kern.post.mk#5 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#6 integrate .. //depot/projects/netperf_socket/sys/net/if_gif.c#2 integrate .. //depot/projects/netperf_socket/sys/net/if_gre.c#3 integrate .. //depot/projects/netperf_socket/sys/net/if_gre.h#3 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_gre.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/uio_machdep.c#1 branch Differences ... ==== //depot/projects/netperf_socket/sys/conf/files.pc98#6 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.289 2004/03/14 23:03:56 imp Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.290 2004/03/22 13:37:11 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -172,6 +172,7 @@ i386/i386/sys_machdep.c standard i386/i386/trap.c standard i386/i386/tsc.c standard +i386/i386/uio_machdep.c standard i386/i386/vm86.c standard i386/i386/vm_machdep.c standard i386/ibcs2/ibcs2_errno.c optional ibcs2 ==== //depot/projects/netperf_socket/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.50 2004/01/14 08:38:13 des Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.51 2004/03/22 08:08:25 alc Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -104,6 +104,7 @@ sparc64/sparc64/tlb.c standard sparc64/sparc64/trap.c standard sparc64/sparc64/tsb.c standard +sparc64/sparc64/uio_machdep.c standard sparc64/sparc64/vm_machdep.c standard # ukbdmap.h optional ukbd_dflt_keymap \ ==== //depot/projects/netperf_socket/sys/conf/kern.post.mk#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.64 2004/03/21 19:06:54 obrien Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.65 2004/03/22 15:45:17 obrien 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 @@ -116,7 +116,7 @@ ./assym.s: assym.s assym.s: $S/kern/genassym.sh genassym.o - NM="${NM}" sh $S/kern/genassym.sh genassym.o > ${.TARGET} + NM='${NM}' sh $S/kern/genassym.sh genassym.o > ${.TARGET} genassym.o: $S/$M/$M/genassym.c ${CC} -c ${CFLAGS:N-fno-common} $S/$M/$M/genassym.c ==== //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#6 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.121 2004/03/01 03:14:21 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.122 2004/03/22 10:17:40 ps Exp $"); #include "opt_mac.h" #include "opt_param.h" @@ -719,9 +719,6 @@ SBLASTMBUFCHK(sb); -#ifdef MBUFTRACE - m_claim(m, sb->sb_mowner); -#endif sbcompress(sb, m, sb->sb_mbtail); sb->sb_lastrecord = sb->sb_mb; ==== //depot/projects/netperf_socket/sys/net/if_gif.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/net/if_gif.c,v 1.41 2003/12/28 03:55:59 sam Exp $ */ +/* $FreeBSD: src/sys/net/if_gif.c,v 1.43 2004/03/22 15:43:14 rwatson Exp $ */ /* $KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $ */ /* @@ -83,9 +83,23 @@ #define GIFNAME "gif" +/* + * gif_mtx protects the global gif_softc_list, and access to gif_called. + * XXX: See comment blow on gif_called. + * XXX: Per-softc locking is still required. + */ +static struct mtx gif_mtx; static MALLOC_DEFINE(M_GIF, "gif", "Generic Tunnel Interface"); static LIST_HEAD(, gif_softc) gif_softc_list; +/* + * XXX: gif_called is a recursion counter to prevent misconfiguration to + * cause unbounded looping in the network stack. However, this is a flawed + * approach as it assumes non-reentrance in the stack. This should be + * changed to use packet tags to track recusion.. + */ +static int gif_called = 0; + void (*ng_gif_input_p)(struct ifnet *ifp, struct mbuf **mp, int af); void (*ng_gif_input_orphan_p)(struct ifnet *ifp, struct mbuf *m, int af); void (*ng_gif_attach_p)(struct ifnet *ifp); @@ -145,7 +159,9 @@ gifattach0(sc); + mtx_lock(&gif_mtx); LIST_INSERT_HEAD(&gif_softc_list, sc, gif_list); + mtx_unlock(&gif_mtx); return (0); } @@ -173,15 +189,13 @@ (*ng_gif_attach_p)(&sc->gif_if); } -void -gif_clone_destroy(ifp) - struct ifnet *ifp; +static void +gif_destroy(struct gif_softc *sc) { + struct ifnet *ifp = &sc->gif_if; int err; - struct gif_softc *sc = ifp->if_softc; - gif_delete_tunnel(&sc->gif_if); - LIST_REMOVE(sc, gif_list); + gif_delete_tunnel(ifp); #ifdef INET6 if (sc->encap_cookie6 != NULL) { err = encap_detach(sc->encap_cookie6); @@ -203,15 +217,29 @@ free(sc, M_GIF); } +void +gif_clone_destroy(ifp) + struct ifnet *ifp; +{ + struct gif_softc *sc = ifp->if_softc; + + mtx_lock(&gif_mtx); + LIST_REMOVE(sc, gif_list); + mtx_unlock(&gif_mtx); + gif_destroy(sc); +} + static int gifmodevent(mod, type, data) module_t mod; int type; void *data; { + struct gif_softc *sc; switch (type) { case MOD_LOAD: + mtx_init(&gif_mtx, "gif_mtx", NULL, MTX_DEF); LIST_INIT(&gif_softc_list); if_clone_attach(&gif_cloner); @@ -223,9 +251,15 @@ case MOD_UNLOAD: if_clone_detach(&gif_cloner); - while (!LIST_EMPTY(&gif_softc_list)) - gif_clone_destroy(&LIST_FIRST(&gif_softc_list)->gif_if); - + mtx_lock(&gif_mtx); + while ((sc = LIST_FIRST(&gif_softc_list)) != NULL) { + LIST_REMOVE(sc, gif_list); + mtx_unlock(&gif_mtx); + gif_destroy(sc); + mtx_lock(&gif_mtx); + } + mtx_unlock(&gif_mtx); + mtx_destroy(&gif_mtx); #ifdef INET6 ip6_gif_hlim = 0; #endif @@ -314,7 +348,6 @@ { struct gif_softc *sc = (struct gif_softc*)ifp; int error = 0; - static int called = 0; /* XXX: MUTEX */ #ifdef MAC error = mac_check_ifnet_transmit(ifp, m); @@ -331,14 +364,17 @@ * mutual exclusion of the variable CALLED, especially if we * use kernel thread. */ - if (++called > max_gif_nesting) { + mtx_lock(&gif_mtx); + if (++gif_called > max_gif_nesting) { + mtx_unlock(&gif_mtx); log(LOG_NOTICE, "gif_output: recursively called too many times(%d)\n", - called); + gif_called); m_freem(m); error = EIO; /* is there better errno? */ goto end; } + mtx_unlock(&gif_mtx); m->m_flags &= ~(M_BCAST|M_MCAST); if (!(ifp->if_flags & IFF_UP) || @@ -378,7 +414,9 @@ } end: - called = 0; /* reset recursion counter */ + mtx_lock(&gif_mtx); + gif_called = 0; /* reset recursion counter */ + mtx_unlock(&gif_mtx); if (error) ifp->if_oerrors++; return error; @@ -688,6 +726,13 @@ return error; } +/* + * XXXRW: There's a general event-ordering issue here: the code to check + * if a given tunnel is already present happens before we perform a + * potentially blocking setup of the tunnel. This code needs to be + * re-ordered so that the check and replacement can be atomic using + * a mutex. + */ int gif_set_tunnel(ifp, src, dst) struct ifnet *ifp; @@ -702,6 +747,7 @@ s = splnet(); + mtx_lock(&gif_mtx); LIST_FOREACH(sc2, &gif_softc_list, gif_list) { if (sc2 == sc) continue; @@ -721,11 +767,13 @@ bcmp(sc2->gif_pdst, dst, dst->sa_len) == 0 && bcmp(sc2->gif_psrc, src, src->sa_len) == 0) { error = EADDRNOTAVAIL; + mtx_unlock(&gif_mtx); goto bad; } /* XXX both end must be valid? (I mean, not 0.0.0.0) */ } + mtx_unlock(&gif_mtx); /* XXX we can detach from both, but be polite just in case */ if (sc->gif_psrc) ==== //depot/projects/netperf_socket/sys/net/if_gre.c#3 (text+ko) ==== @@ -91,6 +91,11 @@ #define GRENAME "gre" +/* + * gre_mtx protects all global variables in if_gre.c. + * XXX: gre_softc data not protected yet. + */ +struct mtx gre_mtx; static MALLOC_DEFINE(M_GRE, GRENAME, "Generic Routing Encapsulation"); struct gre_softc_head gre_softc_list; @@ -149,6 +154,7 @@ greattach(void) { + mtx_init(&gre_mtx, "gre_mtx", NULL, MTX_DEF); LIST_INIT(&gre_softc_list); if_clone_attach(&gre_cloner); } @@ -181,24 +187,35 @@ sc->wccp_ver = WCCP_V1; if_attach(&sc->sc_if); bpfattach(&sc->sc_if, DLT_NULL, sizeof(u_int32_t)); + mtx_lock(&gre_mtx); LIST_INSERT_HEAD(&gre_softc_list, sc, sc_list); + mtx_unlock(&gre_mtx); return (0); } static void -gre_clone_destroy(ifp) - struct ifnet *ifp; +gre_destroy(struct gre_softc *sc) { - struct gre_softc *sc = ifp->if_softc; #ifdef INET if (sc->encap != NULL) encap_detach(sc->encap); #endif + bpfdetach(&sc->sc_if); + if_detach(&sc->sc_if); + free(sc, M_GRE); +} + +static void +gre_clone_destroy(ifp) + struct ifnet *ifp; +{ + struct gre_softc *sc = ifp->if_softc; + + mtx_lock(&gre_mtx); LIST_REMOVE(sc, sc_list); - bpfdetach(ifp); - if_detach(ifp); - free(sc, M_GRE); + mtx_unlock(&gre_mtx); + gre_destroy(sc); } /* @@ -727,6 +744,7 @@ static int gremodevent(module_t mod, int type, void *data) { + struct gre_softc *sc; switch (type) { case MOD_LOAD: @@ -735,8 +753,15 @@ case MOD_UNLOAD: if_clone_detach(&gre_cloner); - while (!LIST_EMPTY(&gre_softc_list)) - gre_clone_destroy(&LIST_FIRST(&gre_softc_list)->sc_if); + mtx_lock(&gre_mtx); + while ((sc = LIST_FIRST(&gre_softc_list)) != NULL) { + LIST_REMOVE(sc, sc_list); + mtx_unlock(&gre_mtx); + gre_destroy(sc); + mtx_lock(&gre_mtx); + } + mtx_unlock(&gre_mtx); + mtx_destroy(&gre_mtx); break; } return 0; ==== //depot/projects/netperf_socket/sys/net/if_gre.h#3 (text+ko) ==== @@ -176,6 +176,7 @@ #ifdef _KERNEL LIST_HEAD(gre_softc_head, gre_softc); +extern struct mtx gre_mtx; extern struct gre_softc_head gre_softc_list; u_int16_t gre_in_cksum(u_int16_t *, u_int); ==== //depot/projects/netperf_socket/sys/netinet/ip_gre.c#3 (text+ko) ==== @@ -314,6 +314,13 @@ /* * Find the gre interface associated with our src/dst/proto set. + * + * XXXRW: Need some sort of drain/refcount mechanism so that the softc + * reference remains valid after it's returned from gre_lookup(). Right + * now, I'm thinking it should be reference-counted with a gre_dropref() + * when the caller is done with the softc. This is complicated by how + * to handle destroying the gre softc; probably using a gre_drain() in + * in_gre.c during destroy. */ static struct gre_softc * gre_lookup(m, proto) @@ -323,14 +330,18 @@ struct ip *ip = mtod(m, struct ip *); struct gre_softc *sc; + mtx_lock(&gre_mtx); for (sc = LIST_FIRST(&gre_softc_list); sc != NULL; sc = LIST_NEXT(sc, sc_list)) { if ((sc->g_dst.s_addr == ip->ip_src.s_addr) && (sc->g_src.s_addr == ip->ip_dst.s_addr) && (sc->g_proto == proto) && - ((sc->sc_if.if_flags & IFF_UP) != 0)) + ((sc->sc_if.if_flags & IFF_UP) != 0)) { + mtx_unlock(&gre_mtx); return (sc); + } } + mtx_unlock(&gre_mtx); return (NULL); } From owner-p4-projects@FreeBSD.ORG Mon Mar 22 19:05:55 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC75716A4D0; Mon, 22 Mar 2004 19:05:54 -0800 (PST) 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 9AFD716A4CE for ; Mon, 22 Mar 2004 19:05:54 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F74F43D39 for ; Mon, 22 Mar 2004 19:05:54 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2N35sGe048258 for ; Mon, 22 Mar 2004 19:05:54 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2N35rLb048254 for perforce@freebsd.org; Mon, 22 Mar 2004 19:05:53 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Mon, 22 Mar 2004 19:05:53 -0800 (PST) Message-Id: <200403230305.i2N35rLb048254@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 49562 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Mar 2004 03:05:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=49562 Change 49562 by marcel@marcel_nfs on 2004/03/22 19:05:11 IFC @49560 Affected files ... .. //depot/projects/gdb/UPDATING#7 integrate .. //depot/projects/gdb/bin/cat/cat.1#2 integrate .. //depot/projects/gdb/bin/ls/ls.1#2 integrate .. //depot/projects/gdb/bin/mv/mv.c#2 integrate .. //depot/projects/gdb/bin/ps/ps.1#4 integrate .. //depot/projects/gdb/bin/rmail/Makefile#3 integrate .. //depot/projects/gdb/bin/rmdir/rmdir.1#2 integrate .. //depot/projects/gdb/bin/rmdir/rmdir.c#2 integrate .. //depot/projects/gdb/etc/rc.d/ntpdate#4 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/gdb/gnu/lib/libregex/Makefile#4 integrate .. //depot/projects/gdb/gnu/lib/libregex/regex.c#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_platform.h#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_util.c#4 integrate .. //depot/projects/gdb/lib/libc/gen/vis.3#2 integrate .. //depot/projects/gdb/release/picobsd/build/picobsd#2 integrate .. //depot/projects/gdb/sbin/ipfw/ipfw.8#3 integrate .. //depot/projects/gdb/sbin/reboot/Makefile#2 integrate .. //depot/projects/gdb/share/man/man4/aac.4#2 integrate .. //depot/projects/gdb/share/man/man5/passwd.5#2 integrate .. //depot/projects/gdb/share/mk/bsd.cpu.mk#5 integrate .. //depot/projects/gdb/sys/compat/ndis/kern_ndis.c#6 integrate .. //depot/projects/gdb/sys/compat/ndis/ntoskrnl_var.h#5 integrate .. //depot/projects/gdb/sys/compat/ndis/subr_ntoskrnl.c#8 integrate .. //depot/projects/gdb/sys/conf/files.i386#7 integrate .. //depot/projects/gdb/sys/conf/files.pc98#6 integrate .. //depot/projects/gdb/sys/conf/files.sparc64#3 integrate .. //depot/projects/gdb/sys/conf/kern.post.mk#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acfreebsd.h#3 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pcib.c#4 integrate .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis_pccard.c#4 integrate .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis_pci.c#4 integrate .. //depot/projects/gdb/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/gdb/sys/i386/i386/uio_machdep.c#1 branch .. //depot/projects/gdb/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/gdb/sys/kern/kern_thread.c#5 integrate .. //depot/projects/gdb/sys/kern/sched_ule.c#5 integrate .. //depot/projects/gdb/sys/kern/subr_bus.c#3 integrate .. //depot/projects/gdb/sys/kern/subr_witness.c#6 integrate .. //depot/projects/gdb/sys/kern/uipc_socket2.c#4 integrate .. //depot/projects/gdb/sys/net/if_arcsubr.c#2 integrate .. //depot/projects/gdb/sys/net/if_gif.c#2 integrate .. //depot/projects/gdb/sys/net/if_gre.c#3 integrate .. //depot/projects/gdb/sys/net/if_gre.h#3 integrate .. //depot/projects/gdb/sys/netatalk/aarp.c#3 integrate .. //depot/projects/gdb/sys/netatalk/at_control.c#3 integrate .. //depot/projects/gdb/sys/netatalk/at_rmx.c#2 integrate .. //depot/projects/gdb/sys/netatalk/at_var.h#2 integrate .. //depot/projects/gdb/sys/netatalk/ddp_input.c#3 integrate .. //depot/projects/gdb/sys/netatalk/ddp_output.c#3 integrate .. //depot/projects/gdb/sys/netatalk/ddp_pcb.c#3 integrate .. //depot/projects/gdb/sys/netatalk/ddp_usrreq.c#4 integrate .. //depot/projects/gdb/sys/netatalk/ddp_var.h#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_tee.c#2 integrate .. //depot/projects/gdb/sys/netinet/if_ether.c#3 integrate .. //depot/projects/gdb/sys/netinet/ip_gre.c#3 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/uio_machdep.c#1 branch .. //depot/projects/gdb/sys/sys/param.h#7 integrate .. //depot/projects/gdb/usr.bin/csplit/csplit.c#2 integrate .. //depot/projects/gdb/usr.bin/indent/args.c#3 integrate .. //depot/projects/gdb/usr.bin/talk/ctl.c#2 integrate .. //depot/projects/gdb/usr.sbin/inetd/inetd.c#2 integrate .. //depot/projects/gdb/usr.sbin/mountd/exports.5#2 integrate Differences ... ==== //depot/projects/gdb/UPDATING#7 (text+ko) ==== @@ -17,6 +17,17 @@ developers choose to disable these features on build machines to maximize performance. +20040322: + The debug.mpsafenet tunable controls whether the kernel Giant + lock is held across the lower levels of the network stack, and + by default is turned off. In the few days following 20040322, + the behavior of debug.mpsafenet will change such that this + tunable controls Giant over all levels of the network stack. + If you are currently setting debug.mpsafenet to 1, you should + set it back to 0 (the default) again during the change-over. + An additional note will be added to UPDATING when sufficient + locking is merged to permit this to take place. + 20040310: The FreeBSD/sparc64 platform is changing time_t from 32-bits to 64-bits. This is a very major incompatible change, so people @@ -1548,4 +1559,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.300 2004/03/18 00:50:40 obrien Exp $ +$FreeBSD: src/UPDATING,v 1.301 2004/03/22 16:37:32 rwatson Exp $ ==== //depot/projects/gdb/bin/cat/cat.1#2 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)cat.1 8.3 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/cat/cat.1,v 1.19 2001/09/25 18:10:18 ru Exp $ +.\" $FreeBSD: src/bin/cat/cat.1,v 1.21 2004/03/21 11:04:59 tjr Exp $ .\" -.Dd September 15, 2001 +.Dd March 21, 2004 .Dt CAT 1 .Os .Sh NAME @@ -93,9 +93,7 @@ option), and display tab characters as .Ql ^I . .It Fl u -The -.Fl u -option guarantees that the output is unbuffered. +Disable output buffering. .It Fl v Display non-printing characters so they are visible. Control characters print as @@ -199,3 +197,11 @@ redirection, the command .Dq Li cat file1 file2 > file1 will cause the original data in file1 to be destroyed! +.Pp +The +.Nm +utility does not recognize multibyte characters when the +.Fl t +or +.Fl v +option is in effect. ==== //depot/projects/gdb/bin/ls/ls.1#2 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.77 2003/12/01 19:10:29 obrien Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.78 2004/03/21 11:16:24 tjr Exp $ .\" -.Dd May 19, 2002 +.Dd March 21, 2004 .Dt LS 1 .Os .Sh NAME @@ -677,3 +677,7 @@ .Sh BUGS To maintain backward compatibility, the relationships between the many options are quite complex. +.Pp +The +.Nm +utility does not recognize multibyte characters in filenames. ==== //depot/projects/gdb/bin/mv/mv.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.41 2003/05/05 22:49:22 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.42 2004/03/21 13:38:37 pjd Exp $"); #include #include @@ -210,14 +210,25 @@ struct statfs sfs; char path[PATH_MAX]; - /* Can't mv(1) a mount point. */ - if (realpath(from, path) == NULL) { - warnx("cannot resolve %s: %s", from, path); + /* + * If the source is a symbolic link and is on another + * filesystem, it can be recreated at the destination. + */ + if (lstat(from, &sb) == -1) { + warn("%s", from); return (1); } - if (!statfs(path, &sfs) && !strcmp(path, sfs.f_mntonname)) { - warnx("cannot rename a mount point"); - return (1); + if (!S_ISLNK(sb.st_mode)) { + /* Can't mv(1) a mount point. */ + if (realpath(from, path) == NULL) { + warnx("cannot resolve %s: %s", from, path); + return (1); + } + if (!statfs(path, &sfs) && + !strcmp(path, sfs.f_mntonname)) { + warnx("cannot rename a mount point"); + return (1); + } } } else { warn("rename %s to %s", from, to); ==== //depot/projects/gdb/bin/ps/ps.1#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.67 2004/03/17 22:46:58 gad Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.68 2004/03/21 11:24:06 tjr Exp $ .\" -.Dd April 18, 1994 +.Dd March 21, 2004 .Dt PS 1 .Os .Sh NAME @@ -559,3 +559,8 @@ .Nm cannot run faster than the system and is run as any other scheduled process, the information it displays can never be exact. +.Pp +The +.Nm +utility does not correctly display argument lists containing multibyte +characters. ==== //depot/projects/gdb/bin/rmail/Makefile#3 (text+ko) ==== @@ -1,15 +1,18 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/rmail/Makefile,v 1.19 2004/02/23 20:05:14 johan Exp $ +# $FreeBSD: src/bin/rmail/Makefile,v 1.20 2004/03/22 03:17:36 obrien Exp $ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/rmail +# Not much point this being static. It calls a shared sendmail... +NOSHARED?= NO + PROG= rmail SRCS= rmail.c MAN= rmail.8 + +WARNS?= 0 CFLAGS+=-I${SENDMAIL_DIR}/include -I. -WARNS?= 0 -WFORMAT=0 .if exists(${.OBJDIR}/../../lib/libsm) LIBSMDIR:= ${.OBJDIR}/../../lib/libsm @@ -34,9 +37,6 @@ # following: # CFLAGS+= -DQUEUE_ONLY -# Not much point this being static. It calls a shared sendmail... -NOSHARED?= NO - sm_os.h: ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h ==== //depot/projects/gdb/bin/rmdir/rmdir.1#2 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)rmdir.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/rmdir/rmdir.1,v 1.9 2000/11/20 11:39:40 ru Exp $ +.\" $FreeBSD: src/bin/rmdir/rmdir.1,v 1.10 2004/03/21 04:56:06 des Exp $ .\" -.Dd May 31, 1993 +.Dd March 21, 2004 .Dt RMDIR 1 .Os .Sh NAME @@ -43,7 +43,7 @@ .Nd remove directories .Sh SYNOPSIS .Nm -.Op Fl p +.Op Fl pv .Ar directory ... .Sh DESCRIPTION The @@ -72,6 +72,8 @@ (See .Xr rm 1 for fully non-discriminant recursive removal.) +.It Fl v +Be verbose, listing each directory as it is removed. .El .Pp The ==== //depot/projects/gdb/bin/rmdir/rmdir.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rmdir/rmdir.c,v 1.14 2003/05/01 16:58:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/rmdir/rmdir.c,v 1.15 2004/03/21 04:56:06 des Exp $"); #include #include @@ -52,21 +52,25 @@ #include #include -int rm_path(char *); -void usage(void); +static int rm_path(char *); +static void usage(void); + +static int pflag; +static int vflag; int main(int argc, char *argv[]) { int ch, errors; - int pflag; - pflag = 0; - while ((ch = getopt(argc, argv, "p")) != -1) + while ((ch = getopt(argc, argv, "pv")) != -1) switch(ch) { case 'p': pflag = 1; break; + case 'v': + vflag = 1; + break; case '?': default: usage(); @@ -78,17 +82,22 @@ usage(); for (errors = 0; *argv; argv++) { - if (rmdir(*argv) < 0) { - warn("%s", *argv); - errors = 1; - } else if (pflag) + if (pflag) { errors |= rm_path(*argv); + } else { + if (rmdir(*argv) < 0) { + warn("%s", *argv); + errors = 1; + } + if (vflag) + printf("%s\n", *argv); + } } exit(errors); } -int +static int rm_path(char *path) { char *p; @@ -107,12 +116,14 @@ warn("%s", path); return (1); } + if (vflag) + printf("%s\n", path); } return (0); } -void +static void usage(void) { ==== //depot/projects/gdb/etc/rc.d/ntpdate#4 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ntpdate,v 1.8 2002/03/22 04:16:39 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ntpdate,v 1.7 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/ntpdate,v 1.8 2004/03/22 16:35:35 des Exp $ # # PROVIDE: ntpdate @@ -12,9 +12,8 @@ name="ntpdate" rcvar=`set_rcvar` -command="/usr/sbin/${name}" -command_args=">/dev/null 2>&1" -pidfile="/var/run/${name}.pid" +stop_cmd=":" +start_cmd="ntpdate_start" ntpdate_start() { @@ -26,7 +25,7 @@ fi if [ -n "$ntpdate_hosts" ]; then echo "Setting date via ntp." - ntpdate $rc_flags $ntpdate_hosts + ${ntpdate_command:-ntpdate} $rc_flags $ntpdate_hosts fi } ==== //depot/projects/gdb/games/fortune/datfiles/fortunes#3 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.126 2004/02/09 18:45:25 wes Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.127 2004/03/22 05:02:01 grog Exp $ % -- Gifts for Children -- @@ -15408,6 +15408,23 @@ What is a magician but a practicing theorist? -- Obi-Wan Kenobi % +What is actually happening, I am afraid, is that we all tell each +other and ourselves that software engineering techniques should be +improved considerably, because there is a crisis. But there are a few +boundary conditions which apparently have to be satisfied: + + 1. We may not change our thinking habits. + 2. We may not change our programming tools. + 3. We may not change our hardware. + 4. We may not change our tasks. + 5. We may not change the organizational set-up + in which the work has to be done. + +Now under these five immutable boundary conditions, we have to try to +improve matters. This is utterly ridiculous. + +Edsger W. Dijkstra, on receiving the ACM Turing Award in 1972 +% What is mind? No matter. What is matter? Never mind. -- Thomas Hewitt Key, 1799-1875 ==== //depot/projects/gdb/gnu/lib/libregex/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libregex/Makefile,v 1.27 2004/02/25 02:41:15 ache Exp $ +# $FreeBSD: src/gnu/lib/libregex/Makefile,v 1.28 2004/03/22 14:44:00 ache Exp $ SUBDIR+= doc ==== //depot/projects/gdb/gnu/lib/libregex/regex.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/lib/libregex/regex.c,v 1.11 2004/02/25 02:39:10 ache Exp $ */ +/* $FreeBSD: src/gnu/lib/libregex/regex.c,v 1.12 2004/03/22 14:44:00 ache Exp $ */ /* Extended regular expression matching and search library, version 0.12. (Implements POSIX draft P1003.2/D11.2, except for some of the ==== //depot/projects/gdb/lib/libarchive/archive_platform.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.3 2004/03/20 22:35:33 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.4 2004/03/22 05:17:23 kientzle Exp $ */ /* @@ -49,7 +49,7 @@ #define HAVE_CHFLAGS 1 #define HAVE_LUTIMES 1 #define HAVE_LCHMOD 1 -#define HAVE_POSIX_STRERROR_R 1 +#define HAVE_STRERROR_R 1 #define ARCHIVE_ERRNO_FILE_FORMAT EFTYPE #define ARCHIVE_ERRNO_PROGRAMMER EINVAL #define ARCHIVE_ERRNO_MISC (-1) @@ -86,7 +86,8 @@ #define st_atimespec st_atim #define st_mtimespec st_mtim #define st_ctimespec st_ctim -#define HAVE_GLIBC_STRERROR_R 1 +#define HAVE_STRERROR_R 1 +#define STRERROR_R_CHAR_P 1 #endif /* ==== //depot/projects/gdb/lib/libarchive/archive_util.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_util.c,v 1.3 2004/03/20 22:35:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_util.c,v 1.4 2004/03/22 05:17:23 kientzle Exp $"); #include @@ -83,7 +83,9 @@ archive_set_error(struct archive *a, int error_number, const char *fmt, ...) { va_list ap; +#ifdef HAVE_STRERROR_R char errbuff[512]; +#endif char *errp; a->archive_error_number = error_number; @@ -96,11 +98,13 @@ archive_string_vsprintf(&(a->error_string), fmt, ap); if(error_number > 0) { archive_strcat(&(a->error_string), ": "); -#if defined(HAVE_GLIBC_STRERROR_R) +#ifdef HAVE_STRERROR_R +#ifdef STRERROR_R_CHAR_P errp = strerror_r(error_number, errbuff, sizeof(errbuff)); -#elif defined(HAVE_POSIX_STRERROR_R) +#else strerror_r(error_number, errbuff, sizeof(errbuff)); errp = errbuff; +#endif #else /* Note: this is not threadsafe! */ errp = strerror(error_number); ==== //depot/projects/gdb/lib/libc/gen/vis.3#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)vis.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/gen/vis.3,v 1.22 2003/10/30 12:41:50 phk Exp $ +.\" $FreeBSD: src/lib/libc/gen/vis.3,v 1.23 2004/03/21 11:31:37 tjr Exp $ .\" -.Dd July 25, 1996 +.Dd March 21, 2004 .Dt VIS 3 .Os .Sh NAME @@ -282,3 +282,9 @@ .Sh HISTORY These functions first appeared in .Bx 4.4 . +.Sh BUGS +The +.Nm +family of functions do not recognize multibyte characters, and thus +may consider them to be non-printable when they are in fact printable +(and vice versa.) ==== //depot/projects/gdb/release/picobsd/build/picobsd#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/release/picobsd/build/picobsd,v 1.28 2003/11/07 12:49:55 simokawa Exp $ +# $FreeBSD: src/release/picobsd/build/picobsd,v 1.29 2004/03/21 10:46:13 luigi Exp $ # # The new PicoBSD build script. Invoked as # @@ -83,6 +83,8 @@ } logverbose() { + local foo + printf "\n*** %s\n" "$*" read -p "=== Press enter to continue" foo } @@ -112,8 +114,7 @@ c_startdir=`pwd` # directory where we start # used to lookup config and create BUILDDIR - c_boot=/boot/boot # boot blocks (in case you want custom ones) - c_boot1=/boot/boot1 + c_boot1=/boot/boot1 # boot blocks (in case you want custom ones) c_boot2=/boot/boot2 c_reply=${c_reply:-`mktemp "/tmp/reply.XXXXXXXXXX"`} @@ -132,7 +133,9 @@ *) l_vn="vn" l_makedev="/dev/MAKEDEV" + ;; esac + l_newfs="-m 0 -o space -f 512 -b 4096" # Find a suitable vnode l_vnum=`mount | awk "/${l_vn}/ { num++ } END { printf \"%d\", num }"` l_vndev=${l_vn}${l_vnum} @@ -156,21 +159,28 @@ } create_includes_and_libraries() { + local e i + log "create_includes_and_libraries() for ${SRC}" # Optionally creates include directory and libraries. mkdir -p ${l_usrtree}/include # the include directory... mkdir -p ${l_usrtree}/share/misc # a few things go here mkdir -p ${l_usrtree}/lib # libraries mkdir -p ${l_usrtree}/sbin # some binaries - (cd ${SRC}; INCOWN=`id -un` BINOWN=`id -un` DESTDIR=${l_usrtree}/.. \ - make -m ${SRC}/share/mk includes ) || fail $? includes + # override variables for ownershiip and destinations + # BINOWN:BINGRP are also used for include files + (cd ${SRC}; \ + BINOWN=`id -un` BINGRP=`id -gn` \ + DESTDIR=${l_usrtree}/.. \ + make -m ${SRC}/share/mk includes ) || fail $? includes # Pick up the correct headers for libraries. CFLAGS="-nostdinc -I${l_usrtree}/include" ; export CFLAGS (cd ${SRC} # $e is the invocation of make with correct environment e="MAKEOBJDIRPREFIX=${l_objtree}/picobsd/libraries \ - INCOWN=`id -un` BINOWN=`id -un` DESTDIR=${l_usrtree}/.. \ + BINOWN=`id -un` BINGRP=`id -gn` \ + DESTDIR=${l_usrtree}/.. \ make -m ${SRC}/share/mk \ -DNOHTML -DNOINFO -DNOMAN -DNOSHARE -DNOFSCHG " log "do a 'make obj' in a few places." @@ -194,7 +204,7 @@ # file. Also sets MY_TREE and BUILDDIR and SITE set_type() { - local a + local a i log "set_type()" THETYPE=$1 @@ -534,12 +544,11 @@ # installed so you have more space on the disk... # For small image sizes, use std disktypes if [ ${MFS_SIZE} -lt 1024 ] ; then - disklabel -w ${l_vndev} fd${MFS_SIZE} || fail $? mfs_disklabel + disklabel -rw ${l_vndev} fd${MFS_SIZE} || fail $? mfs_disklabel else - disklabel -w ${l_vndev} auto || fail $? mfs_disklabel + disklabel -rw ${l_vndev} auto || fail $? mfs_disklabel fi - newfs -i ${mfs_inodes} -m 0 -o space -f 512 -b 4096 \ - /dev/${l_vndev}c > /dev/null + newfs -i ${mfs_inodes} ${l_newfs} /dev/${l_vndev}c > /dev/null mount /dev/${l_vndev}c ${c_mnt} || fail $? no_mount log "`df /dev/${l_vndev}c`" } @@ -610,7 +619,7 @@ log "Using existing host key" else log "Generating new host key" - ssh-keygen -f ${BUILDDIR}/floppy.tree/etc/ssh_host_key \ + ssh-keygen -t rsa1 -f ${BUILDDIR}/floppy.tree/etc/ssh_host_key \ -N "" -C "root@picobsd" gzip -9 ${BUILDDIR}/floppy.tree/etc/ssh_host_key* || true fi @@ -792,11 +801,15 @@ init_fs_image ${BUILDDIR}/${c_img} ${blocks} log "Labeling floppy image" - b=${BUILDDIR}/boot # modified boot - perl -pne 's/\/boot\/loader/\/kernel\0\0\0\0\0/' ${c_boot} > ${b} + b2=${BUILDDIR}/boot2 # modified boot2 + cp ${c_boot2} ${b2} + chmod 0644 ${b2} + set `strings -at d ${b2} | grep "/boot/loader"` + echo -e "/kernel\0\0\0\0\0" | dd of=${b2} obs=$1 oseek=1 conv=notrunc + chmod 0444 ${b2} # create a disklabel ... - disklabel -Bw -b ${b} ${l_vndev} auto || \ + disklabel -Brw -b ${c_boot1} -s ${b2} ${l_vndev} auto || \ fail $? floppy_disklabel # and copy partition c: into partition a: using some sed magic @@ -804,8 +817,7 @@ disklabel -R ${l_vndev} /dev/stdin log "Newfs floppy image" - newfs -i ${fd_inodes} -m 0 -o space -f 512 -b 4096 \ - /dev/${l_vndev}a > /dev/null + newfs -i ${fd_inodes} ${l_newfs} /dev/${l_vndev}a > /dev/null log "Mounting floppy image" mount /dev/${l_vndev}a ${dst} ==== //depot/projects/gdb/sbin/ipfw/ipfw.8#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.139 2004/01/23 06:37:19 mtm Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.140 2004/03/22 21:24:38 ceri Exp $ .\" .Dd December 1, 2003 .Dt IPFW 8 @@ -885,7 +885,8 @@ Matches IP packets whose destination port is one of the port(s) specified as argument. .It Cm established -Matches TCP packets that have the RST or ACK bits set. +Matches TCP packets that either do not have the SYN bit set, or +that also have one of the RST or ACK bits set. .It Cm frag Matches packets that are fragments and not the first fragment of an IP datagram. Note that these packets will not have ==== //depot/projects/gdb/sbin/reboot/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/sbin/reboot/Makefile,v 1.12 2002/11/04 17:39:54 gordon Exp $ +# $FreeBSD: src/sbin/reboot/Makefile,v 1.13 2004/03/22 00:52:27 obrien Exp $ PROG= reboot DPADD= ${LIBUTIL} @@ -10,6 +10,9 @@ .if exists(${.CURDIR}/boot_${MACHINE}.8) MLINKS+= boot_${MACHINE}.8 boot.8 .endif +.if ${MACHINE} == "amd64" +MLINKS+= boot_i386.8 boot.8 +.endif LINKS= ${BINDIR}/reboot ${BINDIR}/halt ${BINDIR}/reboot ${BINDIR}/fastboot \ ${BINDIR}/reboot ${BINDIR}/fasthalt ==== //depot/projects/gdb/share/man/man4/aac.4#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/aac.4,v 1.22 2003/11/11 08:40:43 scottl Exp $ +.\" $FreeBSD: src/share/man/man4/aac.4,v 1.23 2004/03/21 15:25:20 hrs Exp $ .Dd February 22, 2001 .Dt AAC 4 .Os @@ -50,9 +50,11 @@ .It Adaptec SCSI RAID 2410SA .It +Adaptec SCSI RAID 2810SA +.It Adaptec SCSI RAID 5400S .It -HP NetRAID 4M +Dell CERC SATA RAID 2 .It Dell PERC 2/Si .It @@ -61,6 +63,10 @@ Dell PERC 3/Si .It Dell PERC 3/Di +.It +Dell PERC 320/DC +.It +HP NetRAID 4M .Pp .El Access to RAID containers is available via the ==== //depot/projects/gdb/share/man/man5/passwd.5#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)passwd.5 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man5/passwd.5,v 1.40 2003/01/15 08:24:45 keramida Exp $ +.\" $FreeBSD: src/share/man/man5/passwd.5,v 1.41 2004/03/21 19:36:16 dannyboy Exp $ .\" .Dd January 16, 1999 .Dt PASSWD 5 @@ -79,7 +79,7 @@ .It gid User's login group id. .It class -User's general classification (unused). +User's login class. .It change Password change time. .It expire @@ -311,6 +311,7 @@ .Xr login 1 , .Xr passwd 1 , .Xr getpwent 3 , +.Xr login.conf 5 , .Xr netgroup 5 , .Xr adduser 8 , .Xr pwd_mkdb 8 , ==== //depot/projects/gdb/share/mk/bsd.cpu.mk#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.35 2004/03/14 01:29:05 trhodes Exp $ +# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.36 2004/03/21 04:57:24 marcel Exp $ # Set default CPU compile flags and baseline CPUTYPE for each arch. The # compile flags must support the minimum CPU type for each architecture but @@ -37,10 +37,11 @@ # Logic to set up correct gcc optimization flag. This must be included # after /etc/make.conf so it can react to the local value of CPUTYPE # defined therein. Consult: -# http://gcc.gnu.org/onlinedocs/gcc/i386-and-x86-64-Options.html # http://gcc.gnu.org/onlinedocs/gcc/DEC-Alpha-Options.html +# http://gcc.gnu.org/onlinedocs/gcc/IA-64-Options.html +# http://gcc.gnu.org/onlinedocs/gcc/RS-6000-and-PowerPC-Options.html # http://gcc.gnu.org/onlinedocs/gcc/SPARC-Options.html -# http://gcc.gnu.org/onlinedocs/gcc/RS-6000-and-PowerPC-Options.html +# http://gcc.gnu.org/onlinedocs/gcc/i386-and-x86-64-Options.html . if ${MACHINE_ARCH} == "i386" . if ${CPUTYPE} == "athlon-mp" || ${CPUTYPE} == "athlon-xp" || \ ==== //depot/projects/gdb/sys/compat/ndis/kern_ndis.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.43 2004/03/20 23:39:43 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.45 2004/03/22 18:34:37 wpaul Exp $"); #include #include @@ -150,7 +150,7 @@ case MOD_SHUTDOWN: /* stop kthreads */ ndis_destroy_kthreads(); - if (TAILQ_FIRST(&ndis_devhead) != NULL) { + if (TAILQ_FIRST(&ndis_devhead) == NULL) { /* Shut down subsystems */ ndis_libfini(); ntoskrnl_libfini(); @@ -268,14 +268,16 @@ ndis_tproc.np_q = &ndis_ttodo; ndis_tproc.np_state = NDIS_PSTATE_SLEEPING; error = kthread_create(ndis_runq, &ndis_tproc, - &ndis_tproc.np_p, RFHIGHPID, 0, "ndis taskqueue"); + &ndis_tproc.np_p, RFHIGHPID, + NDIS_KSTACK_PAGES, "ndis taskqueue"); } if (error == 0) { ndis_iproc.np_q = &ndis_itodo; ndis_iproc.np_state = NDIS_PSTATE_SLEEPING; error = kthread_create(ndis_runq, &ndis_iproc, - &ndis_iproc.np_p, RFHIGHPID, 0, "ndis swi"); + &ndis_iproc.np_p, RFHIGHPID, + NDIS_KSTACK_PAGES, "ndis swi"); } if (error) { ==== //depot/projects/gdb/sys/compat/ndis/ntoskrnl_var.h#5 (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/compat/ndis/ntoskrnl_var.h,v 1.10 2004/03/20 23:39:43 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.11 2004/03/22 00:41:41 wpaul Exp $ */ #ifndef _NTOSKRNL_VAR_H_ @@ -466,6 +466,13 @@ #define STATUS_WAIT_0 0x00000000 +/* + * FreeBSD's kernel stack is 2 pages in size by default. The + * Windows stack is larger, so we need to give our threads more + * stack pages. 4 should be enough, we use 8 just to extra safe. + */ +#define NDIS_KSTACK_PAGES 8 + extern image_patch_table ntoskrnl_functbl[]; extern struct mtx *ntoskrnl_dispatchlock; ==== //depot/projects/gdb/sys/compat/ndis/subr_ntoskrnl.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.29 2004/03/20 23:39:43 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.31 2004/03/22 22:46:22 wpaul Exp $"); #include #include @@ -86,6 +86,7 @@ int64_t *, wait_block *); static void ntoskrnl_wakeup(void *); static void ntoskrnl_timercall(void *); +static void ntoskrnl_timersched(void *); __stdcall static void ntoskrnl_writereg_ushort(uint16_t *, uint16_t); __stdcall static uint16_t ntoskrnl_readreg_ushort(uint16_t *); __stdcall static void ntoskrnl_writereg_ulong(uint32_t *, uint32_t); @@ -1586,7 +1587,7 @@ sprintf(tname, "windows kthread %d", ntoskrnl_kth); error = kthread_create(ntoskrnl_thrfunc, tc, &p, - RFHIGHPID, 0, tname); + RFHIGHPID, NDIS_KSTACK_PAGES, tname); *handle = p; ntoskrnl_kth++; @@ -1617,7 +1618,6 @@ ntoskrnl_kth--; - mtx_lock(&Giant); kthread_exit(0); return(0); /* notreached */ } @@ -1642,9 +1642,23 @@ kdb_enter("ntoskrnl_debugger(): breakpoint"); } +/* + * We run all timer callouts in the ndis swi thread to take + * advantage of its larger stack size. If we don't do this, + * the callout will run in the clock ithread context. + */ + +static void +ntoskrnl_timersched(arg) + void *arg; +{ + ndis_sched(ntoskrnl_timercall, arg, NDIS_SWI); + return; +} + static void ntoskrnl_timercall(arg) - void *arg; + void *arg; { ktimer *timer; __stdcall kdpc_func timerfunc; @@ -1667,7 +1681,7 @@ tv.tv_sec = 0; tv.tv_usec = timer->k_period * 1000; timer->k_handle = - timeout(ntoskrnl_timercall, timer, tvtohz(&tv)); + timeout(ntoskrnl_timersched, timer, tvtohz(&tv)); } if (dpc != NULL) { @@ -1745,7 +1759,7 @@ if (timer->k_handle.callout != NULL && callout_pending(timer->k_handle.callout)) { - untimeout(ntoskrnl_timercall, timer, timer->k_handle); + untimeout(ntoskrnl_timersched, timer, timer->k_handle); pending = TRUE; } else pending = FALSE; @@ -1770,7 +1784,7 @@ } } - timer->k_handle = timeout(ntoskrnl_timercall, timer, tvtohz(&tv)); + timer->k_handle = timeout(ntoskrnl_timersched, timer, tvtohz(&tv)); return(pending); } @@ -1799,7 +1813,7 @@ else pending = FALSE; - untimeout(ntoskrnl_timercall, timer, timer->k_handle); + untimeout(ntoskrnl_timersched, timer, timer->k_handle); return(pending); } ==== //depot/projects/gdb/sys/conf/files.i386#7 (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.479 2004/03/15 22:24:27 fjoe Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.481 2004/03/22 18:00:39 wpaul Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 22 19:15:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AD2216A4D1; Mon, 22 Mar 2004 19:15:06 -0800 (PST) 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 40C4116A4CE for ; Mon, 22 Mar 2004 19:15:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 39AEC43D4C for ; Mon, 22 Mar 2004 19:15:06 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2N3F6Ge050245 for ; Mon, 22 Mar 2004 19:15:06 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2N3F5ud050242 for perforce@freebsd.org; Mon, 22 Mar 2004 19:15:05 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Mon, 22 Mar 2004 19:15:05 -0800 (PST) Message-Id: <200403230315.i2N3F5ud050242@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 49563 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Mar 2004 03:15:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=49563 Change 49563 by marcel@marcel_nfs on 2004/03/22 19:14:06 Add td_tid to struct thread so that we can assign a thread ID to threads. This is needed by gdb. The kernel doesn't use thread IDs, so we need to assign them when we enter the debugger. Obviously you don't want to do that in the debugger, but I think that I'll end up wasting a lot of time trying to migrate the kernel to use thread IDs over process IDs. Affected files ... .. //depot/projects/gdb/sys/sys/proc.h#4 edit Differences ... ==== //depot/projects/gdb/sys/sys/proc.h#4 (text+ko) ==== @@ -274,6 +274,7 @@ int td_flags; /* (j) TDF_* flags. */ int td_inhibitors; /* (j) Why can not run. */ int td_pflags; /* (k) Private thread (TDP_*) flags. */ + int td_tid; /* XXX currently unused. */ struct kse *td_last_kse; /* (j) Previous value of td_kse. */ struct kse *td_kse; /* (j) Current KSE if running. */ int td_dupfd; /* (k) Ret value from fdopen. XXX */ From owner-p4-projects@FreeBSD.ORG Tue Mar 23 17:37:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4E9216A4D0; Tue, 23 Mar 2004 17:37:52 -0800 (PST) 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 9179116A4CE for ; Tue, 23 Mar 2004 17:37:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B2CB43D2D for ; Tue, 23 Mar 2004 17:37:52 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2O1bqGe091582 for ; Tue, 23 Mar 2004 17:37:52 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2O1bpIE091578 for perforce@freebsd.org; Tue, 23 Mar 2004 17:37:51 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Tue, 23 Mar 2004 17:37:51 -0800 (PST) Message-Id: <200403240137.i2O1bpIE091578@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 49603 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Mar 2004 01:37:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=49603 Change 49603 by marcel@marcel_nfs on 2004/03/23 17:36:54 I'm not going to bust my balls over this. Just assign the thread the same ID as the process for a fork(). This way most threads get an unique ID. The only threads that won't have an ID this way are those created for 1:1 or M:N threading support. I don't care about that while working on the fundamental threading support. Affected files ... .. //depot/projects/gdb/sys/kern/kern_fork.c#7 edit Differences ... ==== //depot/projects/gdb/sys/kern/kern_fork.c#7 (text+ko) ==== @@ -498,6 +498,7 @@ #undef RANGEOF td2->td_sigstk = td->td_sigstk; + td2->td_tid = p2->p_pid; /* Set up the thread as an active thread (as if runnable). */ ke2->ke_state = KES_THREAD; From owner-p4-projects@FreeBSD.ORG Tue Mar 23 18:07:29 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CC1D16A4D0; Tue, 23 Mar 2004 18:07:29 -0800 (PST) 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 115EB16A4CE for ; Tue, 23 Mar 2004 18:07:29 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5E8643D48 for ; Tue, 23 Mar 2004 18:07:28 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2O27SGe098580 for ; Tue, 23 Mar 2004 18:07:28 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2O27SNe098577 for perforce@freebsd.org; Tue, 23 Mar 2004 18:07:28 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Tue, 23 Mar 2004 18:07:28 -0800 (PST) Message-Id: <200403240207.i2O27SNe098577@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 49604 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Mar 2004 02:07:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=49604 Change 49604 by marcel@marcel_nfs on 2004/03/23 18:06:48 s/kdb_cur/kdb_dbbe/g This reduces confusion when the notion of current is used in the context of threads. Affected files ... .. //depot/projects/gdb/sys/kern/subr_kdb.c#7 edit .. //depot/projects/gdb/sys/sys/kdb.h#5 edit Differences ... ==== //depot/projects/gdb/sys/kern/subr_kdb.c#7 (text+ko) ==== @@ -35,7 +35,7 @@ #include int kdb_active = 0; -struct kdb_dbbe *kdb_cur = NULL; +struct kdb_dbbe *kdb_dbbe = NULL; KDB_BACKEND(null, NULL, NULL, NULL); SET_DECLARE(kdb_dbbe_set, struct kdb_dbbe); @@ -90,9 +90,9 @@ kdb_backtrace() { - if (kdb_cur != NULL && kdb_cur->dbbe_trace != NULL) { + if (kdb_dbbe != NULL && kdb_dbbe->dbbe_trace != NULL) { printf("KDB: stack backtrace:\n"); - kdb_cur->dbbe_trace(); + kdb_dbbe->dbbe_trace(); } } @@ -107,7 +107,7 @@ kdb_enter(const char *msg) { - if (kdb_cur != NULL) { + if (kdb_dbbe != NULL) { if (msg != NULL) printf("KDB: enter: %s\n", msg); breakpoint(); @@ -125,7 +125,7 @@ int cur_pri, pri; kdb_active = 0; - kdb_cur = NULL; + kdb_dbbe = NULL; cur_pri = -1; SET_FOREACH(iter, kdb_dbbe_set) { be = *iter; @@ -133,10 +133,10 @@ be->dbbe_active = (pri >= 0) ? 0 : -1; if (pri > cur_pri) { cur_pri = pri; - kdb_cur = be; + kdb_dbbe = be; } } - if (kdb_cur != NULL) { + if (kdb_dbbe != NULL) { printf("KDB: debugger backends:"); SET_FOREACH(iter, kdb_dbbe_set) { be = *iter; @@ -145,7 +145,7 @@ } printf("\n"); printf("KDB: current backend: %s\n", - kdb_cur->dbbe_name); + kdb_dbbe->dbbe_name); } } @@ -158,7 +158,7 @@ { int handled; - if (kdb_cur == NULL || kdb_cur->dbbe_trap == NULL) + if (kdb_dbbe == NULL || kdb_dbbe->dbbe_trap == NULL) return (0); critical_enter(); @@ -168,7 +168,7 @@ #endif kdb_active++; - handled = kdb_cur->dbbe_trap(type, code, tf); + handled = kdb_dbbe->dbbe_trap(type, code, tf); kdb_active--; #ifdef SMP ==== //depot/projects/gdb/sys/sys/kdb.h#5 (text+ko) ==== @@ -53,7 +53,7 @@ DATA_SET(kdb_dbbe_set, name##_dbbe) extern int kdb_active; /* Non-zero while in debugger. */ -extern struct kdb_dbbe *kdb_cur; /* Default debugger backend or NULL. */ +extern struct kdb_dbbe *kdb_dbbe; /* Default debugger backend or NULL. */ int kdb_alt_break(int, int *); void kdb_backtrace(void); From owner-p4-projects@FreeBSD.ORG Tue Mar 23 20:58:58 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AFC216A4D0; Tue, 23 Mar 2004 20:58:58 -0800 (PST) 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 39FCB16A4CE for ; Tue, 23 Mar 2004 20:58:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3090F43D45 for ; Tue, 23 Mar 2004 20:58:58 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2O4wvGe040751 for ; Tue, 23 Mar 2004 20:58:57 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2O4wvjA040748 for perforce@freebsd.org; Tue, 23 Mar 2004 20:58:57 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 23 Mar 2004 20:58:57 -0800 (PST) Message-Id: <200403240458.i2O4wvjA040748@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49607 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Mar 2004 04:58:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=49607 Change 49607 by peter@peter_wannabe on 2004/03/23 20:58:47 AMD_Features doesn't depend on the id string anymore. Its now common on both main platforms, which are already covered in the outer brand string strcmp. I doubt there will be a CyrixInstead booting this kernel. Fix a bug in the AMD_Features reporting. Not all of cpu_features overlap. (This is part 1, there needs to be a common bits mask instead). Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#22 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#22 (text+ko) ==== @@ -227,10 +227,8 @@ printf("\n Hyperthreading: %d logical CPUs", (cpu_procinfo & CPUID_HTT_CORES) >> 16); } - if (strcmp(cpu_vendor, "AuthenticAMD") == 0 && - cpu_exthigh >= 0x80000001) + if (cpu_exthigh >= 0x80000001) print_AMD_features(); - } else if (strcmp(cpu_vendor, "CyrixInstead") == 0) { } /* Avoid ugly blank lines: only print newline when we have to. */ if (*cpu_vendor || cpu_id) @@ -339,7 +337,7 @@ * http://www.amd.com/products/cpg/athlon/techdocs/pdf/20734.pdf */ do_cpuid(0x80000001, regs); - printf("\n AMD Features=0x%b", regs[3] &~ cpu_feature, + printf("\n AMD Features=0x%b", regs[3], "\020" /* in hex */ "\001FPU" /* Integral FPU */ "\002VME" /* Extended VM86 mode support */ From owner-p4-projects@FreeBSD.ORG Tue Mar 23 21:33:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E7B5A16A4D0; Tue, 23 Mar 2004 21:33:40 -0800 (PST) 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 B67FA16A4CE for ; Tue, 23 Mar 2004 21:33:40 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A9C9643D31 for ; Tue, 23 Mar 2004 21:33:40 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2O5XeGe049509 for ; Tue, 23 Mar 2004 21:33:40 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2O5XeMV049506 for perforce@freebsd.org; Tue, 23 Mar 2004 21:33:40 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Tue, 23 Mar 2004 21:33:40 -0800 (PST) Message-Id: <200403240533.i2O5XeMV049506@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 49608 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Mar 2004 05:33:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=49608 Change 49608 by marcel@marcel_nfs on 2004/03/23 21:32:58 Make "info thread" work (basicly). Much has changed: o Register context is now based on struct thread, not on struct trapframe. A global variable, kdb_thread, is used to hold the current thread. This means that we don't pass struct trapframe around anymore. o A start has been made to unify the MD functions for the gdb backend and the ddb backend. Common MD functions have been implemented as inline functions in o Move the prototypes for the MD functions for the gdb backend to where they can be implemented as inlines. Only i386 and ia64 have been changed for now. Affected files ... .. //depot/projects/gdb/sys/ddb/db_main.c#2 edit .. //depot/projects/gdb/sys/gdb/gdb.h#7 edit .. //depot/projects/gdb/sys/gdb/gdb_int.h#4 edit .. //depot/projects/gdb/sys/gdb/gdb_main.c#8 edit .. //depot/projects/gdb/sys/gdb/gdb_packet.c#4 edit .. //depot/projects/gdb/sys/i386/i386/gdb_machdep.c#4 edit .. //depot/projects/gdb/sys/i386/include/gdb_machdep.h#3 edit .. //depot/projects/gdb/sys/i386/include/kdb.h#1 add .. //depot/projects/gdb/sys/ia64/ia64/gdb_machdep.c#4 edit .. //depot/projects/gdb/sys/ia64/include/gdb_machdep.h#3 edit .. //depot/projects/gdb/sys/ia64/include/kdb.h#1 add .. //depot/projects/gdb/sys/kern/subr_kdb.c#8 edit .. //depot/projects/gdb/sys/sys/kdb.h#6 edit Differences ... ==== //depot/projects/gdb/sys/ddb/db_main.c#2 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include +#include #include #include @@ -117,7 +118,7 @@ } static int -db_trap(int type, int code, struct trapframe *tf) +db_trap(int type, int code) { boolean_t bkpt, watchpt; @@ -128,10 +129,8 @@ if (cnunavailable()) return (0); - db_cpu_trap(type, code, tf); + ddb_regs = *kdb_thread->td_frame; - ddb_regs = *tf; - bkpt = IS_BREAKPOINT_TRAP(type, code); watchpt = IS_WATCHPOINT_TRAP(type, code); @@ -154,7 +153,7 @@ db_restart_at_pc(watchpt); - *tf = ddb_regs; + *kdb_thread->td_frame = ddb_regs; return (1); } ==== //depot/projects/gdb/sys/gdb/gdb.h#7 (text+ko) ==== @@ -59,14 +59,4 @@ }; \ DATA_SET(gdb_dbgport_set, name##_gdb_dbgport) -struct trapframe; - -uintmax_t gdb_cpu_getreg(int, struct trapframe *); -ssize_t gdb_cpu_getregs(struct trapframe *, void *, size_t); -int gdb_cpu_regsz(int); -void gdb_cpu_setreg(int, struct trapframe *, uintmax_t); -int gdb_cpu_signal(int, int); -void gdb_cpu_singlestep(int, struct trapframe *); -void gdb_cpu_trap(int, int, struct trapframe *); - #endif /* !_GDB_GDB_H_ */ ==== //depot/projects/gdb/sys/gdb/gdb_int.h#4 (text+ko) ==== @@ -36,6 +36,7 @@ extern char *gdb_txp; int gdb_rx_begin(void); +int gdb_rx_equal(const char *); int gdb_rx_varhex(uintmax_t *); static __inline int @@ -54,8 +55,8 @@ void gdb_tx_begin(char); int gdb_tx_end(void); int gdb_tx_memory(const unsigned char *, size_t); -void gdb_tx_reg(int, struct trapframe *); -int gdb_tx_regs(struct trapframe *); +void gdb_tx_reg(int); +int gdb_tx_regs(void); static __inline void gdb_tx_char(char c) @@ -84,6 +85,14 @@ return (gdb_tx_end()); } +static __inline int +gdb_tx_ok(void) +{ + gdb_tx_begin('O'); + gdb_tx_char('K'); + return (gdb_tx_end()); +} + static __inline void gdb_tx_str(const char *s) { ==== //depot/projects/gdb/sys/gdb/gdb_main.c#8 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include +#include #include #include @@ -89,36 +90,29 @@ } static int -gdb_trap(int type, int code, struct trapframe *tf) +gdb_trap(int type, int code) { - struct proc *p; uintmax_t addr, size; - int tid_cont, tid_gen; + struct proc *thr_iter; - p = curthread->td_proc; - tid_cont = -1; - tid_gen = (p != NULL) ? p->p_pid : 0; - - /* Give MD code a change to set things up. */ - gdb_cpu_trap(type, code, tf); - /* * Send a T packet. We currently do not support watchpoints (the * awatch, rwatch or watch elements). */ gdb_tx_begin('T'); gdb_tx_hex(gdb_cpu_signal(type, code), 2); - gdb_tx_reg(GDB_REG_PC, tf); + gdb_tx_reg(GDB_REG_PC); gdb_tx_char(';'); - gdb_tx_reg(GDB_REG_FP, tf); + gdb_tx_reg(GDB_REG_FP); gdb_tx_char(';'); - gdb_tx_reg(GDB_REG_SP, tf); + gdb_tx_reg(GDB_REG_SP); gdb_tx_char(';'); gdb_tx_str("thread:"); - gdb_tx_varhex(tid_gen); + gdb_tx_varhex(kdb_thread->td_tid); gdb_tx_char(';'); gdb_tx_end(); /* XXX check error condition. */ + thr_iter = NULL; while (gdb_rx_begin() == 0) { printf("GDB: got '%s'\n", gdb_rxp); switch (gdb_rx_char()) { @@ -129,15 +123,27 @@ break; case 'c': /* continue */ if (!gdb_rx_varhex(&addr)) - gdb_cpu_setreg(GDB_REG_PC, tf, addr); - gdb_cpu_singlestep(0, tf); + gdb_cpu_setreg(GDB_REG_PC, addr); + kdb_cpu_clear_singlestep(); return (1); case 'g': - gdb_tx_regs(tf); + gdb_tx_regs(); break; case 'G': gdb_tx_err(0); break; + case 'H': { + intmax_t tid; + gdb_rx_char(); + gdb_rx_varhex(&tid); + if (tid > 0) + kdb_set_thread(tid); + gdb_tx_ok(); + break; + } + case 'k': + kdb_cpu_clear_singlestep(); + return (1); case 'm': if (gdb_rx_varhex(&addr) || gdb_rx_char() != ',' || gdb_rx_varhex(&size)) @@ -148,10 +154,33 @@ case 'M': gdb_tx_err(0); break; + case 'q': + if (gdb_rx_equal("fThreadInfo")) { + thr_iter = LIST_FIRST(&allproc); + gdb_tx_begin('m'); + gdb_tx_hex(thr_iter->p_pid, 8); + gdb_tx_end(); + } else if (gdb_rx_equal("sThreadInfo")) { + if (thr_iter == NULL) { + gdb_tx_err(ENXIO); + break; + } + thr_iter = LIST_NEXT(thr_iter, p_list); + if (thr_iter != NULL) { + gdb_tx_begin('m'); + gdb_tx_hex(thr_iter->p_pid, 8); + gdb_tx_end(); + } else { + gdb_tx_begin('l'); + gdb_tx_end(); + } + } else + gdb_tx_empty(); + break; case 's': /* single step */ if (!gdb_rx_varhex(&addr)) - gdb_cpu_setreg(GDB_REG_PC, tf, addr); - gdb_cpu_singlestep(1, tf); + gdb_cpu_setreg(GDB_REG_PC, addr); + kdb_cpu_set_singlestep(); return (1); case -1: /* Empty command. Treat as unknown command. */ ==== //depot/projects/gdb/sys/gdb/gdb_packet.c#4 (text+ko) ==== @@ -98,6 +98,19 @@ } int +gdb_rx_equal(const char *str) +{ + int len; + + len = strlen(str); + if (len > gdb_rxsz || strncmp(str, gdb_rxp, len) != 0) + return (0); + gdb_rxp += len; + gdb_rxsz -= len; + return (1); +} + +int gdb_rx_varhex(uintmax_t *vp) { uintmax_t v; @@ -142,6 +155,34 @@ } int +gdb_tx_end(void) +{ + const char *p; + unsigned char c, cksum; + + do { + gdb_cur->gdb_putc('$'); + + cksum = 0; + p = gdb_txbuf; + while (p < gdb_txp) { + gdb_cur->gdb_putc(*p); + cksum += *p++; + } + + gdb_cur->gdb_putc('#'); + c = cksum >> 4; + gdb_cur->gdb_putc(N2C(c)); + c = cksum & 0x0f; + gdb_cur->gdb_putc(N2C(c)); + + c = gdb_cur->gdb_getc(); + } while (c != '+'); + + return (0); +} + +int gdb_tx_memory(const unsigned char *addr, size_t size) { @@ -159,49 +200,21 @@ } void -gdb_tx_reg(int regnum, struct trapframe *tf) +gdb_tx_reg(int regnum) { gdb_tx_varhex(regnum); gdb_tx_char(':'); - gdb_tx_hex(gdb_cpu_getreg(regnum, tf), gdb_cpu_regsz(regnum) << 1); + gdb_tx_hex(gdb_cpu_getreg(regnum), gdb_cpu_regsz(regnum) << 1); } int -gdb_tx_regs(struct trapframe *tf) +gdb_tx_regs(void) { ssize_t regsz; - regsz = gdb_cpu_getregs(tf, gdb_rxbuf, sizeof(gdb_rxbuf)); + regsz = gdb_cpu_getregs(gdb_rxbuf, sizeof(gdb_rxbuf)); if (regsz < 0) return (gdb_tx_err(ENOSPC)); return (gdb_tx_memory(gdb_rxbuf, regsz)); } - -int -gdb_tx_end(void) -{ - const char *p; - unsigned char c, cksum; - - do { - gdb_cur->gdb_putc('$'); - - cksum = 0; - p = gdb_txbuf; - while (p < gdb_txp) { - gdb_cur->gdb_putc(*p); - cksum += *p++; - } - - gdb_cur->gdb_putc('#'); - c = cksum >> 4; - gdb_cur->gdb_putc(N2C(c)); - c = cksum & 0x0f; - gdb_cur->gdb_putc(N2C(c)); - - c = gdb_cur->gdb_getc(); - } while (c != '+'); - - return (0); -} ==== //depot/projects/gdb/sys/i386/i386/gdb_machdep.c#4 (text+ko) ==== @@ -29,7 +29,9 @@ #include #include +#include #include +#include #include #include @@ -40,20 +42,23 @@ #include -uintmax_t -gdb_cpu_getreg(int regnum, struct trapframe *tf) +register_t +gdb_cpu_getreg(int regnum) { + struct trapframe *tf = kdb_thread->td_frame; + switch (regnum) { - case GDB_REG_FP: return ((unsigned int)tf->tf_ebp); - case GDB_REG_PC: return ((unsigned int)tf->tf_eip); - case GDB_REG_SP: return ((unsigned int)tf->tf_esp); + case GDB_REG_FP: return (tf->tf_ebp); + case GDB_REG_PC: return (tf->tf_eip); + case GDB_REG_SP: return (tf->tf_esp); } return (0); } ssize_t -gdb_cpu_getregs(struct trapframe *tf, void *buf, size_t bufsz) +gdb_cpu_getregs(void *buf, size_t bufsz) { + struct trapframe *tf = kdb_thread->td_frame; struct reg *r = buf; if (sizeof(*r) > bufsz) @@ -77,15 +82,11 @@ return (sizeof(*r)); } -int -gdb_cpu_regsz(int regnum) +void +gdb_cpu_setreg(int regnum, register_t val) { - return (4); /* XXX not really. */ -} + struct trapframe *tf = kdb_thread->td_frame; -void -gdb_cpu_setreg(int regnum, struct trapframe *tf, uintmax_t val) -{ switch (regnum) { case GDB_REG_FP: tf->tf_ebp = val; break; case GDB_REG_PC: tf->tf_eip = val; break; @@ -116,15 +117,3 @@ } return (SIGEMT); } - -void -gdb_cpu_singlestep(int on, struct trapframe *tf) -{ - tf->tf_eflags &= ~PSL_T; - tf->tf_eflags |= (on) ? PSL_T : 0; -} - -void -gdb_cpu_trap(int type, int code, struct trapframe *tf) -{ -} ==== //depot/projects/gdb/sys/i386/include/gdb_machdep.h#3 (text+ko) ==== @@ -35,4 +35,15 @@ #define GDB_REG_PC 8 #define GDB_REG_SP 4 +static __inline int +gdb_cpu_regsz(int regnum) +{ + return (4); /* XXX not really. */ +} + +register_t gdb_cpu_getreg(int); +ssize_t gdb_cpu_getregs(void *, size_t); +void gdb_cpu_setreg(int, register_t); +int gdb_cpu_signal(int, int); + #endif /* !_MACHINE_GDB_MACHDEP_H_ */ ==== //depot/projects/gdb/sys/ia64/ia64/gdb_machdep.c#4 (text+ko) ==== @@ -29,7 +29,9 @@ #include #include +#include #include +#include #include #include @@ -38,9 +40,11 @@ #include -uintmax_t -gdb_cpu_getreg(int regnum, struct trapframe *tf) +register_t +gdb_cpu_getreg(int regnum) { + struct trapframe *tf = kdb_thread->td_frame; + switch (regnum) { case GDB_REG_FP: return (tf->tf_special.bspstore + tf->tf_special.ndirty); @@ -53,8 +57,9 @@ } ssize_t -gdb_cpu_getregs(struct trapframe *tf, void *buf, size_t bufsz) +gdb_cpu_getregs(void *buf, size_t bufsz) { + struct trapframe *tf = kdb_thread->td_frame; struct reg *r = buf; if (sizeof(*r) > bufsz) @@ -65,37 +70,13 @@ return (sizeof(*r)); } -int -gdb_cpu_regsz(int regnum) +void +gdb_cpu_setreg(int regnum, register_t val) { - return (8); /* XXX not really. */ -} -void -gdb_cpu_setreg(int regnum, struct trapframe *tf, uintmax_t val) -{ switch (regnum) { case GDB_REG_FP: break; case GDB_REG_PC: break; case GDB_REG_SP: break; } } - -int -gdb_cpu_signal(int vector, int dummy) -{ - return (vector); -} - -void -gdb_cpu_singlestep(int on, struct trapframe *tf) -{ -} - -void -gdb_cpu_trap(int vector, int dummy, struct trapframe *tf) -{ - __asm __volatile("flushrs;;"); - if (vector == IA64_VEC_BREAK && tf->tf_special.ifa == IA64_FIXED_BREAK) - tf->tf_special.psr += IA64_PSR_RI_1; -} ==== //depot/projects/gdb/sys/ia64/include/gdb_machdep.h#3 (text+ko) ==== @@ -35,4 +35,20 @@ #define GDB_REG_PC 331 #define GDB_REG_SP 12 +static __inline int +gdb_cpu_regsz(int regnum) +{ + return (8); /* XXX not really. */ +} + +static __inline int +gdb_cpu_signal(int vector, int _) +{ + return (vector); +} + +register_t gdb_cpu_getreg(int); +ssize_t gdb_cpu_getregs(void *, size_t); +void gdb_cpu_setreg(int, register_t); + #endif /* !_MACHINE_GDB_MACHDEP_H_ */ ==== //depot/projects/gdb/sys/kern/subr_kdb.c#8 (text+ko) ==== @@ -32,10 +32,14 @@ #include #include #include +#include #include +#include + int kdb_active = 0; struct kdb_dbbe *kdb_dbbe = NULL; +struct thread *kdb_thread = NULL; KDB_BACKEND(null, NULL, NULL, NULL); SET_DECLARE(kdb_dbbe_set, struct kdb_dbbe); @@ -150,7 +154,24 @@ } /* - * + * Switch the current thread. + */ + +int +kdb_set_thread(pid_t tid) +{ + struct proc *p; + + p = LIST_FIRST(&allproc); + while (p != NULL && p->p_pid != tid) + p = LIST_NEXT(p, p_list); + if (p != NULL) + kdb_thread = FIRST_THREAD_IN_PROC(p); + return ((p != NULL) ? 1 : 0); +} + +/* + * Enter the debugger due to a trap. */ int @@ -163,18 +184,25 @@ critical_enter(); + kdb_active++; + kdb_thread = curthread; + kdb_thread->td_frame = tf; + #ifdef SMP stop_cpus(PCPU_GET(other_cpus)); #endif - kdb_active++; - handled = kdb_dbbe->dbbe_trap(type, code, tf); - kdb_active--; + /* Let MD code do its thing first... */ + kdb_cpu_trap(type, code); + + handled = kdb_dbbe->dbbe_trap(type, code); #ifdef SMP restart_cpus(stopped_cpus); #endif + kdb_active--; + critical_exit(); return (handled); ==== //depot/projects/gdb/sys/sys/kdb.h#6 (text+ko) ==== @@ -29,11 +29,9 @@ #ifndef _SYS_KDB_H_ #define _SYS_KDB_H_ -struct trapframe; - typedef int dbbe_init_f(void); typedef void dbbe_trace_f(void); -typedef int dbbe_trap_f(int, int, struct trapframe *); +typedef int dbbe_trap_f(int, int); struct kdb_dbbe { const char *dbbe_name; @@ -52,13 +50,18 @@ }; \ DATA_SET(kdb_dbbe_set, name##_dbbe) +struct thread; +struct trapframe; + extern int kdb_active; /* Non-zero while in debugger. */ extern struct kdb_dbbe *kdb_dbbe; /* Default debugger backend or NULL. */ +extern struct thread *kdb_thread; /* Current thread. */ int kdb_alt_break(int, int *); void kdb_backtrace(void); void kdb_enter(const char *); void kdb_init(void); +int kdb_set_thread(pid_t); int kdb_trap(int, int, struct trapframe *); #endif /* !_SYS_KDB_H_ */ From owner-p4-projects@FreeBSD.ORG Tue Mar 23 23:02:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAA8016A4D0; Tue, 23 Mar 2004 23:02:32 -0800 (PST) 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 8AA2716A4CE for ; Tue, 23 Mar 2004 23:02:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 81A2443D46 for ; Tue, 23 Mar 2004 23:02:32 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2O72WGe068419 for ; Tue, 23 Mar 2004 23:02:32 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2O72V03068407 for perforce@freebsd.org; Tue, 23 Mar 2004 23:02:31 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 23 Mar 2004 23:02:31 -0800 (PST) Message-Id: <200403240702.i2O72V03068407@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49612 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Mar 2004 07:02:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=49612 Change 49612 by peter@peter_overcee on 2004/03/23 23:02:03 Tidy up some more loose ends. Make libstdc++ build ok by actually passing the correct args in. Initial pass at tuning the 32 bit code for the known minimum cpu type. Affected files ... .. //depot/projects/hammer/build32.sh#6 edit Differences ... ==== //depot/projects/hammer/build32.sh#6 (text+kox) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# $P4: //depot/projects/hammer/build32.sh#5 $ +# $P4: //depot/projects/hammer/build32.sh#6 $ # # This script is for running on a self-hosted amd64 machine, with an up-to-date # world and toolchain etc. ie: the installed world is assumed to match the sources. @@ -20,28 +20,32 @@ chflags -R noschg /tmp/i386 rm -rf /tmp/i386 +CCARGS="-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32" +CXXARGS="-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I/tmp/i386/root/usr/include/c++/3.3 -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32" + # and a place to put the alternate include tree into. mkdir -p /tmp/i386/root -make MAKEOBJDIRPREFIX=/tmp/i386 DESTDIR=/tmp/i386/root MACHINE_ARCH=i386 hierarchy +make -s MAKEOBJDIRPREFIX=/tmp/i386 DESTDIR=/tmp/i386/root MACHINE_ARCH=i386 hierarchy # Now build includes -make MAKEOBJDIRPREFIX=/tmp/i386 DESTDIR=/tmp/i386/root MACHINE_ARCH=i386 obj -make MAKEOBJDIRPREFIX=/tmp/i386 DESTDIR=/tmp/i386/root MACHINE_ARCH=i386 includes +make -s MAKEOBJDIRPREFIX=/tmp/i386 DESTDIR=/tmp/i386/root MACHINE_ARCH=i386 obj +make -s MAKEOBJDIRPREFIX=/tmp/i386 DESTDIR=/tmp/i386/root MACHINE_ARCH=i386 includes # libncurses needs a build-tools pass first. I wish build-tools was a recursive target. -(cd lib/libncurses; make MAKEOBJDIRPREFIX=/tmp/i386 build-tools) +(cd lib/libncurses; make -s MAKEOBJDIRPREFIX=/tmp/i386 build-tools) -# Now the libraries. This doesn't work for bind, gnuregex and stdc++ yet. hence -k -make -DNOMAN -DNODOC -DNOINFO MAKEOBJDIRPREFIX=/tmp/i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 MACHINE_ARCH=i386 CC="cc -m32 -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32" CXX="c++ -m32 -I/tmp/i386/root/usr/include/c++/3.3 -L/usr/lib32 -B/usr/lib32" LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" -k libraries +# Now the libraries. This doesn't work for gnuregex yet. hence -k. +# libbind is just an internal target, ignore it. +make -s -DNO_BIND -DNOMAN -DNODOC -DNOINFO MAKEOBJDIRPREFIX=/tmp/i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 MACHINE_ARCH=i386 CC="cc $CCARGS" CXX="c++ $CXXARGS" LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" -k libraries -# bind isn't a problem, its an internal no-install lib, so let it fail. -# libstdc++ is a curious one. it looks like "c++ -m32" doesn't work. -# Hack to fix gnuregex which does evil hacks to the -I paths. -(cd gnu/lib/libregex; make -DNOMAN -DNODOC -DNOINFO MAKEOBJDIRPREFIX=/tmp/i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 MACHINE_ARCH=i386 CC="cc -m32 -I/tmp/i386/root/usr/include/gnu -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32" CXX="c++ -m32 -I/tmp/i386/root/usr/include/c++/3.3 -L/usr/lib32 -B/usr/lib32" LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" all install) +# Hack to fix gnuregex which does hacks to the -I path based on $DESTDIR. But, we cannot +# use DESTDIR during the libraries target, because we're just using alternate includes, not +# an alternate install directory. +(cd gnu/lib/libregex; make -s -DNOMAN -DNODOC -DNOINFO MAKEOBJDIRPREFIX=/tmp/i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 MACHINE_ARCH=i386 CC="cc -I/tmp/i386/root/usr/include/gnu $CCARGS" CXX="c++ $CXXARGS" LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" all install) # and now that we have enough libraries, build ld-elf32.so.1 cd libexec/rtld-elf -make -DNOMAN -DNODOC -DNOINFO PROG=ld-elf32.so.1 MAKEOBJDIRPREFIX=/tmp/i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 MACHINE_ARCH=i386 CC="cc -m32 -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32 -DCOMPAT_32BIT" LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" obj -make -DNOMAN -DNODOC -DNOINFO PROG=ld-elf32.so.1 MAKEOBJDIRPREFIX=/tmp/i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 MACHINE_ARCH=i386 CC="cc -m32 -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32 -DCOMPAT_32BIT" LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" depend -make -DNOMAN -DNODOC -DNOINFO PROG=ld-elf32.so.1 MAKEOBJDIRPREFIX=/tmp/i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 MACHINE_ARCH=i386 CC="cc -m32 -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32 -DCOMPAT_32BIT" LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" -make -DNOMAN -DNODOC -DNOINFO PROG=ld-elf32.so.1 MAKEOBJDIRPREFIX=/tmp/i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 MACHINE_ARCH=i386 CC="cc -m32 -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32 -DCOMPAT_32BIT" LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" install +make -s -DNOMAN -DNODOC -DNOINFO PROG=ld-elf32.so.1 MAKEOBJDIRPREFIX=/tmp/i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 MACHINE_ARCH=i386 CC="cc $CCARGS -DCOMPAT_32BIT" LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" obj +make -s -DNOMAN -DNODOC -DNOINFO PROG=ld-elf32.so.1 MAKEOBJDIRPREFIX=/tmp/i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 MACHINE_ARCH=i386 CC="cc $CCARGS -DCOMPAT_32BIT" LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" depend +make -s -DNOMAN -DNODOC -DNOINFO PROG=ld-elf32.so.1 MAKEOBJDIRPREFIX=/tmp/i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 MACHINE_ARCH=i386 CC="cc $CCARGS -DCOMPAT_32BIT" LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" +make -s -DNOMAN -DNODOC -DNOINFO PROG=ld-elf32.so.1 MAKEOBJDIRPREFIX=/tmp/i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 MACHINE_ARCH=i386 CC="cc $CCARGS -DCOMPAT_32BIT" LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" install From owner-p4-projects@FreeBSD.ORG Tue Mar 23 23:21:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94CB316A4D0; Tue, 23 Mar 2004 23:21:56 -0800 (PST) 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 682C516A4CE for ; Tue, 23 Mar 2004 23:21:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6070C43D49 for ; Tue, 23 Mar 2004 23:21:56 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2O7LuGe073307 for ; Tue, 23 Mar 2004 23:21:56 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2O7Lu8B073298 for perforce@freebsd.org; Tue, 23 Mar 2004 23:21:56 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Tue, 23 Mar 2004 23:21:56 -0800 (PST) Message-Id: <200403240721.i2O7Lu8B073298@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 49613 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Mar 2004 07:21:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=49613 Change 49613 by marcel@marcel_nfs on 2004/03/23 23:21:00 Implement run-length encoding. For platforms with a large amount of register data (like ia64), this can be a major booster. On ia64 it will be, because the high FP registers (96 registers, each 16 bytes) are most of the time zeroes. Instead of pumping 3072 characters over the link, we can compress that to 96 characters in case they are all zero. Affected files ... .. //depot/projects/gdb/sys/gdb/gdb_packet.c#5 edit Differences ... ==== //depot/projects/gdb/sys/gdb/gdb_packet.c#5 (text+ko) ==== @@ -158,6 +158,7 @@ gdb_tx_end(void) { const char *p; + int runlen; unsigned char c, cksum; do { @@ -166,8 +167,51 @@ cksum = 0; p = gdb_txbuf; while (p < gdb_txp) { - gdb_cur->gdb_putc(*p); - cksum += *p++; + /* Send a character and start run-length encoding. */ + c = *p++; + gdb_cur->gdb_putc(c); + cksum += c; + runlen = 0; + /* Determine run-length and update checksum. */ + while (p < gdb_txp && *p == c) { + runlen++; + p++; + } + /* Emit the run-length encoded string. */ + while (runlen >= 97) { + gdb_cur->gdb_putc('*'); + cksum += '*'; + gdb_cur->gdb_putc(97+29); + cksum += 97+29; + runlen -= 97; + if (runlen > 0) { + gdb_cur->gdb_putc(c); + cksum += c; + runlen--; + } + } + if (runlen == 1) { + gdb_cur->gdb_putc(c); + cksum += c; + runlen--; + } + if (runlen == 0) + continue; + /* Don't emit '$', '#', '+' or '-'. */ + if (runlen == 7) { + gdb_cur->gdb_putc(c); + cksum += c; + runlen--; + } + if (runlen == 6 || runlen == 14 || runlen == 16) { + gdb_cur->gdb_putc(c); + cksum += c; + runlen--; + } + gdb_cur->gdb_putc('*'); + cksum += '*'; + gdb_cur->gdb_putc(runlen+29); + cksum += runlen+29; } gdb_cur->gdb_putc('#'); From owner-p4-projects@FreeBSD.ORG Wed Mar 24 11:41:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD2ED16A4D6; Wed, 24 Mar 2004 11:41:17 -0800 (PST) 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 50D5416A4F2 for ; Wed, 24 Mar 2004 11:41:15 -0800 (PST) Received: from mail4.speakeasy.net (mail4.speakeasy.net [216.254.0.204]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C91743D2D for ; Wed, 24 Mar 2004 11:41:15 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 1004 invoked from network); 24 Mar 2004 19:41:14 -0000 Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) encrypted SMTP for ; 24 Mar 2004 19:41:14 -0000 Received: from 10.50.40.205 (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.10/8.12.10) with ESMTP id i2OJeoDG006146; Wed, 24 Mar 2004 14:41:01 -0500 (EST) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: Marcel Moolenaar Date: Wed, 24 Mar 2004 12:35:19 -0500 User-Agent: KMail/1.6 References: <200403240533.i2O5XeMV049506@repoman.freebsd.org> In-Reply-To: <200403240533.i2O5XeMV049506@repoman.freebsd.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200403241235.19548.jhb@FreeBSD.org> X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on server.baldwin.cx cc: Perforce Change Reviews Subject: Re: PERFORCE change 49608 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Mar 2004 19:41:18 -0000 On Wednesday 24 March 2004 12:33 am, Marcel Moolenaar wrote: > http://perforce.freebsd.org/chv.cgi?CH=49608 > > Change 49608 by marcel@marcel_nfs on 2004/03/23 21:32:58 > > Make "info thread" work (basicly). Much has changed: > > o Register context is now based on struct thread, not on struct > trapframe. A global variable, kdb_thread, is used to hold the > current thread. This means that we don't pass struct trapframe > around anymore. > o A start has been made to unify the MD functions for the gdb > backend and the ddb backend. Common MD functions have been > implemented as inline functions in > o Move the prototypes for the MD functions for the gdb backend > to where they can be implemented as > inlines. > > Only i386 and ia64 have been changed for now. This stuff looks really great, btw. I can't wait to see this hit the main tree. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Wed Mar 24 16:04:29 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5051616A4D0; Wed, 24 Mar 2004 16:04:29 -0800 (PST) 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 E15A216A4CE for ; Wed, 24 Mar 2004 16:04:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D45D843D2F for ; Wed, 24 Mar 2004 16:04:28 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2P04SGe021927 for ; Wed, 24 Mar 2004 16:04:28 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2P04Q3t021924 for perforce@freebsd.org; Wed, 24 Mar 2004 16:04:26 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 24 Mar 2004 16:04:26 -0800 (PST) Message-Id: <200403250004.i2P04Q3t021924@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49643 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Mar 2004 00:04:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=49643 Change 49643 by peter@peter_daintree on 2004/03/24 16:03:39 IFC @49641 Affected files ... .. //depot/projects/hammer/MAINTAINERS#16 integrate .. //depot/projects/hammer/Makefile#17 integrate .. //depot/projects/hammer/Makefile.inc1#47 integrate .. //depot/projects/hammer/UPDATING#36 integrate .. //depot/projects/hammer/bin/cat/cat.1#2 integrate .. //depot/projects/hammer/bin/ls/ls.1#10 integrate .. //depot/projects/hammer/bin/mv/mv.c#4 integrate .. //depot/projects/hammer/bin/ps/ps.1#11 integrate .. //depot/projects/hammer/bin/rmail/Makefile#4 integrate .. //depot/projects/hammer/bin/rmdir/rmdir.1#2 integrate .. //depot/projects/hammer/bin/rmdir/rmdir.c#3 integrate .. //depot/projects/hammer/contrib/amd/scripts/amd.conf.5#4 integrate .. //depot/projects/hammer/etc/Makefile#25 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#23 integrate .. //depot/projects/hammer/etc/mtree/BSD.local.dist#17 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#21 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#20 integrate .. //depot/projects/hammer/etc/rc.d/cleanvar#6 integrate .. //depot/projects/hammer/etc/rc.d/cleartmp#8 integrate .. //depot/projects/hammer/etc/rc.d/diskless#10 delete .. //depot/projects/hammer/etc/rc.d/hostname#5 integrate .. //depot/projects/hammer/etc/rc.d/mixer#2 integrate .. //depot/projects/hammer/etc/rc.d/ntpdate#6 integrate .. //depot/projects/hammer/etc/rc.d/pf#1 branch .. //depot/projects/hammer/etc/rc.d/resolv#1 branch .. //depot/projects/hammer/etc/rc.d/tmp#1 branch .. //depot/projects/hammer/etc/rc.d/var#1 branch .. //depot/projects/hammer/etc/rc.subr#14 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#19 integrate .. //depot/projects/hammer/gnu/lib/libregex/Makefile#4 integrate .. //depot/projects/hammer/gnu/lib/libregex/regex.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_platform.h#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_util.c#4 integrate .. //depot/projects/hammer/lib/libarchive/tar.5#3 integrate .. //depot/projects/hammer/lib/libc/gen/arc4random.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/vis.3#4 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#62 integrate .. //depot/projects/hammer/release/picobsd/README.html#2 delete .. //depot/projects/hammer/release/picobsd/bridge/crunch.conf#4 integrate .. //depot/projects/hammer/release/picobsd/build/picobsd#3 integrate .. //depot/projects/hammer/release/picobsd/dial/PICOBSD#2 delete .. //depot/projects/hammer/release/picobsd/dial/PICOBSD.hints#2 delete .. //depot/projects/hammer/release/picobsd/dial/config#3 delete .. //depot/projects/hammer/release/picobsd/dial/crunch.conf#3 delete .. //depot/projects/hammer/release/picobsd/dial/floppy.tree.exclude#2 delete .. //depot/projects/hammer/release/picobsd/dial/floppy.tree/etc/master.passwd#2 delete .. //depot/projects/hammer/release/picobsd/dial/floppy.tree/etc/mfs.rc#2 delete .. //depot/projects/hammer/release/picobsd/dial/floppy.tree/etc/ppp/ppp.conf#2 delete .. //depot/projects/hammer/release/picobsd/dial/floppy.tree/etc/ppp/ppp.conf.template#2 delete .. //depot/projects/hammer/release/picobsd/dial/floppy.tree/etc/ppp/ppp.linkup#2 delete .. //depot/projects/hammer/release/picobsd/dial/floppy.tree/etc/rc#2 delete .. //depot/projects/hammer/release/picobsd/dial/floppy.tree/etc/rc.conf#2 delete .. //depot/projects/hammer/release/picobsd/dial/floppy.tree/etc/ttys#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/LICENCE.ssh#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/README.en#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/README.pl#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/boot.help.en#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/boot.help.pl#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/dialup.en#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/dialup.pl#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/hosts.en#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/hosts.pl#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/login.en#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/login.pl#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/motd.en#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/motd.pl#2 delete .. //depot/projects/hammer/release/picobsd/doc/src/Makefile#2 delete .. //depot/projects/hammer/release/picobsd/doc/src/TODO.html#2 delete .. //depot/projects/hammer/release/picobsd/doc/src/UCI.html#2 delete .. //depot/projects/hammer/release/picobsd/doc/src/bugs.html#2 delete .. //depot/projects/hammer/release/picobsd/doc/src/faq.html#2 delete .. //depot/projects/hammer/release/picobsd/doc/src/hardware.html#2 delete .. //depot/projects/hammer/release/picobsd/doc/src/how2build.html#3 delete .. //depot/projects/hammer/release/picobsd/doc/src/installflp.html#2 delete .. //depot/projects/hammer/release/picobsd/doc/src/intrinsics.html#3 delete .. //depot/projects/hammer/release/picobsd/doc/src/intro.html#3 delete .. //depot/projects/hammer/release/picobsd/help/README#2 delete .. //depot/projects/hammer/release/picobsd/help/cat.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/cat.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/chmod.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/chmod.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/chown.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/chown.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/cp.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/cp.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/df.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/df.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/dialup.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/dialup.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/dmesg.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/dmesg.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/echo.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/echo.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/ee.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/ee.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/fsck.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/fsck.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/ftp.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/ftp.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/gzip.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/gzip.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/help.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/help.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/hostname.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/hostname.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/ifconfig.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/ifconfig.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/kbdcontrol.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/kbdcontrol.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/kget.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/kget.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/kill.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/kill.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/ln.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/ln.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/ls.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/ls.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/mkdir.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/mkdir.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/more.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/more.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/mount.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/mount.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/mount_cd9660.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/mount_cd9660.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/mount_ext2fs.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/mount_ext2fs.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/mount_msdosfs.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/mount_msdosfs.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/moused.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/moused.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/mv.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/mv.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/ping.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/ping.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/ppp.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/ppp.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/ps.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/ps.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/pwd.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/pwd.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/reboot.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/reboot.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/rm.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/rm.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/route.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/route.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/sh.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/sh.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/shutdown.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/shutdown.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/ssh.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/ssh.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/sysctl.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/sysctl.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/telnet.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/telnet.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/test.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/test.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/traceroute.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/traceroute.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/umount.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/umount.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/vidcontrol.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/vidcontrol.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/vm.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/vm.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/isp/PICOBSD#2 delete .. //depot/projects/hammer/release/picobsd/isp/PICOBSD.hints#2 delete .. //depot/projects/hammer/release/picobsd/isp/config#2 delete .. //depot/projects/hammer/release/picobsd/isp/crunch.conf#2 delete .. //depot/projects/hammer/release/picobsd/isp/floppy.tree.exclude#2 delete .. //depot/projects/hammer/release/picobsd/isp/lang/README.en#2 delete .. //depot/projects/hammer/release/picobsd/isp/lang/README.pl#2 delete .. //depot/projects/hammer/release/picobsd/isp/lang/boot.help.en#2 delete .. //depot/projects/hammer/release/picobsd/isp/lang/boot.help.pl#2 delete .. //depot/projects/hammer/release/picobsd/isp/lang/motd.en#2 delete .. //depot/projects/hammer/release/picobsd/isp/lang/motd.pl#2 delete .. //depot/projects/hammer/release/picobsd/isp/mfs.mtree#2 delete .. //depot/projects/hammer/release/picobsd/net/PICOBSD#2 delete .. //depot/projects/hammer/release/picobsd/net/PICOBSD.hints#2 delete .. //depot/projects/hammer/release/picobsd/net/config#2 delete .. //depot/projects/hammer/release/picobsd/net/crunch.conf#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/boot.config#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/disktab#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/fstab#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/gettytab#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/group#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/host.conf#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/inetd.conf#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/login.conf#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/master.passwd#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/mfs.rc#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/ppp/ppp.conf#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/ppp/ppp.deny#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/ppp/ppp.linkup#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/ppp/ppp.secret.sample#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/profile#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/protocols#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/rc#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/rc.conf#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/rc.firewall#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/rc.network#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/rc.serial#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/remote#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/resolv.conf#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/services#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/shells#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/snmpd.conf#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/termcap#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/ttys#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/kernel.config#2 delete .. //depot/projects/hammer/release/picobsd/net/lang/README.en#2 delete .. //depot/projects/hammer/release/picobsd/net/lang/README.pl#2 delete .. //depot/projects/hammer/release/picobsd/net/lang/boot.help.en#2 delete .. //depot/projects/hammer/release/picobsd/net/lang/boot.help.pl#2 delete .. //depot/projects/hammer/release/picobsd/net/lang/hosts.en#2 delete .. //depot/projects/hammer/release/picobsd/net/lang/hosts.pl#2 delete .. //depot/projects/hammer/release/picobsd/net/lang/motd.en#2 delete .. //depot/projects/hammer/release/picobsd/net/lang/motd.pl#2 delete .. //depot/projects/hammer/release/picobsd/router/PICOBSD#2 delete .. //depot/projects/hammer/release/picobsd/router/PICOBSD.hints#2 delete .. //depot/projects/hammer/release/picobsd/router/config#2 delete .. //depot/projects/hammer/release/picobsd/router/crunch.conf#2 delete .. //depot/projects/hammer/release/picobsd/router/floppy.tree.exclude#2 delete .. //depot/projects/hammer/release/picobsd/router/floppy.tree/etc/mfs.rc#2 delete .. //depot/projects/hammer/release/picobsd/router/floppy.tree/etc/rc#2 delete .. //depot/projects/hammer/release/picobsd/router/floppy.tree/etc/rc.firewall#2 delete .. //depot/projects/hammer/release/picobsd/router/lang/BAD_DOCS!!!#2 delete .. //depot/projects/hammer/release/picobsd/router/lang/README.en#2 delete .. //depot/projects/hammer/release/picobsd/router/lang/README.pl#2 delete .. //depot/projects/hammer/release/picobsd/router/lang/boot.help.en#2 delete .. //depot/projects/hammer/release/picobsd/router/lang/boot.help.pl#2 delete .. //depot/projects/hammer/release/picobsd/router/lang/hosts.en#2 delete .. //depot/projects/hammer/release/picobsd/router/lang/hosts.pl#2 delete .. //depot/projects/hammer/release/picobsd/router/lang/motd.en#2 delete .. //depot/projects/hammer/release/picobsd/router/lang/motd.pl#2 delete .. //depot/projects/hammer/sbin/ipfw/ipfw.8#19 integrate .. //depot/projects/hammer/sbin/reboot/Makefile#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile#8 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile.asm#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/bf-586.s#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/bf-686.s#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/bn-586.s#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/cast-586.s#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/co-586.s#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/crypt586.s#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/des-586.s#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/md5-586.s#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/rc4-586.s#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/rc5-586.s#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/rmd-586.s#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/sha1-586.s#2 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#18 integrate .. //depot/projects/hammer/share/man/man4/aac.4#5 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#17 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ctau.4#1 branch .. //depot/projects/hammer/share/man/man4/smp.4#5 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#18 integrate .. //depot/projects/hammer/share/man/man5/passwd.5#4 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#22 integrate .. //depot/projects/hammer/share/man/man7/hier.7#12 integrate .. //depot/projects/hammer/share/man/man9/g_access.9#2 integrate .. //depot/projects/hammer/share/man/man9/g_attach.9#3 integrate .. //depot/projects/hammer/share/man/man9/g_consumer.9#3 integrate .. //depot/projects/hammer/share/man/man9/g_geom.9#3 integrate .. //depot/projects/hammer/share/man/man9/g_provider.9#3 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#15 integrate .. //depot/projects/hammer/sys/alpha/alpha/interrupt.c#11 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#11 integrate .. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#7 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#11 integrate .. //depot/projects/hammer/sys/conf/files.i386#25 integrate .. //depot/projects/hammer/sys/conf/files.pc98#25 integrate .. //depot/projects/hammer/sys/conf/files.powerpc#8 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#15 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#21 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#22 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acfreebsd.h#9 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#15 integrate .. //depot/projects/hammer/sys/dev/firewire/fwdev.c#11 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#11 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pccard.c#4 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/isp/isp_sbus.c#7 integrate .. //depot/projects/hammer/sys/dev/ispfw/ispfw.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/uio_machdep.c#1 branch .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#25 integrate .. //depot/projects/hammer/sys/kern/init_main.c#21 edit .. //depot/projects/hammer/sys/kern/kern_thread.c#45 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#26 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#15 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#26 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#13 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#13 integrate .. //depot/projects/hammer/sys/modules/netgraph/sppp/Makefile#1 branch .. //depot/projects/hammer/sys/net/if_arcsubr.c#8 integrate .. //depot/projects/hammer/sys/net/if_gif.c#10 integrate .. //depot/projects/hammer/sys/net/if_gre.c#13 integrate .. //depot/projects/hammer/sys/net/if_gre.h#6 integrate .. //depot/projects/hammer/sys/netatalk/aarp.c#9 integrate .. //depot/projects/hammer/sys/netatalk/at_control.c#4 integrate .. //depot/projects/hammer/sys/netatalk/at_rmx.c#2 integrate .. //depot/projects/hammer/sys/netatalk/at_var.h#3 integrate .. //depot/projects/hammer/sys/netatalk/ddp_input.c#5 integrate .. //depot/projects/hammer/sys/netatalk/ddp_output.c#6 integrate .. //depot/projects/hammer/sys/netatalk/ddp_pcb.c#2 integrate .. //depot/projects/hammer/sys/netatalk/ddp_usrreq.c#9 integrate .. //depot/projects/hammer/sys/netatalk/ddp_var.h#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_sppp.c#1 branch .. //depot/projects/hammer/sys/netgraph/ng_sppp.h#1 branch .. //depot/projects/hammer/sys/netgraph/ng_tee.c#5 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#9 integrate .. //depot/projects/hammer/sys/netinet/ip_gre.c#10 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#19 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/uio_machdep.c#1 branch .. //depot/projects/hammer/sys/sparc64/sparc64/iommu.c#12 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/uio_machdep.c#1 branch .. //depot/projects/hammer/sys/sparc64/sparc64/vm_machdep.c#13 integrate .. //depot/projects/hammer/sys/sys/param.h#29 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#32 integrate .. //depot/projects/hammer/usr.bin/Makefile#27 integrate .. //depot/projects/hammer/usr.bin/csplit/csplit.c#2 integrate .. //depot/projects/hammer/usr.bin/doscmd/AsyncIO.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/AsyncIO.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/Makefile#4 delete .. //depot/projects/hammer/usr.bin/doscmd/Makefile.dos#2 delete .. //depot/projects/hammer/usr.bin/doscmd/PROBLEMS#2 delete .. //depot/projects/hammer/usr.bin/doscmd/ParseBuffer.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/README#2 delete .. //depot/projects/hammer/usr.bin/doscmd/README.booting_dos#2 delete .. //depot/projects/hammer/usr.bin/doscmd/bios.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/callback.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/callback.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/cmos.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/com.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/config.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/cp437-8x14.pcf.gz.uu#2 delete .. //depot/projects/hammer/usr.bin/doscmd/cp437-8x16.pcf.gz.uu#2 delete .. //depot/projects/hammer/usr.bin/doscmd/cp437-8x8.pcf.gz.uu#2 delete .. //depot/projects/hammer/usr.bin/doscmd/cpu.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/crt0.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/cwd.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/cwd.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/debug.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/disktab.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/dispatch.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/dos.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/dos.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/doscmd.1#4 delete .. //depot/projects/hammer/usr.bin/doscmd/doscmd.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/doscmd.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/doscmd_loader.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/ems.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/ems.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/emsdriv.S#2 delete .. //depot/projects/hammer/usr.bin/doscmd/emsdriv.sys.uu#2 delete .. //depot/projects/hammer/usr.bin/doscmd/emuint.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/emuint.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/exe.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/fonts.dir#2 delete .. //depot/projects/hammer/usr.bin/doscmd/i386-pinsn.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/int.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/int10.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/int13.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/int14.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/int16.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/int17.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/int1a.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/int2f.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/intff.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/mem.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/mouse.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/mouse.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/net.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/port.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/redir.S#2 delete .. //depot/projects/hammer/usr.bin/doscmd/redir.com.uu#2 delete .. //depot/projects/hammer/usr.bin/doscmd/register.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/setver.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/signal.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/timer.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/trace.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/trap.c#3 delete .. //depot/projects/hammer/usr.bin/doscmd/trap.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/tty.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/tty.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/video.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/video.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/vparams.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/xms.c#3 delete .. //depot/projects/hammer/usr.bin/doscmd/xms.h#2 delete .. //depot/projects/hammer/usr.bin/indent/args.c#4 integrate .. //depot/projects/hammer/usr.bin/ipcs/ipcs.1#4 integrate .. //depot/projects/hammer/usr.bin/ipcs/ipcs.c#4 integrate .. //depot/projects/hammer/usr.bin/talk/ctl.c#3 integrate .. //depot/projects/hammer/usr.bin/truss/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/truss/syscall.h#3 integrate .. //depot/projects/hammer/usr.bin/truss/syscalls.c#10 integrate .. //depot/projects/hammer/usr.sbin/inetd/inetd.c#8 integrate .. //depot/projects/hammer/usr.sbin/mountd/exports.5#5 integrate Differences ... ==== //depot/projects/hammer/MAINTAINERS#16 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.82 2004/03/01 16:34:39 obrien Exp $ +$FreeBSD: src/MAINTAINERS,v 1.83 2004/03/23 21:22:24 mlaier Exp $ subsystem login notes ----------------------------- @@ -90,6 +90,7 @@ requested. contrib/smbfs bp Open for in-tree committs. In case of functional changes pre-commit review requested. +contrib/pf mlaier Pre-commit review requested. binutils obrien Insists on BU blocked from unapproved commits ==== //depot/projects/hammer/Makefile#17 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.297 2004/03/02 14:32:23 ru Exp $ +# $FreeBSD: src/Makefile,v 1.298 2004/03/24 08:26:22 ru Exp $ # # The user-driven targets are: # @@ -67,7 +67,7 @@ hierarchy install installcheck installkernel installkernel.debug\ reinstallkernel reinstallkernel.debug installworld \ libraries lint maninstall \ - obj objlink regress rerelease tags update \ + obj objlink regress rerelease tags toolchain update \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _cross-tools _includes _libraries _depend ==== //depot/projects/hammer/Makefile.inc1#47 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.420 2004/03/19 17:57:07 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.421 2004/03/24 08:26:22 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -343,6 +343,8 @@ buildworld: ${WMAKE_TGTS} .ORDER: ${WMAKE_TGTS} +toolchain: ${WMAKE_TGTS:N_depend:Neverything} + # # Use this to add checks to installworld/installkernel targets. # ==== //depot/projects/hammer/UPDATING#36 (text+ko) ==== @@ -17,6 +17,17 @@ developers choose to disable these features on build machines to maximize performance. +20040322: + The debug.mpsafenet tunable controls whether the kernel Giant + lock is held across the lower levels of the network stack, and + by default is turned off. In the few days following 20040322, + the behavior of debug.mpsafenet will change such that this + tunable controls Giant over all levels of the network stack. + If you are currently setting debug.mpsafenet to 1, you should + set it back to 0 (the default) again during the change-over. + An additional note will be added to UPDATING when sufficient + locking is merged to permit this to take place. + 20040310: The FreeBSD/sparc64 platform is changing time_t from 32-bits to 64-bits. This is a very major incompatible change, so people @@ -1548,4 +1559,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.300 2004/03/18 00:50:40 obrien Exp $ +$FreeBSD: src/UPDATING,v 1.301 2004/03/22 16:37:32 rwatson Exp $ ==== //depot/projects/hammer/bin/cat/cat.1#2 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)cat.1 8.3 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/cat/cat.1,v 1.19 2001/09/25 18:10:18 ru Exp $ +.\" $FreeBSD: src/bin/cat/cat.1,v 1.21 2004/03/21 11:04:59 tjr Exp $ .\" -.Dd September 15, 2001 +.Dd March 21, 2004 .Dt CAT 1 .Os .Sh NAME @@ -93,9 +93,7 @@ option), and display tab characters as .Ql ^I . .It Fl u -The -.Fl u -option guarantees that the output is unbuffered. +Disable output buffering. .It Fl v Display non-printing characters so they are visible. Control characters print as @@ -199,3 +197,11 @@ redirection, the command .Dq Li cat file1 file2 > file1 will cause the original data in file1 to be destroyed! +.Pp +The +.Nm +utility does not recognize multibyte characters when the +.Fl t +or +.Fl v +option is in effect. ==== //depot/projects/hammer/bin/ls/ls.1#10 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.77 2003/12/01 19:10:29 obrien Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.78 2004/03/21 11:16:24 tjr Exp $ .\" -.Dd May 19, 2002 +.Dd March 21, 2004 .Dt LS 1 .Os .Sh NAME @@ -677,3 +677,7 @@ .Sh BUGS To maintain backward compatibility, the relationships between the many options are quite complex. +.Pp +The +.Nm +utility does not recognize multibyte characters in filenames. ==== //depot/projects/hammer/bin/mv/mv.c#4 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.41 2003/05/05 22:49:22 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.42 2004/03/21 13:38:37 pjd Exp $"); #include #include @@ -210,14 +210,25 @@ struct statfs sfs; char path[PATH_MAX]; - /* Can't mv(1) a mount point. */ - if (realpath(from, path) == NULL) { - warnx("cannot resolve %s: %s", from, path); + /* + * If the source is a symbolic link and is on another + * filesystem, it can be recreated at the destination. + */ + if (lstat(from, &sb) == -1) { + warn("%s", from); return (1); } - if (!statfs(path, &sfs) && !strcmp(path, sfs.f_mntonname)) { - warnx("cannot rename a mount point"); - return (1); + if (!S_ISLNK(sb.st_mode)) { + /* Can't mv(1) a mount point. */ + if (realpath(from, path) == NULL) { + warnx("cannot resolve %s: %s", from, path); + return (1); + } + if (!statfs(path, &sfs) && + !strcmp(path, sfs.f_mntonname)) { + warnx("cannot rename a mount point"); + return (1); + } } } else { warn("rename %s to %s", from, to); ==== //depot/projects/hammer/bin/ps/ps.1#11 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.67 2004/03/17 22:46:58 gad Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.68 2004/03/21 11:24:06 tjr Exp $ .\" -.Dd April 18, 1994 +.Dd March 21, 2004 .Dt PS 1 .Os .Sh NAME @@ -559,3 +559,8 @@ .Nm cannot run faster than the system and is run as any other scheduled process, the information it displays can never be exact. +.Pp +The +.Nm +utility does not correctly display argument lists containing multibyte +characters. ==== //depot/projects/hammer/bin/rmail/Makefile#4 (text+ko) ==== @@ -1,15 +1,18 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/rmail/Makefile,v 1.19 2004/02/23 20:05:14 johan Exp $ +# $FreeBSD: src/bin/rmail/Makefile,v 1.20 2004/03/22 03:17:36 obrien Exp $ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/rmail +# Not much point this being static. It calls a shared sendmail... +NOSHARED?= NO + PROG= rmail SRCS= rmail.c MAN= rmail.8 + +WARNS?= 0 CFLAGS+=-I${SENDMAIL_DIR}/include -I. -WARNS?= 0 -WFORMAT=0 .if exists(${.OBJDIR}/../../lib/libsm) LIBSMDIR:= ${.OBJDIR}/../../lib/libsm @@ -34,9 +37,6 @@ # following: # CFLAGS+= -DQUEUE_ONLY -# Not much point this being static. It calls a shared sendmail... -NOSHARED?= NO - sm_os.h: ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h ==== //depot/projects/hammer/bin/rmdir/rmdir.1#2 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)rmdir.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/rmdir/rmdir.1,v 1.9 2000/11/20 11:39:40 ru Exp $ +.\" $FreeBSD: src/bin/rmdir/rmdir.1,v 1.10 2004/03/21 04:56:06 des Exp $ .\" -.Dd May 31, 1993 +.Dd March 21, 2004 .Dt RMDIR 1 .Os .Sh NAME @@ -43,7 +43,7 @@ .Nd remove directories .Sh SYNOPSIS .Nm -.Op Fl p +.Op Fl pv .Ar directory ... .Sh DESCRIPTION The @@ -72,6 +72,8 @@ (See .Xr rm 1 for fully non-discriminant recursive removal.) +.It Fl v +Be verbose, listing each directory as it is removed. .El .Pp The ==== //depot/projects/hammer/bin/rmdir/rmdir.c#3 (text+ko) ==== @@ -43,7 +43,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rmdir/rmdir.c,v 1.14 2003/05/01 16:58:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/rmdir/rmdir.c,v 1.15 2004/03/21 04:56:06 des Exp $"); #include #include @@ -52,21 +52,25 @@ #include #include -int rm_path(char *); -void usage(void); +static int rm_path(char *); +static void usage(void); + +static int pflag; +static int vflag; int main(int argc, char *argv[]) { int ch, errors; - int pflag; - pflag = 0; - while ((ch = getopt(argc, argv, "p")) != -1) + while ((ch = getopt(argc, argv, "pv")) != -1) switch(ch) { case 'p': pflag = 1; break; + case 'v': + vflag = 1; + break; case '?': default: usage(); @@ -78,17 +82,22 @@ usage(); for (errors = 0; *argv; argv++) { - if (rmdir(*argv) < 0) { - warn("%s", *argv); - errors = 1; - } else if (pflag) + if (pflag) { errors |= rm_path(*argv); + } else { + if (rmdir(*argv) < 0) { + warn("%s", *argv); + errors = 1; + } + if (vflag) + printf("%s\n", *argv); + } } exit(errors); } -int +static int rm_path(char *path) { char *p; @@ -107,12 +116,14 @@ warn("%s", path); return (1); } + if (vflag) + printf("%s\n", path); } return (0); } -void +static void usage(void) { ==== //depot/projects/hammer/contrib/amd/scripts/amd.conf.5#4 (text+ko) ==== @@ -39,7 +39,7 @@ .\" %W% (Berkeley) %G% .\" .\" $Id: amd.conf.5,v 1.7.2.8 2003/03/16 01:47:00 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/scripts/amd.conf.5,v 1.14 2003/09/02 15:42:57 mbr Exp $ +.\" $FreeBSD: src/contrib/amd/scripts/amd.conf.5,v 1.15 2004/03/24 10:25:24 se Exp $ .\" .Dd April 7, 1997 .Dt AMD.CONF 5 @@ -121,62 +121,94 @@ calls. This means you could run for example .Xr ls 1 and see what keys are available to mount in that directory. Not all entries -are made visible to readdir(3): the "/default" entry, wildcard -entries, and those with a "/" in them are not included. If you specify -"full" to this option, all but "/default" will be visible. -Note that if you run a command which will attempt to -.BR stat (2) -the entries, such as often done by "ls -l" or "ls -F", amd will attempt to -mount -.I every -entry in that map. This is often called a ``mount storm''. - -.TP -.BR map_options " (string, default no options)" -This option is the same as specifying map options on the command line to -amd, such as "cache:=all". - -.TP -.BR map_type " (string, default search all map types)" -If specified, amd will initialize the map only for the type given. This is -useful to avoid the default map search type used by amd which takes longer -and can have undesired side-effects such as initializing NIS even if not -used. Possible values are - -.nf -\fBfile\fR plain files -\fBhesiod\fR Hesiod name service from MIT -\fBldap\fR Lightweight Directory Access Protocol -\fBndbm\fR (New) dbm style hash files -\fBnis\fR Network Information Services (version 2) -\fBnisplus\fR Network Information Services Plus (version 3) -\fBpasswd\fR local password files -\fBunion\fR union maps -.fi - -.TP -.BR mount_type " (string, default=nfs)" -All amd mount types must be NFS. That is, amd is an NFS server on the -map mount points, for the local host it is running on. If "autofs" is -specified, amd will log an error and convert it to NFS. - -.TP -.BR search_path " (string, default no search path)" -This provides a (colon-delimited) search path for file maps. Using a search -path, sites can allow for local map customizations and overrides, and can -distributed maps in several locations as needed. - -.\" ************************************************************************** -.SS Parameters applicable to the global section only - -.TP -.BR arch " (string, default to compiled in value)" +are made visible to +.Xr readdir 3 : +the +.Qq Pa /default +entry, wildcard entries, and those with a +.Qq Pa / +in them are not included. If you specify +.Qq full +to this option, all but +.Qq Pa /default +will be visible. Note that if you run a command which will attempt to +.Xr stat 2 +the entries, such as often done by +.Qq ls -l +or +.Qq ls -F , +.Nm amd +will attempt to mount +.Em every +entry in that map. This is often called a +.Dq mount storm . +.It Ic map_options Xo +(string, default no options) +.Xc +This option is the same as specifying map options on the command line to +.Nm amd , +such as +.Ql cache\&:\&=all . +.It Ic map_type Xo +(string, default search all map types) +.Xc +If specified, amd will initialize the map only for the type given. +This is useful to avoid the default map search type used by +.Nm amd +which takes longer and can have undesired side-effects such as initializing +.Tn NIS +even if not used. Possible values are: +.Pp +.Bl -tag -width "nisplus" -compact +.It Ic file +plain files +.It Ic hesiod +Hesiod name service from MIT +.It Ic ldap +Lightweight Directory Access Protocol +.It Ic ndbm +(New) dbm style hash files +.It Ic nis +Network Information Services (version 2) +.It Ic nisplus +Network Information Services Plus (version 3) +.It Ic passwd +local password files +.It Ic union +union maps +.El +.It Ic mount_type Xo +(string, default=nfs) +.Xc +All amd mount types must be +.Tn NFS . +That is, +.Nm amd +is an +.Tn NFS +server on the map mount points, for the local host it is running on. If +.Qq autofs +is specified, amd will log an error and convert it to +.Tn NFS . +.It Ic search_path Xo +(string, default no search path) +.Xc +This provides a +(colon-delimited) +search path for file maps. Using a search path, sites can allow for +local map customizations and overrides, and can query distributed maps in +several locations as needed. +.El +.Ss "Parameters applicable to the global section only" +.Bl -tag -width 4n +.It Ic arch Xo +(string, default to compiled in value) +.Xc Allows you to override the value of the .Va arch .Nm amd variable. -.It Ic auto_dir Xo -(string, default=/a) +.It Ic auto_dir Xo (string, default= Ns Pa /a ) .Xc Same as the .Fl a @@ -241,7 +273,7 @@ .It Ic info info service specific debugging (hesiod, nis, etc.) -.It mem +.It Ic mem trace memory allocations .It Ic mtab use local @@ -268,7 +300,7 @@ .Xc If .Qq yes , -.Nm Amd +.Nm amd will perform RPC authentication using fully-qualified host names. This is necessary for some systems, and especially when performing cross-domain mounting. For this function to work, the @@ -331,8 +363,7 @@ Specify the local domain name. If this option is not given the domain name is determined from the hostname by removing the first component of the fully-qualified host name. -.It Ic log_file Xo -(string, default=/dev/stderr) +.It Ic log_file Xo (string, default= Ns Pa /dev/stderr ) .Xc Same as the .Fl l @@ -380,8 +411,8 @@ .Dq debug logging option is only available if am-utils was configured with .Fl -enable-debug . -You can get the list of supported debugging options by running -.Nm amd Fl v . +You can get the list of supported debugging and logging options by running +.Nm amd Fl H . Possible values are: .Pp .Bl -tag -width "warning" -compact @@ -406,6 +437,16 @@ .It Ic warning warnings .El +.It Ic nfs_proto Xo +(string, default to trying version tcp then udp) +.Xc +By default, amd tries TCP and then UDP. This option forces the overall +.Tn NFS +protocol used to TCP or UDP. It overrides what is in the amd maps, and is +useful when amd is compiled with NFSv3 support that may not be stable. With +this option you can turn off the complete usage of NFSv3 dynamically +(without having to recompile amd) until such time as NFSv3 support is +desired again. .It Ic nfs_retransmit_counter Xo (numeric, default=110) .Xc @@ -420,95 +461,75 @@ (numeric, default=8) .Xc Same as the -.B \-x -option to amd. Specify any logging options for amd. Options are comma -delimited, and can be preceded by the string "no" to negate their meaning. -The "debug" logging option is only available if am-utils was configured with ---enable-debug. You can get the list of supported debugging and logging -options by running amd \-H. Possible values are: >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 24 16:10:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A114216A4D0; Wed, 24 Mar 2004 16:10:12 -0800 (PST) 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 77FDB16A4CE for ; Wed, 24 Mar 2004 16:10:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6FA0843D3F for ; Wed, 24 Mar 2004 16:10:12 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2P0ACGe022152 for ; Wed, 24 Mar 2004 16:10:12 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2P0ABpe022149 for perforce@freebsd.org; Wed, 24 Mar 2004 16:10:11 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 24 Mar 2004 16:10:11 -0800 (PST) Message-Id: <200403250010.i2P0ABpe022149@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49645 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Mar 2004 00:10:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=49645 Change 49645 by peter@peter_daintree on 2004/03/24 16:09:58 integrate -I -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#33 integrate .. //depot/projects/hammer/sys/amd64/include/_types.h#9 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#33 (text+ko) ==== @@ -124,7 +124,8 @@ fpuexit(td1); /* Point the pcb to the top of the stack */ - pcb2 = (struct pcb *)(td2->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; + pcb2 = (struct pcb *)(td2->td_kstack + + td2->td_kstack_pages * PAGE_SIZE) - 1; td2->td_pcb = pcb2; /* Copy p1's pcb */ @@ -247,8 +248,8 @@ cpu_thread_setup(struct thread *td) { - td->td_pcb = - (struct pcb *)(td->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; + td->td_pcb = (struct pcb *)(td->td_kstack + + td->td_kstack_pages * PAGE_SIZE) - 1; td->td_frame = (struct trapframe *)td->td_pcb - 1; } ==== //depot/projects/hammer/sys/amd64/include/_types.h#9 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Mar 24 17:31:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CE2E16A4D0; Wed, 24 Mar 2004 17:31:52 -0800 (PST) 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 01C2716A4CE for ; Wed, 24 Mar 2004 17:31:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC7F943D4C for ; Wed, 24 Mar 2004 17:31:51 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2P1VpGe046298 for ; Wed, 24 Mar 2004 17:31:51 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2P1Vpnc046289 for perforce@freebsd.org; Wed, 24 Mar 2004 17:31:51 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 24 Mar 2004 17:31:51 -0800 (PST) Message-Id: <200403250131.i2P1Vpnc046289@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49647 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Mar 2004 01:31:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=49647 Change 49647 by peter@peter_wannabe on 2004/03/24 17:31:27 Kill off the lazy context switch code. It doesn't help either of the two implementations of amd64 out there. There are better ways of avoiding a TLB hit than adding almost-too-late recovery code. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#16 edit .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#23 edit .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#59 edit .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#59 edit .. //depot/projects/hammer/sys/amd64/amd64/trap.c#45 edit .. //depot/projects/hammer/sys/amd64/include/apicvar.h#19 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#16 (text+ko) ==== @@ -325,19 +325,4 @@ movl $0, LA_EOI(%rax) /* End Of Interrupt to APIC */ POP_FRAME /* Why not doreti? */ iretq - -#ifdef LAZY_SWITCH -/* - * Clean up when we lose out on the lazy context switch optimization. - * ie: when we are about to release a PTD but a cpu is still borrowing it. - */ - SUPERALIGN_TEXT -IDTVEC(lazypmap) - PUSH_FRAME - call pmap_lazyfix_action - movq lapic, %rax - movl $0, LA_EOI(%rax) /* End Of Interrupt to APIC */ - POP_FRAME /* Why not doreti? */ - iretq -#endif #endif /* SMP */ ==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#23 (text+ko) ==== @@ -168,10 +168,6 @@ /* switch address space */ movq PCB_CR3(%r8),%rdx -#ifdef LAZY_SWITCH - cmpq %rdx,KPML4phys /* Kernel address space? */ - je sw1 -#endif movq %cr3,%rax cmpq %rdx,%rax /* Same address space? */ je sw1 ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#59 (text+ko) ==== @@ -303,11 +303,6 @@ /* Install an inter-CPU IPI for forwarding statclock() */ setidt(IPI_STATCLOCK, IDTVEC(statclock), SDT_SYSIGT, SEL_KPL, 0); -#ifdef LAZY_SWITCH - /* Install an inter-CPU IPI for lazy pmap release */ - setidt(IPI_LAZYPMAP, IDTVEC(lazypmap), SDT_SYSIGT, SEL_KPL, 0); -#endif - /* Install an inter-CPU IPI for all-CPU rendezvous */ setidt(IPI_RENDEZVOUS, IDTVEC(rendezvous), SDT_SYSIGT, SEL_KPL, 0); ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#59 (text+ko) ==== @@ -163,11 +163,6 @@ LIST_HEAD(pmaplist, pmap); static struct pmaplist allpmaps; static struct mtx allpmaps_lock; -#ifdef LAZY_SWITCH -#ifdef SMP -static struct mtx lazypmap_lock; -#endif -#endif vm_paddr_t avail_start; /* PA of first available physical page */ vm_paddr_t avail_end; /* PA of last available physical page */ @@ -475,11 +470,6 @@ kernel_pmap->pm_active = -1; /* don't allow deactivation */ TAILQ_INIT(&kernel_pmap->pm_pvlist); LIST_INIT(&allpmaps); -#ifdef LAZY_SWITCH -#ifdef SMP - mtx_init(&lazypmap_lock, "lazypmap", NULL, MTX_SPIN); -#endif -#endif mtx_init(&allpmaps_lock, "allpmaps", NULL, MTX_SPIN); mtx_lock_spin(&allpmaps_lock); LIST_INSERT_HEAD(&allpmaps, kernel_pmap, pm_list); @@ -1296,94 +1286,7 @@ * Pmap allocation/deallocation routines. ***************************************************/ -#ifdef LAZY_SWITCH -#ifdef SMP -/* - * Deal with a SMP shootdown of other users of the pmap that we are - * trying to dispose of. This can be a bit hairy. - */ -static u_int *lazymask; -static register_t lazyptd; -static volatile u_int lazywait; - -void pmap_lazyfix_action(void); - -void -pmap_lazyfix_action(void) -{ - u_int mymask = PCPU_GET(cpumask); - - if (rcr3() == lazyptd) - load_cr3(PCPU_GET(curpcb)->pcb_cr3); - atomic_clear_int(lazymask, mymask); - atomic_store_rel_int(&lazywait, 1); -} - -static void -pmap_lazyfix_self(u_int mymask) -{ - - if (rcr3() == lazyptd) - load_cr3(PCPU_GET(curpcb)->pcb_cr3); - atomic_clear_int(lazymask, mymask); -} - - -static void -pmap_lazyfix(pmap_t pmap) -{ - u_int mymask = PCPU_GET(cpumask); - u_int mask; - register u_int spins; - - while ((mask = pmap->pm_active) != 0) { - spins = 50000000; - mask = mask & -mask; /* Find least significant set bit */ - mtx_lock_spin(&lazypmap_lock); - lazyptd = vtophys(pmap->pm_pml4); - if (mask == mymask) { - lazymask = &pmap->pm_active; - pmap_lazyfix_self(mymask); - } else { - atomic_store_rel_long((u_long *)&lazymask, - (u_long)&pmap->pm_active); - atomic_store_rel_int(&lazywait, 0); - ipi_selected(mask, IPI_LAZYPMAP); - while (lazywait == 0) { - ia32_pause(); - if (--spins == 0) - break; - } - } - mtx_unlock_spin(&lazypmap_lock); - if (spins == 0) - printf("pmap_lazyfix: spun for 50000000\n"); - } -} - -#else /* SMP */ - /* - * Cleaning up on uniprocessor is easy. For various reasons, we're - * unlikely to have to even execute this code, including the fact - * that the cleanup is deferred until the parent does a wait(2), which - * means that another userland process has run. - */ -static void -pmap_lazyfix(pmap_t pmap) -{ - u_long cr3; - - cr3 = vtophys(pmap->pm_pml4); - if (cr3 == rcr3()) { - load_cr3(PCPU_GET(curpcb)->pcb_cr3); - pmap->pm_active &= ~(PCPU_GET(cpumask)); - } -} -#endif /* SMP */ -#endif - -/* * Release any resources held by the given physical map. * Called when a pmap initialized by pmap_pinit is being released. * Should only be called if the map contains no valid mappings. @@ -1397,9 +1300,6 @@ ("pmap_release: pmap resident count %ld != 0", pmap->pm_stats.resident_count)); -#ifdef LAZY_SWITCH - pmap_lazyfix(pmap); -#endif mtx_lock_spin(&allpmaps_lock); LIST_REMOVE(pmap, pm_list); mtx_unlock_spin(&allpmaps_lock); ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#45 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/apicvar.h#19 (text+ko) ==== @@ -93,7 +93,6 @@ #define IPI_INVLTLB (APIC_IPI_INTS + 1) /* TLB Shootdown IPIs */ #define IPI_INVLPG (APIC_IPI_INTS + 2) #define IPI_INVLRNG (APIC_IPI_INTS + 3) -#define IPI_LAZYPMAP (APIC_IPI_INTS + 4) /* Lazy pmap release. */ #define IPI_HARDCLOCK (APIC_IPI_INTS + 8) /* Inter-CPU clock handling. */ #define IPI_STATCLOCK (APIC_IPI_INTS + 9) #define IPI_RENDEZVOUS (APIC_IPI_INTS + 10) /* Inter-CPU rendezvous. */ From owner-p4-projects@FreeBSD.ORG Wed Mar 24 17:53:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EB2116A4D0; Wed, 24 Mar 2004 17:53:20 -0800 (PST) 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 E43DD16A4CE for ; Wed, 24 Mar 2004 17:53:19 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DAA7943D3F for ; Wed, 24 Mar 2004 17:53:19 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2P1rJGe051091 for ; Wed, 24 Mar 2004 17:53:19 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2P1rJSb051088 for perforce@freebsd.org; Wed, 24 Mar 2004 17:53:19 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 24 Mar 2004 17:53:19 -0800 (PST) Message-Id: <200403250153.i2P1rJSb051088@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49649 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Mar 2004 01:53:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=49649 Change 49649 by peter@peter_wannabe on 2004/03/24 17:52:21 correct the CMOV bit. Correctly mask out the common bits that are the same in both amd and intel features. This part needs to go to i386 because the i386 baseline is broken. For example, it doesn't report the fast syscall bit. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#23 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#23 (text+ko) ==== @@ -337,7 +337,7 @@ * http://www.amd.com/products/cpg/athlon/techdocs/pdf/20734.pdf */ do_cpuid(0x80000001, regs); - printf("\n AMD Features=0x%b", regs[3], + printf("\n AMD Features=0x%b", regs[3] & ~(cpu_feature & 0x0183f3ff), "\020" /* in hex */ "\001FPU" /* Integral FPU */ "\002VME" /* Extended VM86 mode support */ @@ -354,7 +354,7 @@ "\015MTRR" /* Memory Type Range Registers */ "\016PGE" /* PG_G (global bit) support */ "\017MCA" /* Machine Check Architecture */ - "\020ICMOV" /* CMOV instruction */ + "\020CMOV" /* CMOV instruction */ "\021PAT" /* Page attributes table */ "\022PGE36" /* 36 bit address space support */ "\023RSVD" /* Reserved, unknown */ From owner-p4-projects@FreeBSD.ORG Wed Mar 24 18:12:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3355416A4D0; Wed, 24 Mar 2004 18:12:44 -0800 (PST) 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 0508B16A4CE for ; Wed, 24 Mar 2004 18:12:44 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F165243D39 for ; Wed, 24 Mar 2004 18:12:43 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2P2ChGe055999 for ; Wed, 24 Mar 2004 18:12:43 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2P2ChQV055996 for perforce@freebsd.org; Wed, 24 Mar 2004 18:12:43 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 24 Mar 2004 18:12:43 -0800 (PST) Message-Id: <200403250212.i2P2ChQV055996@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49650 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Mar 2004 02:12:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=49650 Change 49650 by peter@peter_wannabe on 2004/03/24 18:12:07 dig up bits for cpuid1.ecx. There has got to be a better way. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#24 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#24 (text+ko) ==== @@ -73,6 +73,7 @@ static void print_AMD_info(void); static void print_AMD_assoc(int i); +int cpu_feature2; /* XXX change cpu_feature to long? */ int cpu_class; u_int cpu_exthigh; /* Highest arg to extended CPUID */ char machine[] = "amd64"; @@ -218,6 +219,44 @@ "\040PBE" /* Pending Break Enable */ ); + if (cpu_feature2 != 0) { + printf("\n Features2=0x%b", cpu_feature2, + "\020" + "\001SSE3" /* SSE3 */ + "\002" + "\003RSVD2>" /* "Reserved" bit 2 */ + "\004MON" /* MONITOR/MWAIT Instructions */ + "\005DS_CPL" /* CPL Qualified Debug Store */ + "\006" /* Machine specific registers */ + "\007" /* Physical address extension */ + "\010EST" /* Enhanced SpeedStep */ + "\011TM2" /* Thermal Monitor 2 */ + "\012" + "\013CNTX-ID" /* L1 context ID available */ + "\014" + "\015" + "\016CX16" /* CMPXCHG16B Instruction */ + "\017" + "\020" + "\021" + "\022" + "\023" + "\024" + "\025" + "\026" + "\027" + "\030" + "\031" + "\032" + "\033" + "\034" + "\035" + "\036" + "\037" + "\040" + ); + } + /* * If this CPU supports hyperthreading then mention * the number of logical CPU's it contains. @@ -283,6 +322,7 @@ cpu_id = regs[0]; cpu_procinfo = regs[1]; cpu_feature = regs[3]; + cpu_feature2 = regs[2]; /* XXX */ cpu = CPU_CLAWHAMMER; From owner-p4-projects@FreeBSD.ORG Wed Mar 24 23:56:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0121A16A4D1; Wed, 24 Mar 2004 23:56:48 -0800 (PST) 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 94D0D16A4CE for ; Wed, 24 Mar 2004 23:56:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7783A43D2D for ; Wed, 24 Mar 2004 23:56:48 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2P7umGe036532 for ; Wed, 24 Mar 2004 23:56:48 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2P7ulA6036529 for perforce@freebsd.org; Wed, 24 Mar 2004 23:56:47 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Wed, 24 Mar 2004 23:56:47 -0800 (PST) Message-Id: <200403250756.i2P7ulA6036529@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 49655 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Mar 2004 07:56:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=49655 Change 49655 by marcel@marcel_nfs on 2004/03/24 23:56:09 Save a pointer to the trapframe (or intrframe on i386) on every kernel entry. We save the pointer in td_last_frame. This way, we always have the right context in the debugger without having to muck around with td_frame itself. I like only having td_frame better, but I only got panics so it needs more thought. This way I can at least make progress. Introduce the global variable kdb_frame, which normally caches kdb_thread->td_last_frame, but when the thread has never run, will cache kdb_thread->td_frame. We don't need this global variable if we only have td_frame of course. A thread list of my ia64 kernel with an i386 cross-debugger, now gives: (gdb) target remote /dev/uart1 Remote debugging using /dev/uart1 0xe000000004294161 in kdb_enter ( msg=0x9c1632009c16320
) at machine/cpufunc.h:47 47 __asm __volatile("break.m %0" :: "i"(IA64_FIXED_BREAK)); (gdb) info thread 56 Thread 10 critical_exit () at machine/cpufunc.h:197 55 Thread 1 0x2000000000018740 in ?? () 54 Thread 11 0xe000000004294161 in kdb_enter ( msg=0x9c1632009c16320
) at machine/cpufunc.h:47 53 Thread 12 DELAY (n=166888144) at machine/ia64_cpu.h:320 52 Thread 13 0x0000000000000000 in ?? () 51 Thread 14 critical_exit () at machine/cpufunc.h:197 50 Thread 2 critical_exit () at machine/cpufunc.h:197 49 Thread 3 critical_exit () at machine/cpufunc.h:197 48 Thread 4 g_io_schedule_down (tp=0x9c142b409c142b4) at ../../../geom/geom_io.c:311 47 Thread 15 SHA256_Transform (context=0x9bf412c09bf412c, data=0x9bf42f409bf42f4) at ../../../crypto/sha2/sha2.c:476 : The arguments are bogus, but that's because of something else. Thread 13 has never run, and thread 1 is in userland. Rewrite the way we get registers. All regisers are identified by the gdb register number. The gdb_cpu_getreg() function returns a pointer to the register's value, or NULL if the register is unavailable. The advantage of this is that we encode register values in the same way we encode memory contents and we can tell gdb about unavailable registers. This also means that there's less MD code. Still only i386 and ia64 for now. Affected files ... .. //depot/projects/gdb/sys/ddb/db_main.c#3 edit .. //depot/projects/gdb/sys/gdb/gdb_int.h#5 edit .. //depot/projects/gdb/sys/gdb/gdb_main.c#9 edit .. //depot/projects/gdb/sys/gdb/gdb_packet.c#6 edit .. //depot/projects/gdb/sys/i386/i386/gdb_machdep.c#5 edit .. //depot/projects/gdb/sys/i386/i386/intr_machdep.c#2 edit .. //depot/projects/gdb/sys/i386/i386/trap.c#6 edit .. //depot/projects/gdb/sys/i386/include/gdb_machdep.h#4 edit .. //depot/projects/gdb/sys/i386/include/kdb.h#2 edit .. //depot/projects/gdb/sys/ia64/ia64/gdb_machdep.c#5 edit .. //depot/projects/gdb/sys/ia64/ia64/interrupt.c#3 edit .. //depot/projects/gdb/sys/ia64/ia64/trap.c#5 edit .. //depot/projects/gdb/sys/ia64/include/gdb_machdep.h#4 edit .. //depot/projects/gdb/sys/ia64/include/kdb.h#2 edit .. //depot/projects/gdb/sys/kern/subr_kdb.c#9 edit .. //depot/projects/gdb/sys/sys/kdb.h#7 edit .. //depot/projects/gdb/sys/sys/proc.h#5 edit Differences ... ==== //depot/projects/gdb/sys/ddb/db_main.c#3 (text+ko) ==== @@ -129,7 +129,7 @@ if (cnunavailable()) return (0); - ddb_regs = *kdb_thread->td_frame; + ddb_regs = *kdb_frame; bkpt = IS_BREAKPOINT_TRAP(type, code); watchpt = IS_WATCHPOINT_TRAP(type, code); @@ -153,7 +153,7 @@ db_restart_at_pc(watchpt); - *kdb_thread->td_frame = ddb_regs; + *kdb_frame = ddb_regs; return (1); } ==== //depot/projects/gdb/sys/gdb/gdb_int.h#5 (text+ko) ==== @@ -54,9 +54,8 @@ void gdb_tx_begin(char); int gdb_tx_end(void); -int gdb_tx_memory(const unsigned char *, size_t); +void gdb_tx_mem(const unsigned char *, size_t); void gdb_tx_reg(int); -int gdb_tx_regs(void); static __inline void gdb_tx_char(char c) ==== //depot/projects/gdb/sys/gdb/gdb_main.c#9 (text+ko) ==== @@ -92,7 +92,6 @@ static int gdb_trap(int type, int code) { - uintmax_t addr, size; struct proc *thr_iter; /* @@ -101,12 +100,10 @@ */ gdb_tx_begin('T'); gdb_tx_hex(gdb_cpu_signal(type, code), 2); + gdb_tx_varhex(GDB_REG_PC); + gdb_tx_char(':'); gdb_tx_reg(GDB_REG_PC); gdb_tx_char(';'); - gdb_tx_reg(GDB_REG_FP); - gdb_tx_char(';'); - gdb_tx_reg(GDB_REG_SP); - gdb_tx_char(';'); gdb_tx_str("thread:"); gdb_tx_varhex(kdb_thread->td_tid); gdb_tx_char(';'); @@ -121,14 +118,21 @@ gdb_tx_hex(gdb_cpu_signal(type, code), 2); gdb_tx_end(); break; - case 'c': /* continue */ + case 'c': { /* continue */ + uintmax_t addr; if (!gdb_rx_varhex(&addr)) gdb_cpu_setreg(GDB_REG_PC, addr); kdb_cpu_clear_singlestep(); return (1); - case 'g': - gdb_tx_regs(); + } + case 'g': { + size_t r; + gdb_tx_begin(0); + for (r = 0; r < GDB_NREGS; r++) + gdb_tx_reg(r); + gdb_tx_end(); break; + } case 'G': gdb_tx_err(0); break; @@ -144,13 +148,18 @@ case 'k': kdb_cpu_clear_singlestep(); return (1); - case 'm': + case 'm': { + uintmax_t addr, size; if (gdb_rx_varhex(&addr) || gdb_rx_char() != ',' || - gdb_rx_varhex(&size)) + gdb_rx_varhex(&size)) { gdb_tx_err(EINVAL); - else - gdb_tx_memory((char *)(uintptr_t)addr, size); + break; + } + gdb_tx_begin(0); + gdb_tx_mem((char *)(uintptr_t)addr, size); + gdb_tx_end(); break; + } case 'M': gdb_tx_err(0); break; @@ -177,11 +186,13 @@ } else gdb_tx_empty(); break; - case 's': /* single step */ + case 's': { /* single step */ + uintmax_t addr; if (!gdb_rx_varhex(&addr)) gdb_cpu_setreg(GDB_REG_PC, addr); kdb_cpu_set_singlestep(); return (1); + } case -1: /* Empty command. Treat as unknown command. */ /* FALLTHROUGH */ ==== //depot/projects/gdb/sys/gdb/gdb_packet.c#6 (text+ko) ==== @@ -226,39 +226,30 @@ return (0); } -int -gdb_tx_memory(const unsigned char *addr, size_t size) +void +gdb_tx_mem(const unsigned char *addr, size_t size) { - if (size > (sizeof(gdb_txbuf) << 1)) - return (gdb_tx_err(ENOSPC)); - gdb_tx_begin(0); while (size-- > 0) { *gdb_txp++ = N2C(*addr >> 4); *gdb_txp++ = N2C(*addr & 0x0f); addr++; } - *gdb_txp = 0; - printf("`%s'\n", gdb_txbuf); - return (gdb_tx_end()); } void gdb_tx_reg(int regnum) { + unsigned char *regp; + size_t regsz; - gdb_tx_varhex(regnum); - gdb_tx_char(':'); - gdb_tx_hex(gdb_cpu_getreg(regnum), gdb_cpu_regsz(regnum) << 1); -} - -int -gdb_tx_regs(void) -{ - ssize_t regsz; - - regsz = gdb_cpu_getregs(gdb_rxbuf, sizeof(gdb_rxbuf)); - if (regsz < 0) - return (gdb_tx_err(ENOSPC)); - return (gdb_tx_memory(gdb_rxbuf, regsz)); + regp = gdb_cpu_getreg(regnum, ®sz); + if (regp == NULL) { + /* Register unavailable. */ + while (regsz--) { + gdb_tx_char('x'); + gdb_tx_char('x'); + } + } else + gdb_tx_mem(regp, regsz); } ==== //depot/projects/gdb/sys/i386/i386/gdb_machdep.c#5 (text+ko) ==== @@ -42,55 +42,38 @@ #include -register_t -gdb_cpu_getreg(int regnum) +void * +gdb_cpu_getreg(int regnum, size_t *regsz) { - struct trapframe *tf = kdb_thread->td_frame; + struct trapframe *tf = kdb_frame; + *regsz = gdb_cpu_regsz(regnum); switch (regnum) { - case GDB_REG_FP: return (tf->tf_ebp); - case GDB_REG_PC: return (tf->tf_eip); - case GDB_REG_SP: return (tf->tf_esp); + case 0: return (&tf->tf_eax); + case 1: return (&tf->tf_ecx); + case 2: return (&tf->tf_edx); + case 3: return (&tf->tf_ebx); + case 4: return (&tf->tf_esp); + case 5: return (&tf->tf_ebp); + case 6: return (&tf->tf_esi); + case 7: return (&tf->tf_edi); + case 8: return (&tf->tf_eip); + case 9: return (&tf->tf_eflags); + case 10: return (&tf->tf_cs); + case 11: return (&tf->tf_ss); + case 12: return (&tf->tf_ds); + case 13: return (&tf->tf_es); } - return (0); + return (NULL); } -ssize_t -gdb_cpu_getregs(void *buf, size_t bufsz) -{ - struct trapframe *tf = kdb_thread->td_frame; - struct reg *r = buf; - - if (sizeof(*r) > bufsz) - return (-1); - r->r_cs = tf->tf_cs; - r->r_ds = tf->tf_ds; - r->r_eax = tf->tf_eax; - r->r_ebp = tf->tf_ebp; - r->r_ebx = tf->tf_ebx; - r->r_ecx = tf->tf_ecx; - r->r_edi = tf->tf_edi; - r->r_edx = tf->tf_edx; - r->r_eflags = tf->tf_eflags; - r->r_eip = tf->tf_eip; - r->r_es = tf->tf_es; - r->r_esi = tf->tf_esi; - r->r_esp = tf->tf_esp; - r->r_fs = tf->tf_fs; - r->r_gs = 0; - r->r_ss = tf->tf_ss; - return (sizeof(*r)); -} - void gdb_cpu_setreg(int regnum, register_t val) { - struct trapframe *tf = kdb_thread->td_frame; + struct trapframe *tf = kdb_frame; switch (regnum) { - case GDB_REG_FP: tf->tf_ebp = val; break; case GDB_REG_PC: tf->tf_eip = val; break; - case GDB_REG_SP: tf->tf_esp = val; break; } } ==== //depot/projects/gdb/sys/i386/i386/intr_machdep.c#2 (text+ko) ==== @@ -147,6 +147,7 @@ int error, vector; td = curthread; + td->td_last_frame = INTR_TO_TRAPFRAME(iframe); td->td_intr_nesting_level++; /* ==== //depot/projects/gdb/sys/i386/i386/trap.c#6 (text+ko) ==== @@ -188,6 +188,7 @@ atomic_add_int(&cnt.v_trap, 1); type = frame.tf_trapno; + td->td_last_frame = &frame; #ifdef KDB if (kdb_active) { @@ -929,6 +930,7 @@ sticks = td->td_sticks; td->td_frame = &frame; + td->td_last_frame = &frame; if (td->td_ucred != p->p_ucred) cred_update_thread(td); if (p->p_flag & P_SA) ==== //depot/projects/gdb/sys/i386/include/gdb_machdep.h#4 (text+ko) ==== @@ -30,19 +30,16 @@ #define _MACHINE_GDB_MACHDEP_H_ #define GDB_BUFSZ 400 - -#define GDB_REG_FP 5 +#define GDB_NREGS 14 #define GDB_REG_PC 8 -#define GDB_REG_SP 4 -static __inline int +static __inline size_t gdb_cpu_regsz(int regnum) { - return (4); /* XXX not really. */ + return (sizeof(int)); } -register_t gdb_cpu_getreg(int); -ssize_t gdb_cpu_getregs(void *, size_t); +void *gdb_cpu_getreg(int, size_t *); void gdb_cpu_setreg(int, register_t); int gdb_cpu_signal(int, int); ==== //depot/projects/gdb/sys/i386/include/kdb.h#2 (text+ko) ==== @@ -35,13 +35,13 @@ static __inline void kdb_cpu_clear_singlestep(void) { - kdb_thread->td_frame->tf_eflags &= ~PSL_T; + kdb_frame->tf_eflags &= ~PSL_T; } static __inline void kdb_cpu_set_singlestep(void) { - kdb_thread->td_frame->tf_eflags |= PSL_T; + kdb_frame->tf_eflags |= PSL_T; } static __inline void ==== //depot/projects/gdb/sys/ia64/ia64/gdb_machdep.c#5 (text+ko) ==== @@ -40,43 +40,85 @@ #include -register_t -gdb_cpu_getreg(int regnum) +void * +gdb_cpu_getreg(int regnum, size_t *regsz) { - struct trapframe *tf = kdb_thread->td_frame; + struct trapframe *tf = kdb_frame; + static uint64_t bsp; + *regsz = gdb_cpu_regsz(regnum); switch (regnum) { - case GDB_REG_FP: - return (tf->tf_special.bspstore + tf->tf_special.ndirty); - case GDB_REG_PC: - return (tf->tf_special.iip + ((tf->tf_special.psr >> 41) & 3)); - case GDB_REG_SP: - return (tf->tf_special.sp); + /* Registers 0-127: general registers. */ + case 1: return (&tf->tf_special.gp); + case 2: return (&tf->tf_scratch.gr2); + case 3: return (&tf->tf_scratch.gr3); + case 8: return (&tf->tf_scratch.gr8); + case 9: return (&tf->tf_scratch.gr9); + case 10: return (&tf->tf_scratch.gr10); + case 11: return (&tf->tf_scratch.gr11); + case 12: return (&tf->tf_special.sp); + case 13: return (&tf->tf_special.tp); + case 14: return (&tf->tf_scratch.gr14); + case 15: return (&tf->tf_scratch.gr15); + case 16: return (&tf->tf_scratch.gr16); + case 17: return (&tf->tf_scratch.gr17); + case 18: return (&tf->tf_scratch.gr18); + case 19: return (&tf->tf_scratch.gr19); + case 20: return (&tf->tf_scratch.gr20); + case 21: return (&tf->tf_scratch.gr21); + case 22: return (&tf->tf_scratch.gr22); + case 23: return (&tf->tf_scratch.gr23); + case 24: return (&tf->tf_scratch.gr24); + case 25: return (&tf->tf_scratch.gr25); + case 26: return (&tf->tf_scratch.gr26); + case 27: return (&tf->tf_scratch.gr27); + case 28: return (&tf->tf_scratch.gr28); + case 29: return (&tf->tf_scratch.gr29); + case 30: return (&tf->tf_scratch.gr30); + case 31: return (&tf->tf_scratch.gr31); + /* Registers 128-255: floating-point registers. */ + case 134: return (&tf->tf_scratch_fp.fr6); + case 135: return (&tf->tf_scratch_fp.fr7); + case 136: return (&tf->tf_scratch_fp.fr8); + case 137: return (&tf->tf_scratch_fp.fr9); + case 138: return (&tf->tf_scratch_fp.fr10); + case 139: return (&tf->tf_scratch_fp.fr11); + case 140: return (&tf->tf_scratch_fp.fr12); + case 141: return (&tf->tf_scratch_fp.fr13); + case 142: return (&tf->tf_scratch_fp.fr14); + case 143: return (&tf->tf_scratch_fp.fr15); + /* Registers 320-327: branch registers. */ + case 320: return (&tf->tf_special.rp); + case 326: return (&tf->tf_scratch.br6); + case 327: return (&tf->tf_scratch.br7); + /* Registers 328-333: misc. other registers. */ + case 330: return (&tf->tf_special.pr); + case 331: return (&tf->tf_special.iip); + case 332: return (&tf->tf_special.psr); + case 333: return (&tf->tf_special.cfm); + /* Registers 334-461: application registers. */ + case 350: return (&tf->tf_special.rsc); + case 352: return (&tf->tf_special.bspstore); + case 353: return (&tf->tf_special.rnat); + case 359: return (&tf->tf_scratch.csd); + case 360: return (&tf->tf_scratch.ssd); + case 366: return (&tf->tf_scratch.ccv); + case 370: return (&tf->tf_special.unat); + case 374: return (&tf->tf_special.fpsr); + case 398: return (&tf->tf_special.pfs); + /* Synthesized registers. */ + case 351: + bsp = tf->tf_special.bspstore + tf->tf_special.ndirty; + return (&bsp); } - return (0); + return (NULL); } -ssize_t -gdb_cpu_getregs(void *buf, size_t bufsz) -{ - struct trapframe *tf = kdb_thread->td_frame; - struct reg *r = buf; - - if (sizeof(*r) > bufsz) - return (-1); - r->r_special = tf->tf_special; - r->r_scratch = tf->tf_scratch; - bzero(&r->r_preserved, sizeof(r->r_preserved)); - return (sizeof(*r)); -} - void gdb_cpu_setreg(int regnum, register_t val) { switch (regnum) { - case GDB_REG_FP: break; case GDB_REG_PC: break; - case GDB_REG_SP: break; } } ==== //depot/projects/gdb/sys/ia64/ia64/interrupt.c#3 (text+ko) ==== @@ -133,6 +133,7 @@ int count; td = curthread; + td->td_last_frame = tf; atomic_add_int(&td->td_intr_nesting_level, 1); /* ==== //depot/projects/gdb/sys/ia64/ia64/trap.c#5 (text+ko) ==== @@ -365,6 +365,7 @@ atomic_add_int(&cnt.v_trap, 1); td = curthread; + td->td_last_frame = tf; p = td->td_proc; ucode = 0; @@ -901,9 +902,10 @@ atomic_add_int(&cnt.v_syscall, 1); td = curthread; + td->td_frame = tf; + td->td_last_frame = tf; p = td->td_proc; - td->td_frame = tf; sticks = td->td_sticks; if (td->td_ucred != p->p_ucred) cred_update_thread(td); ==== //depot/projects/gdb/sys/ia64/include/gdb_machdep.h#4 (text+ko) ==== @@ -29,16 +29,15 @@ #ifndef _MACHINE_GDB_MACHDEP_H_ #define _MACHINE_GDB_MACHDEP_H_ -#define GDB_BUFSZ 4096 +#define GDB_NREGS 462 +#define GDB_REG_PC 331 -#define GDB_REG_FP 328 -#define GDB_REG_PC 331 -#define GDB_REG_SP 12 +#define GDB_BUFSZ (GDB_NREGS*16+128*16) -static __inline int +static __inline size_t gdb_cpu_regsz(int regnum) { - return (8); /* XXX not really. */ + return ((regnum >= 128 && regnum < 256) ? 16 : 8); } static __inline int @@ -47,8 +46,7 @@ return (vector); } -register_t gdb_cpu_getreg(int); -ssize_t gdb_cpu_getregs(void *, size_t); +void *gdb_cpu_getreg(int, size_t *); void gdb_cpu_setreg(int, register_t); #endif /* !_MACHINE_GDB_MACHDEP_H_ */ ==== //depot/projects/gdb/sys/ia64/include/kdb.h#2 (text+ko) ==== @@ -47,8 +47,8 @@ __asm __volatile("flushrs;;"); if (vector == IA64_VEC_BREAK && - kdb_thread->td_frame->tf_special.ifa == IA64_FIXED_BREAK) - kdb_thread->td_frame->tf_special.psr += IA64_PSR_RI_1; + kdb_frame->tf_special.ifa == IA64_FIXED_BREAK) + kdb_frame->tf_special.psr += IA64_PSR_RI_1; } #endif /* _MACHINE_KDB_H_ */ ==== //depot/projects/gdb/sys/kern/subr_kdb.c#9 (text+ko) ==== @@ -40,6 +40,7 @@ int kdb_active = 0; struct kdb_dbbe *kdb_dbbe = NULL; struct thread *kdb_thread = NULL; +struct trapframe *kdb_frame = NULL; KDB_BACKEND(null, NULL, NULL, NULL); SET_DECLARE(kdb_dbbe_set, struct kdb_dbbe); @@ -165,8 +166,12 @@ p = LIST_FIRST(&allproc); while (p != NULL && p->p_pid != tid) p = LIST_NEXT(p, p_list); - if (p != NULL) + if (p != NULL) { kdb_thread = FIRST_THREAD_IN_PROC(p); + kdb_frame = kdb_thread->td_last_frame; + if (kdb_frame == NULL) + kdb_frame = kdb_thread->td_frame; + } return ((p != NULL) ? 1 : 0); } @@ -186,7 +191,7 @@ kdb_active++; kdb_thread = curthread; - kdb_thread->td_frame = tf; + kdb_frame = tf; #ifdef SMP stop_cpus(PCPU_GET(other_cpus)); ==== //depot/projects/gdb/sys/sys/kdb.h#7 (text+ko) ==== @@ -56,6 +56,7 @@ extern int kdb_active; /* Non-zero while in debugger. */ extern struct kdb_dbbe *kdb_dbbe; /* Default debugger backend or NULL. */ extern struct thread *kdb_thread; /* Current thread. */ +extern struct trapframe *kdb_frame; /* Current frame. */ int kdb_alt_break(int, int *); void kdb_backtrace(void); ==== //depot/projects/gdb/sys/sys/proc.h#5 (text+ko) ==== @@ -275,6 +275,7 @@ int td_inhibitors; /* (j) Why can not run. */ int td_pflags; /* (k) Private thread (TDP_*) flags. */ int td_tid; /* XXX currently unused. */ + struct trapframe *td_last_frame; struct kse *td_last_kse; /* (j) Previous value of td_kse. */ struct kse *td_kse; /* (j) Current KSE if running. */ int td_dupfd; /* (k) Ret value from fdopen. XXX */ From owner-p4-projects@FreeBSD.ORG Thu Mar 25 08:04:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F20916A4D5; Thu, 25 Mar 2004 08:04:50 -0800 (PST) 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 D96AF16A4D1 for ; Thu, 25 Mar 2004 08:04:49 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D122443D3F for ; Thu, 25 Mar 2004 08:04:49 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2PG4nGe059431 for ; Thu, 25 Mar 2004 08:04:49 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2PG4n5S059428 for perforce@freebsd.org; Thu, 25 Mar 2004 08:04:49 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 25 Mar 2004 08:04:49 -0800 (PST) Message-Id: <200403251604.i2PG4n5S059428@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 49672 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Mar 2004 16:04:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=49672 Change 49672 by rwatson@rwatson_tislabs on 2004/03/25 08:04:30 Correct bugs in memory allocation introduced in port from Darwin. Submitted by: "Ilmar S. Habibulin" Affected files ... .. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#17 edit Differences ... ==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#17 (text+ko) ==== @@ -1393,7 +1393,7 @@ } if (*pathp == NULL) - pathp = malloc(MAXPATHLEN, M_AUDIT, M_WAITOK); + *pathp = malloc(MAXPATHLEN, M_AUDIT, M_WAITOK); canon_path(td, upath, *pathp); @@ -1456,7 +1456,7 @@ } if (*pathp == NULL) - pathp = malloc(MAXPATHLEN, M_AUDIT, M_WAITOK); + *pathp = malloc(MAXPATHLEN, M_AUDIT, M_WAITOK); /* * Copy the path looked up by the vn_getpath() function. From owner-p4-projects@FreeBSD.ORG Thu Mar 25 10:26:42 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFFFB16A4D0; Thu, 25 Mar 2004 10:26:41 -0800 (PST) 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 C43F016A4CE for ; Thu, 25 Mar 2004 10:26:41 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD4C643D3F for ; Thu, 25 Mar 2004 10:26:41 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2PIQfGe096049 for ; Thu, 25 Mar 2004 10:26:41 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2PIQfwj096046 for perforce@freebsd.org; Thu, 25 Mar 2004 10:26:41 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 25 Mar 2004 10:26:41 -0800 (PST) Message-Id: <200403251826.i2PIQfwj096046@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 49674 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Mar 2004 18:26:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=49674 Change 49674 by rwatson@rwatson_tislabs on 2004/03/25 10:26:21 Update for BPF fine-grained locking: BPF descriptor lock and not Giant now protects the label. Affected files ... .. //depot/projects/trustedbsd/mac/sys/net/bpf.c#31 edit .. //depot/projects/trustedbsd/mac/sys/net/bpfdesc.h#11 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_net.c#23 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/net/bpf.c#31 (text+ko) ==== @@ -578,10 +578,12 @@ if (d->bd_hdrcmplt) dst.sa_family = pseudo_AF_HDRCMPLT; - mtx_lock(&Giant); #ifdef MAC + BPFD_LOCK(d); mac_create_mbuf_from_bpfdesc(d, m); + BPFD_UNLOCK(d); #endif + mtx_lock(&Giant); error = (*ifp->if_output)(ifp, m, &dst, (struct rtentry *)0); mtx_unlock(&Giant); /* ==== //depot/projects/trustedbsd/mac/sys/net/bpfdesc.h#11 (text+ko) ==== @@ -102,6 +102,7 @@ #define BPFD_LOCK(bd) mtx_lock(&(bd)->bd_mtx) #define BPFD_UNLOCK(bd) mtx_unlock(&(bd)->bd_mtx) +#define BPFD_LOCK_ASSERT(bd) mtx_assert(&(bd)->bd_mtx, MA_OWNED) /* Test whether a BPF is ready for read(). */ #define bpf_ready(bd) \ ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_net.c#23 (text+ko) ==== @@ -292,6 +292,8 @@ { struct label *label; + BPFD_LOCK_ASSERT(bpf_d); + label = mac_mbuf_to_label(mbuf); MAC_PERFORM(create_mbuf_from_bpfdesc, bpf_d, bpf_d->bd_label, mbuf, @@ -350,6 +352,8 @@ { int error; + BPFD_LOCK_ASSERT(bpf_d); + if (!mac_enforce_network) return (0); From owner-p4-projects@FreeBSD.ORG Thu Mar 25 14:24:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0C4716A4D0; Thu, 25 Mar 2004 14:24:38 -0800 (PST) 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 B50F016A4CE for ; Thu, 25 Mar 2004 14:24:38 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF19F43D3F for ; Thu, 25 Mar 2004 14:24:38 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2PMOcGe057642 for ; Thu, 25 Mar 2004 14:24:38 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2PMOcIr057639 for perforce@freebsd.org; Thu, 25 Mar 2004 14:24:38 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Thu, 25 Mar 2004 14:24:38 -0800 (PST) Message-Id: <200403252224.i2PMOcIr057639@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 49688 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Mar 2004 22:24:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=49688 Change 49688 by jhb@jhb_slimer on 2004/03/25 14:23:47 Committed alpha preemption fix. Affected files ... .. //depot/projects/smpng/sys/notes#12 edit Differences ... ==== //depot/projects/smpng/sys/notes#12 (text+ko) ==== @@ -1,8 +1,6 @@ This file serves as a sort of todo list for this branch as well as documenting what patches currently live in this branch. -- Fix alpha ithread preemption on SMP by pinning interrupted threads - - Waiting for SMP testing feedback - Consolidate linux module version and dependencies into MI location. - Untested - Enable a pmap_emulate_reference check for Alpha under INVARIANTS instead From owner-p4-projects@FreeBSD.ORG Thu Mar 25 15:38:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0BAD16A4D0; Thu, 25 Mar 2004 15:38:08 -0800 (PST) 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 AF65316A4CE for ; Thu, 25 Mar 2004 15:38:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A3F0F43D1D for ; Thu, 25 Mar 2004 15:38:08 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2PNc8Ge072752 for ; Thu, 25 Mar 2004 15:38:08 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2PNc81Y072749 for perforce@freebsd.org; Thu, 25 Mar 2004 15:38:08 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 25 Mar 2004 15:38:08 -0800 (PST) Message-Id: <200403252338.i2PNc81Y072749@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49690 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Mar 2004 23:38:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=49690 Change 49690 by peter@peter_daintree on 2004/03/25 15:37:13 checkpoint. note that I got fed up and reindented. There are changes, but not that many. Mostly preperation and validation. Affected files ... .. //depot/projects/hammer/sys/kern/link_elf_obj.c#3 edit Differences ... ==== //depot/projects/hammer/sys/kern/link_elf_obj.c#3 (text+ko) ==== @@ -60,70 +60,69 @@ #include "linker_if.h" typedef struct elf_file { - struct linker_file lf; /* Common fields */ - caddr_t address; /* Relocation address */ + struct linker_file lf; /* Common fields */ + caddr_t address; /* Relocation address */ #ifdef SPARSE_MAPPING - vm_object_t object; /* VM object to hold file pages */ + vm_object_t object; /* VM object to hold file pages */ #endif - caddr_t strtab; /* DT_STRTAB */ - int strsz; /* DT_STRSZ */ - const Elf_Sym* symtab; /* DT_SYMTAB */ - const Elf_Rel* pltrel; /* DT_JMPREL */ - int pltrelsize; /* DT_PLTRELSZ */ - const Elf_Rela* pltrela; /* DT_JMPREL */ - int pltrelasize; /* DT_PLTRELSZ */ - const Elf_Rel* rel; /* DT_REL */ - int relsize; /* DT_RELSZ */ - const Elf_Rela* rela; /* DT_RELA */ - int relasize; /* DT_RELASZ */ - caddr_t modptr; - const Elf_Sym* ddbsymtab; /* The symbol table we are using */ - long ddbsymcnt; /* Number of symbols */ - caddr_t ddbstrtab; /* String table */ - long ddbstrcnt; /* number of bytes in string table */ - caddr_t symbase; /* malloc'ed symbold base */ - caddr_t strbase; /* malloc'ed string base */ + caddr_t strtab; /* DT_STRTAB */ + int strsz; /* DT_STRSZ */ + const Elf_Sym* symtab; /* DT_SYMTAB */ + const Elf_Rel* pltrel; /* DT_JMPREL */ + int pltrelsize; /* DT_PLTRELSZ */ + const Elf_Rela* pltrela; /* DT_JMPREL */ + int pltrelasize; /* DT_PLTRELSZ */ + const Elf_Rel* rel; /* DT_REL */ + int relsize; /* DT_RELSZ */ + const Elf_Rela* rela; /* DT_RELA */ + int relasize; /* DT_RELASZ */ + caddr_t modptr; + const Elf_Sym* ddbsymtab; /* The symbol table we are using */ + long ddbsymcnt; /* Number of symbols */ + caddr_t ddbstrtab; /* String table */ + long ddbstrcnt; /* number of bytes in string table */ + caddr_t symbase; /* malloc'ed symbold base */ + caddr_t strbase; /* malloc'ed string base */ } *elf_file_t; static int link_elf_link_common_finish(linker_file_t); static int link_elf_link_preload(linker_class_t cls, - const char*, linker_file_t*); + const char*, linker_file_t*); static int link_elf_link_preload_finish(linker_file_t); static int link_elf_load_file(linker_class_t, const char*, linker_file_t*); static int link_elf_lookup_symbol(linker_file_t, const char*, - c_linker_sym_t*); + c_linker_sym_t*); static int link_elf_symbol_values(linker_file_t, c_linker_sym_t, linker_symval_t*); static int link_elf_search_symbol(linker_file_t, caddr_t value, - c_linker_sym_t* sym, long* diffp); + c_linker_sym_t* sym, long* diffp); static void link_elf_unload_file(linker_file_t); static int link_elf_lookup_set(linker_file_t, const char *, - void ***, void ***, int *); + void ***, void ***, int *); static int link_elf_each_function_name(linker_file_t, - int (*)(const char *, void *), - void *); + int (*)(const char *, void *), void *); static void link_elf_reloc_local(linker_file_t); static kobj_method_t link_elf_methods[] = { - KOBJMETHOD(linker_lookup_symbol, link_elf_lookup_symbol), - KOBJMETHOD(linker_symbol_values, link_elf_symbol_values), - KOBJMETHOD(linker_search_symbol, link_elf_search_symbol), - KOBJMETHOD(linker_unload, link_elf_unload_file), - KOBJMETHOD(linker_load_file, link_elf_load_file), - KOBJMETHOD(linker_link_preload, link_elf_link_preload), - KOBJMETHOD(linker_link_preload_finish, link_elf_link_preload_finish), - KOBJMETHOD(linker_lookup_set, link_elf_lookup_set), - KOBJMETHOD(linker_each_function_name, link_elf_each_function_name), - { 0, 0 } + KOBJMETHOD(linker_lookup_symbol, link_elf_lookup_symbol), + KOBJMETHOD(linker_symbol_values, link_elf_symbol_values), + KOBJMETHOD(linker_search_symbol, link_elf_search_symbol), + KOBJMETHOD(linker_unload, link_elf_unload_file), + KOBJMETHOD(linker_load_file, link_elf_load_file), + KOBJMETHOD(linker_link_preload, link_elf_link_preload), + KOBJMETHOD(linker_link_preload_finish, link_elf_link_preload_finish), + KOBJMETHOD(linker_lookup_set, link_elf_lookup_set), + KOBJMETHOD(linker_each_function_name, link_elf_each_function_name), + { 0, 0 } }; static struct linker_class link_elf_class = { #if ELF_TARG_CLASS == ELFCLASS32 - "elf32", + "elf32", #else - "elf64", + "elf64", #endif - link_elf_methods, sizeof(struct elf_file) + link_elf_methods, sizeof(struct elf_file) }; static int relocate_file(elf_file_t ef); @@ -131,7 +130,7 @@ static void link_elf_error(const char *s) { - printf("kldload: %s\n", s); + printf("kldload: %s\n", s); } /* @@ -141,14 +140,14 @@ static int link_elf_link_common_finish(linker_file_t lf) { - int error; + int error; - /* Notify MD code that a module is being loaded. */ - error = elf_cpu_load_file(lf); - if (error) - return (error); + /* Notify MD code that a module is being loaded. */ + error = elf_cpu_load_file(lf); + if (error) + return (error); - return (0); + return (0); } static void @@ -161,8 +160,8 @@ SYSINIT(link_elf, SI_SUB_KLD, SI_ORDER_SECOND, link_elf_init, 0); static int -link_elf_link_preload(linker_class_t cls, - const char* filename, linker_file_t *result) +link_elf_link_preload(linker_class_t cls, const char* filename, + linker_file_t *result) { return (EFTYPE); } @@ -175,460 +174,455 @@ static int link_elf_load_file(linker_class_t cls, const char* filename, - linker_file_t* result) + linker_file_t* result) { - struct nameidata nd; - struct thread* td = curthread; /* XXX */ - Elf_Ehdr *hdr; - caddr_t firstpage; - int nbytes, i; - Elf_Phdr *phdr; - Elf_Phdr *phlimit; - Elf_Phdr *segs[2]; - int nsegs; - Elf_Phdr *phdyn; - Elf_Phdr *phphdr; - caddr_t mapbase; - size_t mapsize; - Elf_Off base_offset; - Elf_Addr base_vaddr; - Elf_Addr base_vlimit; - int error = 0; - int resid, flags; - elf_file_t ef; - linker_file_t lf; - Elf_Shdr *shdr; - int symtabindex; - int symstrindex; - int symcnt; - int strcnt; + struct nameidata nd; + struct thread* td = curthread; /* XXX */ + Elf_Ehdr *hdr; + caddr_t firstpage; + int nbytes, i; + Elf_Phdr *phdr; + Elf_Phdr *phlimit; + Elf_Phdr *segs[2]; + int nsegs; + caddr_t mapbase; + size_t mapsize; + Elf_Off base_offset; + Elf_Addr base_vaddr; + Elf_Addr base_vlimit; + int error = 0; + int resid, flags; + elf_file_t ef; + linker_file_t lf; + Elf_Shdr *shdr; + int symtabindex; + int symstrindex; + int symcnt; + int strcnt; - GIANT_REQUIRED; + GIANT_REQUIRED; - shdr = NULL; - lf = NULL; + shdr = NULL; + lf = NULL; - NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, filename, td); - flags = FREAD; - error = vn_open(&nd, &flags, 0, -1); - if (error) - return error; - NDFREE(&nd, NDF_ONLY_PNBUF); + NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, filename, td); + flags = FREAD; + error = vn_open(&nd, &flags, 0, -1); + if (error) + return error; + NDFREE(&nd, NDF_ONLY_PNBUF); #ifdef MAC - error = mac_check_kld_load(curthread->td_ucred, nd.ni_vp); - if (error) { - firstpage = NULL; - goto out; - } + error = mac_check_kld_load(curthread->td_ucred, nd.ni_vp); + if (error) { + firstpage = NULL; + goto out; + } #endif - /* - * Read the elf header from the file. - */ - firstpage = malloc(PAGE_SIZE, M_LINKER, M_WAITOK); - if (firstpage == NULL) { - error = ENOMEM; - goto out; - } - hdr = (Elf_Ehdr *)firstpage; - error = vn_rdwr(UIO_READ, nd.ni_vp, firstpage, PAGE_SIZE, 0, - UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, - &resid, td); - nbytes = PAGE_SIZE - resid; - if (error) - goto out; + /* + * Read the elf header from the file. + */ + firstpage = malloc(PAGE_SIZE, M_LINKER, M_WAITOK); + if (firstpage == NULL) { + error = ENOMEM; + goto out; + } + hdr = (Elf_Ehdr *)firstpage; + error = vn_rdwr(UIO_READ, nd.ni_vp, firstpage, PAGE_SIZE, 0, + UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, + &resid, td); + nbytes = PAGE_SIZE - resid; + if (error) + goto out; + if (nbytes < sizeof(Elf_Ehdr)) + error = ENOEXEC; + goto out; + } - if (!IS_ELF(*hdr)) { - error = ENOEXEC; - goto out; - } + if (!IS_ELF(*hdr)) { + error = ENOEXEC; + goto out; + } - if (hdr->e_ident[EI_CLASS] != ELF_TARG_CLASS - || hdr->e_ident[EI_DATA] != ELF_TARG_DATA) { - link_elf_error("Unsupported file layout"); - error = ENOEXEC; - goto out; - } - if (hdr->e_ident[EI_VERSION] != EV_CURRENT - || hdr->e_version != EV_CURRENT) { - link_elf_error("Unsupported file version"); - error = ENOEXEC; - goto out; - } - if (hdr->e_type != ET_EXEC && hdr->e_type != ET_DYN) { - link_elf_error("Unsupported file type"); - error = ENOEXEC; - goto out; - } - if (hdr->e_machine != ELF_TARG_MACH) { - link_elf_error("Unsupported machine"); - error = ENOEXEC; - goto out; - } + if (hdr->e_ident[EI_CLASS] != ELF_TARG_CLASS + || hdr->e_ident[EI_DATA] != ELF_TARG_DATA) { + link_elf_error("Unsupported file layout"); + error = ENOEXEC; + goto out; + } + if (hdr->e_ident[EI_VERSION] != EV_CURRENT + || hdr->e_version != EV_CURRENT) { + link_elf_error("Unsupported file version"); + error = ENOEXEC; + goto out; + } + if (hdr->e_type != ET_EXEC && hdr->e_type != ET_DYN) { + link_elf_error("Unsupported file type"); + error = ENOEXEC; + goto out; + } + if (hdr->e_machine != ELF_TARG_MACH) { + link_elf_error("Unsupported machine"); + error = ENOEXEC; + goto out; + } - /* - * We rely on the program header being in the first page. This is - * not strictly required by the ABI specification, but it seems to - * always true in practice. And, it simplifies things considerably. - * XXX section table, not program header. And we should not depend - * XXX on this because the section table is likely to be bigger. - */ - if (!((hdr->e_phentsize == sizeof(Elf_Phdr)) && - (hdr->e_phoff + hdr->e_phnum*sizeof(Elf_Phdr) <= PAGE_SIZE) && - (hdr->e_phoff + hdr->e_phnum*sizeof(Elf_Phdr) <= nbytes))) - link_elf_error("Unreadable program headers"); + /* Read in the section header */ + nbytes = hdr->e_shnum * hdr->e_shentsize; + if (nbytes == 0 || hdr->e_shoff == 0 || + hdr->e_shentsize != sizeof(Elf_Shdr)) { + error = ENOEXEC; + goto out; + } + shdr = malloc(nbytes, M_LINKER, M_WAITOK | M_ZERO); + if (shdr == NULL) { + error = ENOMEM; + goto out; + } + error = vn_rdwr(UIO_READ, nd.ni_vp, (caddr_t)shdr, nbytes, hdr->e_shoff, + UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, &resid, td); + if (error) + goto out; + if (resid) { + error = ENOEXEC; + goto out; + } - /* - * Scan the program header entries, and save key information. - * - * We rely on there being exactly two load segments, text and data, - * in that order. - * - * XXX do several passes of section table instead. - * XXX 1) count various things needed to size arrays - * XXX 2) grab info about things like PROGBITS/REL/RELA/STRTAB/SYMTAB - * XXX 3) read the string and symbol tables so we can do relocations etc - * XXX 4) (later on) load the rest of the entries. - */ + /* + * Scan the program header entries, and save key information. + * + * We rely on there being exactly two load segments, text and data, + * in that order. + * + * XXX do several passes of section table instead. + * XXX 1) count various things needed to size arrays + * XXX 2) grab info about things like PROGBITS/REL/RELA/STRTAB/SYMTAB + * XXX 3) read the string and symbol tables so we can do relocations etc + * XXX 4) (later on) load the rest of the entries. + */ /* XXX *************** STEP 1 GOES HERE ************* XXX */ - phdr = (Elf_Phdr *) (firstpage + hdr->e_phoff); - phlimit = phdr + hdr->e_phnum; - nsegs = 0; - phdyn = NULL; - phphdr = NULL; - while (phdr < phlimit) { - switch (phdr->p_type) { - - case PT_LOAD: - if (nsegs == 2) { - link_elf_error("Too many sections"); + shdr = (Elf_Shdr *)shtbuf; + shlimit = shdr + hdr->e_phnum; + nbits = 0; + nnobits = 0; + nsym = 0; + nrel = 0; + nrela = 0; + for (i = 0; i < hdr->e_shnum; i++) { + switch (shdr[i].sh_type) { + case SHT_PROGBITS: + nprogbits++; + break; + case SHT_NOBITS: + nnobits++; + break; + case SHT_SYMTAB: + nsym++; + symstrindex = shdr[i].sh_link; + break; + case SHT_REL: + nrel++; + break; + case SHT_RELA: + nrela++; + break; + } + } + if (nprogbits == 0 && nnobits == 0) { + link_elf_error("file has no contents"); + error = ENOEXEC; + goto out; + } + if (nsym != 1) { + link_elf_error("file has no valid symbol table"); + error = ENOEXEC; + goto out; + } + if (symstrindex < 0 || sysmstrindex > hdr->e_shnum || + shdr[symstrindex].sh_type != SHT_STRTAB) { + link_elf_error("file has invalid symbol strings"); error = ENOEXEC; goto out; - } - /* - * XXX: We just trust they come in right order ?? - */ - segs[nsegs] = phdr; - ++nsegs; - break; + } - case PT_PHDR: - phphdr = phdr; - break; +/* XXX *************** STEP 2 GOES HERE ************* XXX */ + symtabindex = -1; + symstrindex = -1; + for (i = 0; i < hdr->e_shnum; i++) { + switch (shdr[i].sh_type) { - case PT_DYNAMIC: - phdyn = phdr; - break; - - case PT_INTERP: - link_elf_error("Unsupported file type"); - error = ENOEXEC; - goto out; + case SHT_SYMTAB: + symtabindex = i; + symstrindex = shdr[i].sh_link; + break; + } } - - ++phdr; - } - if (phdyn == NULL) { - link_elf_error("Object is not dynamically-linked"); - error = ENOEXEC; - goto out; - } - if (nsegs != 2) { - link_elf_error("Too few sections"); - error = ENOEXEC; - goto out; - } -/* XXX *************** STEP 2 GOES HERE ************* XXX */ /* XXX *************** STEP 3 GOES HERE ************* XXX */ - /* Try and load the symbol table if it's present. (you can strip it!) */ - nbytes = hdr->e_shnum * hdr->e_shentsize; - if (nbytes == 0 || hdr->e_shoff == 0) - goto nosyms; - shdr = malloc(nbytes, M_LINKER, M_WAITOK | M_ZERO); - if (shdr == NULL) { - error = ENOMEM; - goto out; - } - error = vn_rdwr(UIO_READ, nd.ni_vp, - (caddr_t)shdr, nbytes, hdr->e_shoff, - UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, - &resid, td); - if (error) - goto out; - symtabindex = -1; - symstrindex = -1; - for (i = 0; i < hdr->e_shnum; i++) { - if (shdr[i].sh_type == SHT_SYMTAB) { - symtabindex = i; - symstrindex = shdr[i].sh_link; - } - } - if (symtabindex < 0 || symstrindex < 0) - goto nosyms; + /* Load the symbol table. */ + if (symtabindex < 0 || symstrindex < 0) + goto nosyms; - symcnt = shdr[symtabindex].sh_size; - ef->symbase = malloc(symcnt, M_LINKER, M_WAITOK); - strcnt = shdr[symstrindex].sh_size; - ef->strbase = malloc(strcnt, M_LINKER, M_WAITOK); + symcnt = shdr[symtabindex].sh_size; + ef->symbase = malloc(symcnt, M_LINKER, M_WAITOK); + strcnt = shdr[symstrindex].sh_size; + ef->strbase = malloc(strcnt, M_LINKER, M_WAITOK); - if (ef->symbase == NULL || ef->strbase == NULL) { - error = ENOMEM; - goto out; - } - error = vn_rdwr(UIO_READ, nd.ni_vp, - ef->symbase, symcnt, shdr[symtabindex].sh_offset, - UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, - &resid, td); - if (error) - goto out; - error = vn_rdwr(UIO_READ, nd.ni_vp, - ef->strbase, strcnt, shdr[symstrindex].sh_offset, - UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, - &resid, td); - if (error) - goto out; + if (ef->symbase == NULL || ef->strbase == NULL) { + error = ENOMEM; + goto out; + } + error = vn_rdwr(UIO_READ, nd.ni_vp, + ef->symbase, symcnt, shdr[symtabindex].sh_offset, + UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, + &resid, td); + if (error) + goto out; + error = vn_rdwr(UIO_READ, nd.ni_vp, + ef->strbase, strcnt, shdr[symstrindex].sh_offset, + UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, + &resid, td); + if (error) + goto out; - ef->ddbsymcnt = symcnt / sizeof(Elf_Sym); - ef->ddbsymtab = (const Elf_Sym *)ef->symbase; - ef->ddbstrcnt = strcnt; - ef->ddbstrtab = ef->strbase; + ef->ddbsymcnt = symcnt / sizeof(Elf_Sym); + ef->ddbsymtab = (const Elf_Sym *)ef->symbase; + ef->ddbstrcnt = strcnt; + ef->ddbstrtab = ef->strbase; /* XXX *************** STEP 4 GOES HERE ************* XXX */ - /* - * Allocate the entire address space of the object, to stake out our - * contiguous region, and to establish the base address for relocation. - */ - base_offset = trunc_page(segs[0]->p_offset); - base_vaddr = trunc_page(segs[0]->p_vaddr); - base_vlimit = round_page(segs[1]->p_vaddr + segs[1]->p_memsz); - mapsize = base_vlimit - base_vaddr; + /* + * Allocate the entire address space of the object, to stake out our + * contiguous region, and to establish the base address for relocation. + */ + base_offset = trunc_page(segs[0]->p_offset); + base_vaddr = trunc_page(segs[0]->p_vaddr); + base_vlimit = round_page(segs[1]->p_vaddr + segs[1]->p_memsz); + mapsize = base_vlimit - base_vaddr; - lf = linker_make_file(filename, &link_elf_class); - if (!lf) { - error = ENOMEM; - goto out; - } + lf = linker_make_file(filename, &link_elf_class); + if (!lf) { + error = ENOMEM; + goto out; + } - ef = (elf_file_t) lf; + ef = (elf_file_t) lf; #ifdef SPARSE_MAPPING - ef->object = vm_object_allocate(OBJT_DEFAULT, mapsize >> PAGE_SHIFT); - if (ef->object == NULL) { - error = ENOMEM; - goto out; - } - vm_object_reference(ef->object); - ef->address = (caddr_t) vm_map_min(kernel_map); - error = vm_map_find(kernel_map, ef->object, 0, - (vm_offset_t *) &ef->address, - mapsize, 1, - VM_PROT_ALL, VM_PROT_ALL, 0); - if (error) { - vm_object_deallocate(ef->object); - ef->object = 0; - goto out; - } + ef->object = vm_object_allocate(OBJT_DEFAULT, mapsize >> PAGE_SHIFT); + if (ef->object == NULL) { + error = ENOMEM; + goto out; + } + vm_object_reference(ef->object); + ef->address = (caddr_t) vm_map_min(kernel_map); + error = vm_map_find(kernel_map, ef->object, 0, + (vm_offset_t *) &ef->address, + mapsize, 1, + VM_PROT_ALL, VM_PROT_ALL, 0); + if (error) { + vm_object_deallocate(ef->object); + ef->object = 0; + goto out; + } #else - ef->address = malloc(mapsize, M_LINKER, M_WAITOK); - if (!ef->address) { - error = ENOMEM; - goto out; - } + ef->address = malloc(mapsize, M_LINKER, M_WAITOK); + if (!ef->address) { + error = ENOMEM; + goto out; + } #endif - mapbase = ef->address; + mapbase = ef->address; - /* - * Read the text and data sections and zero the bss. - */ - for (i = 0; i < 2; i++) { - caddr_t segbase = mapbase + segs[i]->p_vaddr - base_vaddr; - error = vn_rdwr(UIO_READ, nd.ni_vp, - segbase, segs[i]->p_filesz, segs[i]->p_offset, - UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, - &resid, td); - if (error) { - goto out; - } - bzero(segbase + segs[i]->p_filesz, - segs[i]->p_memsz - segs[i]->p_filesz); + /* + * Read the text and data sections and zero the bss. + */ + for (i = 0; i < 2; i++) { + caddr_t segbase = mapbase + segs[i]->p_vaddr - base_vaddr; + error = vn_rdwr(UIO_READ, nd.ni_vp, + segbase, segs[i]->p_filesz, segs[i]->p_offset, + UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, + &resid, td); + if (error) { + goto out; + } + bzero(segbase + segs[i]->p_filesz, + segs[i]->p_memsz - segs[i]->p_filesz); #ifdef SPARSE_MAPPING - /* - * Wire down the pages - */ - vm_map_wire(kernel_map, + /* + * Wire down the pages + */ + vm_map_wire(kernel_map, (vm_offset_t) segbase, (vm_offset_t) segbase + segs[i]->p_memsz, VM_MAP_WIRE_SYSTEM|VM_MAP_WIRE_NOHOLES); #endif - } + } - /* ef->dynamic = (Elf_Dyn *) (mapbase + phdyn->p_vaddr - base_vaddr); */ + lf->address = ef->address; + lf->size = mapsize; - lf->address = ef->address; - lf->size = mapsize; + link_elf_reloc_local(lf); - link_elf_reloc_local(lf); + error = linker_load_dependencies(lf); + if (error) + goto out; + error = relocate_file(ef); + if (error) + goto out; - error = linker_load_dependencies(lf); - if (error) - goto out; - error = relocate_file(ef); - if (error) - goto out; + error = link_elf_link_common_finish(lf); + if (error) + goto out; - error = link_elf_link_common_finish(lf); - if (error) - goto out; + nosyms: -nosyms: + *result = lf; - *result = lf; + out: + if (error && lf) + linker_file_unload(lf); + if (shdr) + free(shdr, M_LINKER); + if (firstpage) + free(firstpage, M_LINKER); + VOP_UNLOCK(nd.ni_vp, 0, td); + vn_close(nd.ni_vp, FREAD, td->td_ucred, td); -out: - if (error && lf) - linker_file_unload(lf); - if (shdr) - free(shdr, M_LINKER); - if (firstpage) - free(firstpage, M_LINKER); - VOP_UNLOCK(nd.ni_vp, 0, td); - vn_close(nd.ni_vp, FREAD, td->td_ucred, td); - - return error; + return error; } static void link_elf_unload_file(linker_file_t file) { - elf_file_t ef = (elf_file_t) file; + elf_file_t ef = (elf_file_t) file; - /* Notify MD code that a module is being unloaded. */ - elf_cpu_unload_file(file); + /* Notify MD code that a module is being unloaded. */ + elf_cpu_unload_file(file); #ifdef SPARSE_MAPPING - if (ef->object) { - vm_map_remove(kernel_map, (vm_offset_t) ef->address, - (vm_offset_t) ef->address - + (ef->object->size << PAGE_SHIFT)); - vm_object_deallocate(ef->object); - } + if (ef->object) { + vm_map_remove(kernel_map, (vm_offset_t) ef->address, + (vm_offset_t) ef->address + + (ef->object->size << PAGE_SHIFT)); + vm_object_deallocate(ef->object); + } #else - if (ef->address) - free(ef->address, M_LINKER); + if (ef->address) + free(ef->address, M_LINKER); #endif - if (ef->symbase) - free(ef->symbase, M_LINKER); - if (ef->strbase) - free(ef->strbase, M_LINKER); + if (ef->symbase) + free(ef->symbase, M_LINKER); + if (ef->strbase) + free(ef->strbase, M_LINKER); } static const char * symbol_name(elf_file_t ef, Elf_Word r_info) { - const Elf_Sym *ref; + const Elf_Sym *ref; - if (ELF_R_SYM(r_info)) { - ref = ef->symtab + ELF_R_SYM(r_info); - return ef->strtab + ref->st_name; - } else - return NULL; + if (ELF_R_SYM(r_info)) { + ref = ef->symtab + ELF_R_SYM(r_info); + return ef->strtab + ref->st_name; + } else + return NULL; } static int relocate_file(elf_file_t ef) { - const Elf_Rel *rellim; - const Elf_Rel *rel; - const Elf_Rela *relalim; - const Elf_Rela *rela; - const char *symname; + const Elf_Rel *rellim; + const Elf_Rel *rel; + const Elf_Rela *relalim; + const Elf_Rela *rela; + const char *symname; - /* Perform relocations without addend if there are any: */ - rel = ef->rel; - if (rel) { - rellim = (const Elf_Rel *)((const char *)ef->rel + ef->relsize); - while (rel < rellim) { - if (elf_reloc(&ef->lf, rel, ELF_RELOC_REL)) { - symname = symbol_name(ef, rel->r_info); - printf("link_elf: symbol %s undefined\n", symname); - return ENOENT; - } - rel++; + /* Perform relocations without addend if there are any: */ + rel = ef->rel; + if (rel) { + rellim = (const Elf_Rel *)((const char *)ef->rel + ef->relsize); + while (rel < rellim) { + if (elf_reloc(&ef->lf, rel, ELF_RELOC_REL)) { + symname = symbol_name(ef, rel->r_info); + printf("link_elf: symbol %s undefined\n", symname); + return ENOENT; + } + rel++; + } } - } - /* Perform relocations with addend if there are any: */ - rela = ef->rela; - if (rela) { - relalim = (const Elf_Rela *)((const char *)ef->rela + ef->relasize); - while (rela < relalim) { - if (elf_reloc(&ef->lf, rela, ELF_RELOC_RELA)) { - symname = symbol_name(ef, rela->r_info); - printf("link_elf: symbol %s undefined\n", symname); - return ENOENT; - } - rela++; + /* Perform relocations with addend if there are any: */ + rela = ef->rela; + if (rela) { + relalim = (const Elf_Rela *)((const char *)ef->rela + ef->relasize); + while (rela < relalim) { + if (elf_reloc(&ef->lf, rela, ELF_RELOC_RELA)) { + symname = symbol_name(ef, rela->r_info); + printf("link_elf: symbol %s undefined\n", symname); + return ENOENT; + } + rela++; + } } - } - /* Perform PLT relocations without addend if there are any: */ - rel = ef->pltrel; - if (rel) { - rellim = (const Elf_Rel *)((const char *)ef->pltrel + ef->pltrelsize); - while (rel < rellim) { - if (elf_reloc(&ef->lf, rel, ELF_RELOC_REL)) { - symname = symbol_name(ef, rel->r_info); - printf("link_elf: symbol %s undefined\n", symname); - return ENOENT; - } - rel++; + /* Perform PLT relocations without addend if there are any: */ + rel = ef->pltrel; + if (rel) { + rellim = (const Elf_Rel *)((const char *)ef->pltrel + ef->pltrelsize); + while (rel < rellim) { + if (elf_reloc(&ef->lf, rel, ELF_RELOC_REL)) { + symname = symbol_name(ef, rel->r_info); + printf("link_elf: symbol %s undefined\n", symname); + return ENOENT; + } + rel++; + } } - } - /* Perform relocations with addend if there are any: */ - rela = ef->pltrela; - if (rela) { - relalim = (const Elf_Rela *)((const char *)ef->pltrela + ef->pltrelasize); - while (rela < relalim) { - if (elf_reloc(&ef->lf, rela, ELF_RELOC_RELA)) { - symname = symbol_name(ef, rela->r_info); - printf("link_elf: symbol %s undefined\n", symname); - return ENOENT; - } - rela++; + /* Perform relocations with addend if there are any: */ + rela = ef->pltrela; + if (rela) { + relalim = (const Elf_Rela *)((const char *)ef->pltrela + ef->pltrelasize); + while (rela < relalim) { + if (elf_reloc(&ef->lf, rela, ELF_RELOC_RELA)) { + symname = symbol_name(ef, rela->r_info); + printf("link_elf: symbol %s undefined\n", symname); + return ENOENT; + } + rela++; + } } - } - return 0; + return 0; } static int link_elf_lookup_symbol(linker_file_t lf, const char* name, c_linker_sym_t* sym) { - elf_file_t ef = (elf_file_t) lf; - unsigned long symnum; - const Elf_Sym* symp; - const char *strp; - int i; + elf_file_t ef = (elf_file_t) lf; + unsigned long symnum; + const Elf_Sym* symp; + const char *strp; + int i; /* XXX search for globals first */ - /* Exhaustive search */ - for (i = 0, symp = ef->ddbsymtab; i < ef->ddbsymcnt; i++, symp++) { - strp = ef->ddbstrtab + symp->st_name; - if (strcmp(name, strp) == 0) { - if (symp->st_shndx != SHN_UNDEF || - (symp->st_value != 0 && - ELF_ST_TYPE(symp->st_info) == STT_FUNC)) { - *sym = (c_linker_sym_t) symp; - return 0; - } else - return ENOENT; + /* Exhaustive search */ + for (i = 0, symp = ef->ddbsymtab; i < ef->ddbsymcnt; i++, symp++) { + strp = ef->ddbstrtab + symp->st_name; + if (strcmp(name, strp) == 0) { + if (symp->st_shndx != SHN_UNDEF || + (symp->st_value != 0 && + ELF_ST_TYPE(symp->st_info) == STT_FUNC)) { + *sym = (c_linker_sym_t) symp; + return 0; + } else + return ENOENT; + } } - } - return ENOENT; + return ENOENT; } static int @@ -638,17 +632,17 @@ const Elf_Sym* es = (const Elf_Sym*) sym; if (es >= ef->ddbsymtab && es < (ef->ddbsymtab + ef->ddbsymcnt)) { - symval->name = ef->ddbstrtab + es->st_name; - symval->value = (caddr_t) ef->address + es->st_value; - symval->size = es->st_size; - return 0; + symval->name = ef->ddbstrtab + es->st_name; + symval->value = (caddr_t) ef->address + es->st_value; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 25 18:02:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1B0D16A4D4; Thu, 25 Mar 2004 18:02:04 -0800 (PST) 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 58ACB16A51E for ; Thu, 25 Mar 2004 18:02:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F68643D46 for ; Thu, 25 Mar 2004 18:02:04 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2Q224Ge011204 for ; Thu, 25 Mar 2004 18:02:04 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2Q223Qo011195 for perforce@freebsd.org; Thu, 25 Mar 2004 18:02:03 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 25 Mar 2004 18:02:03 -0800 (PST) Message-Id: <200403260202.i2Q223Qo011195@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49694 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Mar 2004 02:02:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=49694 Change 49694 by peter@peter_daintree on 2004/03/25 18:01:36 lose SPARSE_MAPPING. Not that it doesn't work, but rather its code to work around. It might work out that it has to come back, but thats what we have a SCM for. Affected files ... .. //depot/projects/hammer/sys/kern/link_elf_obj.c#4 edit Differences ... ==== //depot/projects/hammer/sys/kern/link_elf_obj.c#4 (text+ko) ==== @@ -47,11 +47,6 @@ #include #include -#ifdef SPARSE_MAPPING -#include -#include -#include -#endif #include #include @@ -59,23 +54,36 @@ #include "linker_if.h" +typedef struct { + Elf_Addr base_vaddr; + Elf_Off base_offset; + Elf_Off filesz; + int flags; +} Elf_loadent; + +typedef struct { + const Elf_Rel *rel; + int relsize; +} Elf_relent; + +typedef struct { + const Elf_Rela *rela; + int relasize; +} Elf_relaent; + + typedef struct elf_file { struct linker_file lf; /* Common fields */ caddr_t address; /* Relocation address */ -#ifdef SPARSE_MAPPING - vm_object_t object; /* VM object to hold file pages */ -#endif - caddr_t strtab; /* DT_STRTAB */ - int strsz; /* DT_STRSZ */ - const Elf_Sym* symtab; /* DT_SYMTAB */ - const Elf_Rel* pltrel; /* DT_JMPREL */ - int pltrelsize; /* DT_PLTRELSZ */ - const Elf_Rela* pltrela; /* DT_JMPREL */ - int pltrelasize; /* DT_PLTRELSZ */ - const Elf_Rel* rel; /* DT_REL */ - int relsize; /* DT_RELSZ */ - const Elf_Rela* rela; /* DT_RELA */ - int relasize; /* DT_RELASZ */ + + Elf_loadseg *segtab; + int nsegtab; + Elf_relaent *relatab; + int nrela; + + Elf_relent *reltab; + int nrel; + caddr_t modptr; const Elf_Sym* ddbsymtab; /* The symbol table we are using */ long ddbsymcnt; /* Number of symbols */ @@ -87,20 +95,21 @@ static int link_elf_link_common_finish(linker_file_t); static int link_elf_link_preload(linker_class_t cls, - const char*, linker_file_t*); + const char*, linker_file_t*); static int link_elf_link_preload_finish(linker_file_t); static int link_elf_load_file(linker_class_t, const char*, linker_file_t*); static int link_elf_lookup_symbol(linker_file_t, const char*, - c_linker_sym_t*); -static int link_elf_symbol_values(linker_file_t, c_linker_sym_t, linker_symval_t*); + c_linker_sym_t*); +static int link_elf_symbol_values(linker_file_t, c_linker_sym_t, + linker_symval_t*); static int link_elf_search_symbol(linker_file_t, caddr_t value, - c_linker_sym_t* sym, long* diffp); + c_linker_sym_t* sym, long* diffp); static void link_elf_unload_file(linker_file_t); static int link_elf_lookup_set(linker_file_t, const char *, - void ***, void ***, int *); + void ***, void ***, int *); static int link_elf_each_function_name(linker_file_t, - int (*)(const char *, void *), void *); + int (*)(const char *, void *), void *); static void link_elf_reloc_local(linker_file_t); static kobj_method_t link_elf_methods[] = { @@ -300,14 +309,16 @@ * XXX 3) read the string and symbol tables so we can do relocations etc * XXX 4) (later on) load the rest of the entries. */ -/* XXX *************** STEP 1 GOES HERE ************* XXX */ shdr = (Elf_Shdr *)shtbuf; shlimit = shdr + hdr->e_phnum; + nbits = 0; nnobits = 0; nsym = 0; nrel = 0; nrela = 0; + symtabindex = -1; + symstrindex = -1; for (i = 0; i < hdr->e_shnum; i++) { switch (shdr[i].sh_type) { case SHT_PROGBITS: @@ -318,6 +329,7 @@ break; case SHT_SYMTAB: nsym++; + symtabindex = i; symstrindex = shdr[i].sh_link; break; case SHT_REL: @@ -346,16 +358,9 @@ } /* XXX *************** STEP 2 GOES HERE ************* XXX */ - symtabindex = -1; - symstrindex = -1; for (i = 0; i < hdr->e_shnum; i++) { switch (shdr[i].sh_type) { - case SHT_SYMTAB: - symtabindex = i; - symstrindex = shdr[i].sh_link; - break; - } } /* XXX *************** STEP 3 GOES HERE ************* XXX */ @@ -408,30 +413,11 @@ } ef = (elf_file_t) lf; -#ifdef SPARSE_MAPPING - ef->object = vm_object_allocate(OBJT_DEFAULT, mapsize >> PAGE_SHIFT); - if (ef->object == NULL) { - error = ENOMEM; - goto out; - } - vm_object_reference(ef->object); - ef->address = (caddr_t) vm_map_min(kernel_map); - error = vm_map_find(kernel_map, ef->object, 0, - (vm_offset_t *) &ef->address, - mapsize, 1, - VM_PROT_ALL, VM_PROT_ALL, 0); - if (error) { - vm_object_deallocate(ef->object); - ef->object = 0; - goto out; - } -#else ef->address = malloc(mapsize, M_LINKER, M_WAITOK); if (!ef->address) { error = ENOMEM; goto out; } -#endif mapbase = ef->address; /* @@ -448,16 +434,6 @@ } bzero(segbase + segs[i]->p_filesz, segs[i]->p_memsz - segs[i]->p_filesz); - -#ifdef SPARSE_MAPPING - /* - * Wire down the pages - */ - vm_map_wire(kernel_map, - (vm_offset_t) segbase, - (vm_offset_t) segbase + segs[i]->p_memsz, - VM_MAP_WIRE_SYSTEM|VM_MAP_WIRE_NOHOLES); -#endif } lf->address = ef->address; @@ -501,17 +477,8 @@ /* Notify MD code that a module is being unloaded. */ elf_cpu_unload_file(file); -#ifdef SPARSE_MAPPING - if (ef->object) { - vm_map_remove(kernel_map, (vm_offset_t) ef->address, - (vm_offset_t) ef->address - + (ef->object->size << PAGE_SHIFT)); - vm_object_deallocate(ef->object); - } -#else if (ef->address) free(ef->address, M_LINKER); -#endif if (ef->symbase) free(ef->symbase, M_LINKER); if (ef->strbase) From owner-p4-projects@FreeBSD.ORG Fri Mar 26 00:47:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 477BE16A4D5; Fri, 26 Mar 2004 00:47:21 -0800 (PST) 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 EED0D16A4D2 for ; Fri, 26 Mar 2004 00:47:20 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1ADC43D4C for ; Fri, 26 Mar 2004 00:47:20 -0800 (PST) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2Q8lKGe012061 for ; Fri, 26 Mar 2004 00:47:20 -0800 (PST) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2Q8lIGS012058 for perforce@freebsd.org; Fri, 26 Mar 2004 00:47:18 -0800 (PST) (envelope-from scottl@freebsd.org) Date: Fri, 26 Mar 2004 00:47:18 -0800 (PST) Message-Id: <200403260847.i2Q8lIGS012058@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 49703 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Mar 2004 08:47:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=49703 Change 49703 by scottl@scottl-junior-camlock on 2004/03/26 00:46:22 Start branch for playing with CAM. Affected files ... .. //depot/projects/scottl-camlock/src/sys/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/alpha-gdbstub.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/api_up1000.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/atomic.s#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/autoconf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/busdma_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/busspace.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/clock.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/clock_if.m#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/cpuconf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/critical.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/db_disasm.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/db_instruction.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/db_interface.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/db_trace.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dec_1000a.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dec_2100_a50.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dec_2100_a500.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dec_3000_300.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dec_3000_500.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dec_axppci_33.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dec_eb164.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dec_eb64plus.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dec_kn20aa.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dec_kn300.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dec_kn8ae.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dec_st550.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dec_st6600.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/divrem.m4#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dump_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/elf_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/exception.s#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/fp_emulate.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/genassym.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/ieee_float.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/ieee_float.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/in_cksum.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/interrupt.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/locore.s#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/mem.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/mp_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/pal.s#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/pmap.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/prom.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/prom_disp.s#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/promcons.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/sgmap.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/support.s#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/swtch.s#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/sys_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/timerreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/trap.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/uio_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/vm_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/compile/.cvsignore#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/conf/GENERIC#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/conf/GENERIC.hints#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/conf/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/conf/NOTES#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/conf/gethints.awk#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/_inttypes.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/_limits.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/_stdint.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/_types.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/alpha_cpu.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/asm.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/atomic.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/bootinfo.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/bus.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/bus_memio.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/bus_pio.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/bwx.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/chipset.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/clock.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/clockvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/cpu.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/cpuconf.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/cpufunc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/critical.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/db_machdep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/elf.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/endian.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/exec.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/float.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/floatingpoint.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/fpu.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/frame.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/ieee.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/ieeefp.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/in_cksum.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/inst.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/intr.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/intrcnt.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/ioctl_bt848.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/ioctl_meteor.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/limits.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/md_var.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/mutex.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/pal.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/param.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/pc/bios.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/pc/display.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/pc/msdos.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/pc/vesa.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/pcb.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/pcpu.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/pmap.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/proc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/profile.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/prom.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/pte.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/ptrace.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/reg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/reloc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/resource.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/rpb.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/runq.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/setjmp.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/sf_buf.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/sgmap.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/sigframe.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/signal.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/smp.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/stdarg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/swiz.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/sysarch.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/ucontext.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/varargs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/vmparam.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/isa/isa.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/isa/isa_dma.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/isa/isavar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/isa/mcclock_isa.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/linux/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_dummy.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_genassym.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_ipc64.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_locore.s#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_proto.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_syscall.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_sysent.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_sysvec.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/linux/syscalls.conf#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/linux/syscalls.master#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/mcbus/mcbus.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/mcbus/mcbusreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/mcbus/mcbusvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/mcbus/mcmem.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/mcbus/mcpcia.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/mcbus/mcpciareg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/mcbus/mcpciavar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/osf1/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/osf1/README.mach-traps#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/osf1/exec_ecoff.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/osf1/imgact_osf1.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/osf1/osf1.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/osf1/osf1_ioctl.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/osf1/osf1_misc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/osf1/osf1_mount.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/osf1/osf1_proto.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/osf1/osf1_signal.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/osf1/osf1_signal.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/osf1/osf1_syscall.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/osf1/osf1_sysent.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/osf1/osf1_sysvec.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/osf1/osf1_util.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/osf1/syscalls.conf#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/osf1/syscalls.master#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/alphapci_if.m#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/apecs.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/apecs_pci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/apecsreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/apecsvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/bwx.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/cia.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/cia_pci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/ciareg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/ciavar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/irongate.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/irongate_pci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/irongatereg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/irongatevar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/lca.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/lca_pci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/lcareg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/lcavar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/pci_eb164_intr.s#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/pci_eb64plus_intr.s#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/pcibus.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/pcibus.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/swiz.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/t2.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/t2_pci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/t2reg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/t2var.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/tsunami.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/tsunami_pci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/tsunamireg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/pci/tsunamivar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/tlsb/dwlpx.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/tlsb/dwlpxreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/tlsb/dwlpxvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/tlsb/gbus.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/tlsb/gbusreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/tlsb/gbusvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/tlsb/kftxx.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/tlsb/kftxxreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/tlsb/kftxxvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/tlsb/mcclock_tlsb.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/tlsb/tlsb.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/tlsb/tlsbcpu.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/tlsb/tlsbmem.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/tlsb/tlsbreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/tlsb/tlsbvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/tlsb/zs_tlsb.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/tlsb/zsreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/tlsb/zsvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/amd64-gdbstub.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/critical.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/support.S#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/conf/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/conf/NOTES#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/conf/gethints.awk#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/_limits.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/_types.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/asm.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/atomic.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/bus.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/bus_amd64.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/bus_memio.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/bus_pio.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/clock.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/cpu.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/critical.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/elf.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/endian.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/exec.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/float.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/fpu.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/frame.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/limits.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/md_var.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/metadata.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/mptable.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/mutex.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/param.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/pcb.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/pmap.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/proc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/profile.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/psl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/reg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/reloc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/resource.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/runq.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/segments.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/signal.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/smp.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/trap.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/tss.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/varargs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/isa/clock.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/isa/icu.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/isa/isa.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/isa/isa.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/isa/isa_dma.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/isa/timerreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/_limits.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/_stdint.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/_types.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/elf.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/endian.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/exec.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/limits.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/param.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/signal.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/ucontext.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/README#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/Makefile.inc#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/boot1/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/boot1/boot1.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/cdboot/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/cdboot/version#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/common/Makefile.common#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/common/conf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/common/help.alpha#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/common/main.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/libalpha/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/libalpha/OSFpal.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/libalpha/alpha_copy.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/libalpha/alpha_module.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/libalpha/bbinfo.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/libalpha/bootinfo.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/libalpha/common.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/libalpha/delay.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/libalpha/devicename.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/libalpha/elf_freebsd.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/libalpha/getsecs.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/libalpha/libalpha.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/libalpha/pal.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/libalpha/prom.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/libalpha/prom_disp.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/libalpha/prom_swpal.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/libalpha/reboot.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/libalpha/srmdisk.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/libalpha/srmnet.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/libalpha/start.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/libalpha/time.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/loader/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/loader/version#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/netboot/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/alpha/netboot/version#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/Makefile.inc#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/include/arcfuncs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/include/arctypes.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/include/libarc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/lib/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/lib/abort.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/lib/arcconsole.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/lib/arcdisk.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/lib/arch/alpha/copy.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/lib/arch/alpha/rpb.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/lib/arch/alpha/setjmp.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/lib/arch/alpha/start.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/lib/bootinfo.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/lib/delay.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/lib/devicename.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/lib/elf_freebsd.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/lib/module.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/lib/prom.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/lib/setjmperr.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/lib/time.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/loader/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/loader/conf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/loader/help.alpha#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/loader/main.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arc/loader/version#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/bcache.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/boot.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/commands.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/console.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/dev_net.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/dev_net.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/devopen.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/help.common#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/interp.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/isapnp.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/isapnp.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/load.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/load_elf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/loader.8#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/ls.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/misc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/module.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/newvers.sh#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/panic.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/pnp.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/pnpdata#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/common/ufsread.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/include/README#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/arch/ia64/start.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/bootinfo.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/copy.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/devicename.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/efiboot.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/efifpswa.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/elf_freebsd.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/module.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/loader/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/loader/conf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/loader/main.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/efi/loader/version#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/alpha/sysdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/alpha/sysdep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/dict.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/float.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/loader.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/math64.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/math64.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/search.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/stack.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/tools.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/unix.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/vm.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/words.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/forth/frames.4th#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.4th#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.rc#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/forth/screen.4th#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/forth/support.4th#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/boot0/boot0.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/boot0/boot0sio.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/gatea20.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/loader/version#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/libski/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/libski/acpi_stub.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/libski/bootinfo.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/libski/copy.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/libski/delay.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/libski/devicename.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/libski/efi_stub.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/libski/elf_freebsd.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/libski/exit.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/libski/libski.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/libski/module.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/libski/pal_stub.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/libski/sal_stub.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/libski/skiconsole.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/libski/skifs.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/libski/ssc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/libski/time.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/skiload/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/skiload/conf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/skiload/ldscript.ia64#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/skiload/main.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/skiload/skiload.cmd#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/skiload/start.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ia64/skiload/version#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ofw/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/Makefile.inc#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/io.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/start.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/table.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/btx/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/gatea20.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/loader/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/loader/main.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/loader/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/loader/conf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/loader/help.ofw#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/loader/start.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/loader/version#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/cam.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/cam.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/cam_debug.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/cam_queue.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/cam_queue.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/cam_sim.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/cam_sim.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_periph.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_sim.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_message.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_target.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/scottl-camlock/src/sys/coda/00READ#1 branch .. //depot/projects/scottl-camlock/src/sys/coda/README#1 branch .. //depot/projects/scottl-camlock/src/sys/coda/TODO#1 branch .. //depot/projects/scottl-camlock/src/sys/coda/cnode.h#1 branch .. //depot/projects/scottl-camlock/src/sys/coda/coda.h#1 branch .. //depot/projects/scottl-camlock/src/sys/coda/coda_fbsd.c#1 branch .. //depot/projects/scottl-camlock/src/sys/coda/coda_io.h#1 branch .. //depot/projects/scottl-camlock/src/sys/coda/coda_kernel.h#1 branch .. //depot/projects/scottl-camlock/src/sys/coda/coda_namecache.c#1 branch .. //depot/projects/scottl-camlock/src/sys/coda/coda_namecache.h#1 branch .. //depot/projects/scottl-camlock/src/sys/coda/coda_opstats.h#1 branch .. //depot/projects/scottl-camlock/src/sys/coda/coda_pioctl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/coda/coda_psdev.c#1 branch .. //depot/projects/scottl-camlock/src/sys/coda/coda_psdev.h#1 branch .. //depot/projects/scottl-camlock/src/sys/coda/coda_subr.c#1 branch .. //depot/projects/scottl-camlock/src/sys/coda/coda_subr.h#1 branch .. //depot/projects/scottl-camlock/src/sys/coda/coda_venus.c#1 branch .. //depot/projects/scottl-camlock/src/sys/coda/coda_venus.h#1 branch .. //depot/projects/scottl-camlock/src/sys/coda/coda_vfsops.c#1 branch .. //depot/projects/scottl-camlock/src/sys/coda/coda_vfsops.h#1 branch .. //depot/projects/scottl-camlock/src/sys/coda/coda_vnops.c#1 branch .. //depot/projects/scottl-camlock/src/sys/coda/coda_vnops.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscall.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscalls.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_sysent.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_util.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.conf#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/ia32/ia32_genassym.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/ia32/ia32_signal.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/ia32/ia32_sysvec.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/ia32/ia32_util.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_file.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_getcwd.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ipc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ipc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_mib.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_mib.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_signal.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_signal.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_stats.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_sysctl.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_uid16.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_util.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_util.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/ndis/cfg_var.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/ndis/hal_var.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/ndis/ndis_var.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/ndis/pe_var.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/ndis/resource_var.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_hal.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_pe.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/pecoff/imgact_pecoff.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/pecoff/imgact_pecoff.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/imgact_svr4.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_acl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_dirent.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_errno.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_exec.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_fcntl.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_fcntl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_filio.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_filio.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_fuser.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_hrt.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_ioctl.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_ioctl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_ipc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_ipc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_misc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_mman.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_proto.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_resource.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_resource.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_siginfo.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_signal.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_signal.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_socket.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_socket.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_sockio.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_sockio.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_sockmod.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_stat.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_stat.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_statvfs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_stream.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_stropts.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_syscall.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_syscallnames.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_sysconfig.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_sysent.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_systeminfo.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_sysvec.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_termios.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_termios.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_time.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_timod.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_ttold.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_ttold.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_types.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_ucontext.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_ulimit.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_ustat.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_util.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_utsname.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_wait.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/syscalls.conf#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/syscalls.master#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.alpha#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.amd64#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.i386#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.ia64#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.pc98#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.powerpc#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.sparc64#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/defines#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/files#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/files.alpha#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/files.i386#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/files.ia64#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/files.pc98#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/files.powerpc#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/files.sparc64#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/kern.mk#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/kern.post.mk#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/kern.pre.mk#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/kmod.mk#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/kmod_syms.awk#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/ldscript.alpha#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/ldscript.amd64#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/ldscript.i386#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/ldscript.ia64#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/ldscript.powerpc#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/ldscript.sparc64#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/majors#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/majors.awk#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/makeLINT.mk#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/makeLINT.sed#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/newvers.sh#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/options#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/options.alpha#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/options.amd64#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/options.i386#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/options.ia64#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/options.pc98#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/options.powerpc#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/options.sparc64#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/systags.sh#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/CHANGES.txt#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acapps.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acconfig.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acdebug.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acdisasm.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acdispat.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acefi.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acenv.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acevents.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acexcep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acfreebsd.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acgcc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acglobal.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/achware.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acinterp.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/aclocal.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acmacros.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acnamesp.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acobject.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acoutput.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acparser.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acpi.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acpica_prep.sh#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acpiosxf.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acpixf.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acresrc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acstruct.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/actables.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/actbl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/actbl1.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/actbl2.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/actypes.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acutils.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/amlcode.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/amlresrc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/adisasm.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/getopt.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcodegen.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompile.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslerror.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslfiles.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 26 08:30:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7FD7216A4D0; Fri, 26 Mar 2004 08:30:00 -0800 (PST) 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 3311516A4CE for ; Fri, 26 Mar 2004 08:30:00 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2612243D2D for ; Fri, 26 Mar 2004 08:30:00 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2QGU0Ge022805 for ; Fri, 26 Mar 2004 08:30:00 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2QGTPe8022794 for perforce@freebsd.org; Fri, 26 Mar 2004 08:29:25 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 26 Mar 2004 08:29:25 -0800 (PST) Message-Id: <200403261629.i2QGTPe8022794@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 49724 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Mar 2004 16:30:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=49724 Change 49724 by rwatson@rwatson_tislabs on 2004/03/26 08:28:04 Integrate trustedbsd base branch to FreeBSD CVS HEAD: dd(1) grows parity support. The usual plethora of type fixes, NULL<->0 changes, whitespace changes, const poisoning, etc. Someone sorted hundreds of Makefiles resulting in tens of thousands of lines of diff I had to wade through, and will later have to resolve conflicts for. df(1) becomes more 64-bit aware. ls(1) unit support fixed. mv(1) handles moving symlinks between partitions. ps(1) support for threads improved. rmdir(1) grows -v. Many tools learn that signal numbers may exceed NSIG, including sh. Use of various contrib imported getopt(3)'s and regexp(3) removed. Import of bsnmp(3) 1.5a. CVS security fix. More tweaks to dhclient(1) in the hopes of making it work better in a more dynamic world. General improvements in multibyte character support. OpenPAM Eelgrass import. Sendmail 8.12.11 upgrade. smbfs userland utilities now use getifaddrs(). OpenSSH now defaults to protocol 2; PasswordAuthentication disabled by default when using PAM. OpenSSH 3.8p1 import. OpenSSL 0.9.7d import. OpenBSD's 'pf' firewall software is imported (kernel, userland, etc). Users proxy, authpf added. rcNG diskless overhaul. named.root update. "nojail" support in rcNG. GNU grep update. Lots of changes to libalias. Multithreaded getaddrinfo(). libdisk and sysinstall substantially more happy with 64-bit file systems. libgeom(3) re-namespaced. TCP-MD5 support. splitfs and complete rewrite of floppy disk creation during release process; no more floppy disk overflow problems. Various and sundry libthr and libpthread changes. Beginnings of changes to better support 32-bit emulation on 64-bit platforms, such as amd64. fsck now changes its process title to report status. Loopback of multilabel flag for newfs, mdmfs. Mount can now look and see if a UFS file system ufs ufs1 or ufs2, although in a somewhat dubious way. Ping no longer irritatingly hangs during DNS lookups that take a long time. routed(8) now supports MD5 checksumming. Vinum no longer supports non-devfs operation and has fewer bugs. contigmalloc() no longer needs Giant. sched_pin() now exists and allows threads to be pinned to CPUs. Console initialization reordered so that sparc64 is happy again. D_NEEDGIANT instead of D_NOGIANT. pmap_pinit2 is gone. options PFIL_HOOKS now in GENERIC. cpumask_t for cpu masks rather than int. Process lock protects rlimits. dosetrlimit(), open(), fork(), and others now use kern_foo(). ACPI upgrades, acpi_cpu, acpi_video driver. Axing of ISA compat shim drivers. FreeBSD now builds with Intel C compiler. Drivers now declare D_VERSION. Many more drivers use automatic major device number assignment. sys/compat/freebsd32 now exists. Lots less Giant required in fork, exec, wait, exit, open; many proc locking improvements. Advent of Project Evil -- support for NDIS drivers on ia32; now also supports pccard, etc. mac_inet and mac_socket breakout from mac_net loopback. Standard watchdog(9) API for watchdog drivers. bus_alloc_resource_any() instead of bus_alloc_resource() in many cases. Various ataNG reliability fixes. if_awi uses 802.11 network framework rather than rolling its own. DRM upgrade, security fix. Ethernet subsystem now announces ethernet addresses, rather than each driver. Goodbye to raidframe. Interface cloning changes; devfs cloning changes: support for 'struct clonedevs' and automatic reclaim on clone state on clone_cleanup() during driver unload. Locking for if_tap. PCM locking fixes. Usual plethora of new vendor IDs for USB, PCI, et al. Giant pushed down in process exit hooks. Unionfs bugfixes. Many geom fixes, API changes, documentation, etc. SCHED_ULE is now the default; many ULE bugfixes, optimizations, and KSE friendliness. Sleep queues. dev_t reference counting. File descriptor allocation performance optimization. Processes in jail can now be restricted from seeing file systems in mount/df. crfree() no longer requires Giant as vrele() on prison vnode root is deferred using callout. Resource limits on the amount of wired memory a process can request during sysctl. Pipe allocation optimized by joining the two pipe endpoints into a single pipe pair; MAC Framework now acts on pipe pairs, not pipes. Mutex profiling now measures contention. Can now reset mutex profiling stats. WITNESS APIs broken out so order checks can take place without acquisition. mi_switch() now takes an explicit voluntary/involuntary flag. Sysctls for process information query now support thread lookup by process, etc. Resource limits on threads/proc, etc, bumped up to take into account MySQL using a lot of threads. HZ on amd64 1024 by default. Improved support for CPU topology. Expensive diagnostic checks now under diagnostics, not under invariants. ptrace, et al, use a new uiomove_fromphys(). ttyinfo() much more informative in the presence of KSE, etc. Malloc flags now passed to various socket allocators rather than custom flags. SO_BINTIME support to timestamp messages using binary timestamps. dup_sockaddr() -> sodupsockaddr. kthreads no longer need Giant to exit. mount()/umount() no longer permitted in jail. Option to disable certain types of hard linking based on subject/object uid and gid. geom_concat module. Giant pushed off MAC Framework BPF code. PFIL_HOOKS for ifnet arrival, clone, departure, etc. Fine-grained locking for if_disc, if_faith, if_gif, if_gre, if_lo, if_stf, if_tap. AF_ARP support. tun_proc -> tun_pid. Various and sundry 802.11 protocol fixes. PCB routines in ddp_usrreq.c broken out into ddp_pcb.c. Nasty MT_TAG stuff removed from ip_input() -- now m_tags are used to carry around meta-data, etc, for DUMMYNET and friends. Much cleaner and nicer. DUMMYNET locking fixes. IP encapsulation library now has fine-grained locking. TCP reassembly queue resource bounds to address DoS issues. Various NFSv4 bug fixes. sysctl changes to MAC Framework to better reflect sysctl API. DIRHASH locking abstracted for portability. smbfs fixes. UMA now reclaims memory more correctly (at all). gaithrstress getaddrinfo() regression tester. ipcs can display information "by user". rmuser now deletes IPC objects for the user when the user is deleted. Countless other bug fixes, enhancements, documentation changes, etc. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#22 integrate .. //depot/projects/trustedbsd/base/Makefile#31 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#49 integrate .. //depot/projects/trustedbsd/base/UPDATING#43 integrate .. //depot/projects/trustedbsd/base/UPDATING.64BTT#1 branch .. //depot/projects/trustedbsd/base/bin/Makefile#7 integrate .. //depot/projects/trustedbsd/base/bin/cat/cat.1#2 integrate .. //depot/projects/trustedbsd/base/bin/chflags/chflags.c#3 integrate .. //depot/projects/trustedbsd/base/bin/csh/Makefile#9 integrate .. //depot/projects/trustedbsd/base/bin/date/date.c#8 integrate .. //depot/projects/trustedbsd/base/bin/dd/Makefile#6 integrate .. //depot/projects/trustedbsd/base/bin/dd/args.c#10 integrate .. //depot/projects/trustedbsd/base/bin/dd/dd.1#5 integrate .. //depot/projects/trustedbsd/base/bin/dd/dd.c#10 integrate .. //depot/projects/trustedbsd/base/bin/dd/dd.h#4 integrate .. //depot/projects/trustedbsd/base/bin/dd/gen.c#1 branch .. //depot/projects/trustedbsd/base/bin/dd/ref.ascii#1 branch .. //depot/projects/trustedbsd/base/bin/dd/ref.ebcdic#1 branch .. //depot/projects/trustedbsd/base/bin/dd/ref.ibm#1 branch .. //depot/projects/trustedbsd/base/bin/dd/ref.lcase#1 branch .. //depot/projects/trustedbsd/base/bin/dd/ref.oldascii#1 branch .. //depot/projects/trustedbsd/base/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/trustedbsd/base/bin/dd/ref.oldibm#1 branch .. //depot/projects/trustedbsd/base/bin/dd/ref.pareven#1 branch .. //depot/projects/trustedbsd/base/bin/dd/ref.parnone#1 branch .. //depot/projects/trustedbsd/base/bin/dd/ref.parodd#1 branch .. //depot/projects/trustedbsd/base/bin/dd/ref.parset#1 branch .. //depot/projects/trustedbsd/base/bin/dd/ref.swab#1 branch .. //depot/projects/trustedbsd/base/bin/dd/ref.ucase#1 branch .. //depot/projects/trustedbsd/base/bin/df/df.c#18 integrate .. //depot/projects/trustedbsd/base/bin/kill/kill.c#6 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.1#21 integrate .. //depot/projects/trustedbsd/base/bin/ls/print.c#18 integrate .. //depot/projects/trustedbsd/base/bin/mv/mv.c#10 integrate .. //depot/projects/trustedbsd/base/bin/pax/cache.c#6 integrate .. //depot/projects/trustedbsd/base/bin/pax/options.c#10 integrate .. //depot/projects/trustedbsd/base/bin/ps/Makefile#10 integrate .. //depot/projects/trustedbsd/base/bin/ps/keyword.c#16 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.1#17 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.c#16 integrate .. //depot/projects/trustedbsd/base/bin/rmail/Makefile#6 integrate .. //depot/projects/trustedbsd/base/bin/rmdir/rmdir.1#2 integrate .. //depot/projects/trustedbsd/base/bin/rmdir/rmdir.c#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/Makefile#7 integrate .. //depot/projects/trustedbsd/base/bin/sh/eval.c#8 integrate .. //depot/projects/trustedbsd/base/bin/sh/input.c#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/jobs.c#14 integrate .. //depot/projects/trustedbsd/base/bin/sh/parser.c#11 integrate .. //depot/projects/trustedbsd/base/bin/sh/redir.c#9 integrate .. //depot/projects/trustedbsd/base/bin/sh/redir.h#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/trap.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/amd.conf.5#4 integrate .. //depot/projects/trustedbsd/base/contrib/bc/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/base/contrib/bc/bc/main.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bc/h/getopt.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bc/lib/getopt.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bc/lib/getopt1.c#2 delete .. //depot/projects/trustedbsd/base/contrib/binutils/include/getopt.h#3 delete .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/getopt.c#3 delete .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/getopt1.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bsnmp/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/base/contrib/bsnmp/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/NEWS#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/TODO#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/VERSION#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/asn1.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/asn1.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/asn1.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/bsnmpagent.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/bsnmpclient.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/bsnmplib.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/snmp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/snmp.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/snmpagent.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/snmpagent.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/snmpclient.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/snmpclient.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/snmppriv.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_ifmib.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_ifstack.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_ip.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_nettomedia.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_rcvaddr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_route.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_tcp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_tree.def#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_udp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/snmp_mibII.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/snmp_mibII.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/BEGEMOT-MIB.txt#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/FOKUS-MIB.txt#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/action.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/bsnmpd.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/config.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/export.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/main.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpd.config#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpd.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpd.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpmod.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpmod.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/trans_lsock.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/trans_lsock.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/trans_udp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/trans_udp.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/trap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/tree.def#2 integrate .. //depot/projects/trustedbsd/base/contrib/cpio/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/base/contrib/cpio/getopt.c#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/getopt.h#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/getopt1.c#2 delete .. //depot/projects/trustedbsd/base/contrib/cvs/src/modules.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/server.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/diff/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/base/contrib/diff/diff.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/diff/getopt.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/getopt.h#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/getopt1.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/FREEBSD-Xlist#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/FREEBSD-deletelist#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/freebsd-spec.h#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/getopt.c#6 delete .. //depot/projects/trustedbsd/base/contrib/gcc/getopt.h#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/getopt1.c#5 delete .. //depot/projects/trustedbsd/base/contrib/gdtoa/gethex.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtod.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/xsum0.out#3 integrate .. //depot/projects/trustedbsd/base/contrib/gnu-sort/lib/getopt.c#3 delete .. //depot/projects/trustedbsd/base/contrib/gnu-sort/lib/getopt.h#3 delete .. //depot/projects/trustedbsd/base/contrib/gnu-sort/lib/getopt1.c#3 delete .. //depot/projects/trustedbsd/base/contrib/gperf/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/base/contrib/gperf/lib/getopt.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gperf/lib/getopt.c.patch#2 delete .. //depot/projects/trustedbsd/base/contrib/gperf/lib/getopt.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gperf/lib/getopt.h.patch#2 delete .. //depot/projects/trustedbsd/base/contrib/gperf/lib/getopt1.c#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/getopt.h#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/getopt.c#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/getopt1.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/FREEBSD-upgrade#8 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/convert.c#2 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/errwarn.c#2 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/hash.c#2 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/inet_addr.c#2 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/hash.h#2 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/sysconf.h#2 delete .. //depot/projects/trustedbsd/base/contrib/libreadline/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/bind.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/complete.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/display.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/readline.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/mbutil.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/readline.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/readline.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rlconf.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/shell.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/terminal.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/util.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/vi_mode.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/FIXES#7 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/FREEBSD-upgrade#7 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/b.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/lex.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/main.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/run.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/CREDITS#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/HISTORY#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/RELNOTES#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/configure#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/configure.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam.3#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_borrow_cred.3#13 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_free_data.3#13 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_get_option.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_log.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_nullconv.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_readline.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_restore_cred.3#13 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_set_option.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_ttyconv.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_acct_mgmt.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_authenticate.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_chauthtok.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_close_session.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_conv.3#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_end.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_error.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_authtok.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_data.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_item.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_user.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenv.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenvlist.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_info.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_open_session.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_prompt.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_putenv.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_data.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_item.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setcred.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setenv.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_authenticate.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_chauthtok.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_close_session.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_open_session.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_setcred.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_start.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_strerror.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_verror.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vinfo.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vprompt.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam.h#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam_version.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_appl.h#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_borrow_cred.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_impl.h#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_restore_cred.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_authtok.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_data.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_user.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_vprompt.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/ltmain.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/stamp-h.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/pf/authpf/authpf.8#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/authpf/authpf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/authpf/pathnames.h#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/ftp-proxy/ftp-proxy.8#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/ftp-proxy/ftp-proxy.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/ftp-proxy/getline.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/ftp-proxy/util.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/ftp-proxy/util.h#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/man/pf.4#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/man/pf.conf.5#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/man/pf.os.5#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/man/pflog.4#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/man/pfsync.4#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/parse.y#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pf_print_state.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pfctl.8#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pfctl.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pfctl.h#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pfctl_altq.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pfctl_osfp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pfctl_parser.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pfctl_parser.h#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pfctl_qstats.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pfctl_radix.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pfctl_table.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/pflogd/pflogd.8#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/pflogd/pflogd.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/pflogd/pidfile.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/pflogd/pidfile.h#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/FREEBSD-upgrade#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/PGPKEYS#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/RELEASE_NOTES#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/README#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.cf#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/cfhead.m4#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/proto.m4#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/version.m4#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/doc/op/op.me#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/libmilter/mfapi.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/libmilter/milter.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/cdefs.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/conf.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_setreply.html#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_connect.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/engine.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/libmilter.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/listener.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/main.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/signal.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/assert.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/exc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/ldap.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/local.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/smrsh/smrsh.8#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/smrsh/smrsh.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/README#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/alias.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/daemon.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/deliver.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/headers.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/main.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/milter.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/mime.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/queue.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/readcf.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/recipient.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sendmail.8#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sendmail.h#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/srvrsmtp.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/tls.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/util.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/version.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/nb_net.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/sort/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/sort/append.c#2 delete .. //depot/projects/trustedbsd/base/contrib/sort/extern.h#2 delete .. //depot/projects/trustedbsd/base/contrib/sort/fields.c#2 delete .. //depot/projects/trustedbsd/base/contrib/sort/files.c#2 delete .. //depot/projects/trustedbsd/base/contrib/sort/fsort.c#2 delete .. //depot/projects/trustedbsd/base/contrib/sort/fsort.h#2 delete .. //depot/projects/trustedbsd/base/contrib/sort/init.c#2 delete .. //depot/projects/trustedbsd/base/contrib/sort/msort.c#2 delete .. //depot/projects/trustedbsd/base/contrib/sort/pathnames.h#2 delete .. //depot/projects/trustedbsd/base/contrib/sort/regress/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/sort/regress/stests#2 delete .. //depot/projects/trustedbsd/base/contrib/sort/sort.1#2 delete .. //depot/projects/trustedbsd/base/contrib/sort/sort.c#2 delete .. //depot/projects/trustedbsd/base/contrib/sort/sort.h#2 delete .. //depot/projects/trustedbsd/base/contrib/sort/tmp.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/base/contrib/tar/lib/getopt.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/getopt.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/getopt1.c#2 delete .. //depot/projects/trustedbsd/base/contrib/texinfo/FREEBSD-Xlist#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/getopt.c#4 delete .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/getopt.h#4 delete .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/getopt1.c#4 delete .. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/CREDITS#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ChangeLog#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/FREEBSD-upgrade#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/INSTALL#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/LICENCE#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/OVERVIEW#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README.dns#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README.platform#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/README.privsep#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README.smartcard#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/RFC.nroff#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/TODO#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/WARNING.RNG#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/acconfig.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/acss.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/acss.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/auth-chall.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-krb5.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-pam.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-pam.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-passwd.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-rh-rsa.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-rhosts.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-rsa.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-shadow.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/auth-sia.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth1.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-gss.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-hostbased.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-passwd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-pubkey.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/authfd.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/authfd.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/authfile.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/bufaux.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/bufaux.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/buffer.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/canohost.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/channels.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/channels.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cipher-3des1.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cipher-acss.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/cipher-aes.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cipher-ctr.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cipher.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cipher.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cleanup.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/clientloop.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/clientloop.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/compat.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/compat.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/compress.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/config.guess#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/config.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/config.sub#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/configure.ac#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/defines.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/dh.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/dns.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/dns.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/entropy.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/fatal.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/fixprogs#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/groupaccess.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/gss-genr.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/gss-serv-krb5.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/gss-serv.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/hostfile.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/hostfile.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/includes.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/install-sh#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kex.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexgexc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/key.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/key.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/log.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/log.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/loginrec.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/mac.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/md5crypt.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/mdoc2man.awk#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/misc.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/mkinstalldirs#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/moduli#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/moduli.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_wrap.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_wrap.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/msg.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/msg.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/nchan.ms#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/nchan2.ms#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/Makefile.in#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/base64.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/basename.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-arc4random.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-cray.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-cray.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-getpeereid.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-misc.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-misc.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-openpty.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/daemon.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/dirname.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/fake-rfc2553.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/fake-rfc2553.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getcwd.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getgrouplist.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getopt.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getrrsetbyname.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getrrsetbyname.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/glob.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/glob.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/inet_aton.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/inet_ntoa.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/inet_ntop.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/mktemp.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/openbsd-compat.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-aix.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-aix.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/readpassphrase.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/readpassphrase.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/realpath.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/rresvport.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/setenv.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/setproctitle.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/sigact.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/strlcat.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/strlcpy.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/strmode.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/strsep.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/strtoul.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/sys-queue.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/sys-tree.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/vis.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/vis.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/xcrypt.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/packet.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/pathnames.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/progressmeter.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/readconf.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/readconf.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/Makefile#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/README.regress#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/agent-ptrace.sh#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/banner.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/regress/sftp-badcmds.sh#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/sftp-batch.sh#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/sftp-cmds.sh#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/ssh-com.sh#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/test-exec.sh#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/rijndael.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scard-opensc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scp.1#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scp.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/servconf.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/servconf.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/serverloop.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/session.c#18 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/session.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-client.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-client.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-common.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-common.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-glob.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-glob.h#5 delete .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-int.c#8 delete .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-int.h#4 delete .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-server.8#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-server.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp.1#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-add.1#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-add.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-agent.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-dss.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-gss.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keygen.1#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keygen.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keyscan.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keysign.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-rand-helper.8#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-rand-helper.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-rsa.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.1#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config.5#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_prng_cmds.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect2.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd.8#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config.5#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshpty.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshtty.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshtty.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/uidswap.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/uuencode.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/uuencode.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/version.h#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/CHANGES#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Configure#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/FAQ#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/LICENSE#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile.org#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile.ssl#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/NEWS#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/README#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/CA.pl#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/Makefile.ssl#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/apps.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/apps.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/asn1pars.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/ca.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/der_chop#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/dgst.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/enc.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/engine.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/ocsp.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/openssl.cnf#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/pkcs12.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/pkcs7.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/req.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/rsautl.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_socket.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_time.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/speed.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/x509.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/certs/expired/vsign3.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/vsign3.pem#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/config#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_cbc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_gentm.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_mbstr.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_strex.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_time.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_utctm.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_lib.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_par.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn_moid.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/t_pkey.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_long.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bf/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/b_dump.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/b_print.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/b_sock.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bio_cb.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_conn.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_file.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/bn-586.pl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_lcl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_print.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/buffer/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/comp/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_def.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_mod.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cversion.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/cfb_enc.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/ecb_enc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/dso_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ecp_smpl.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_ctrl.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_fat.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/engine.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_cryptodev.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/err.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/bio_ok.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/digest.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_enc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_pbe.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_pkey.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/hmac/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/krb5/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/lhash/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md2/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/mdc2/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/mem.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/mem_dbg.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_dat.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_dat.pl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/ocsp_ext.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/ocsp_lib.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/ocsp_vfy.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/opensslconf.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/opensslv.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_lib.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_pkey.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pk7_doit.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_egd.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_unix.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_win.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/randfile.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc2/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc5/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ripemd/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/asm/sha1-586.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/stack/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/threads/mttest.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/txt_db/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ui/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ui/ui_lib.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/by_dir.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_txt.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_vfy.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_vfy.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509type.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_alt.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_crld.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_info.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_purp.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/config.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/openssl.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/s_client.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/s_time.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/smime.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/BIO_f_ssl.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/CONF_modules_free.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/CONF_modules_load_file.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/EVP_BytesToKey.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/EVP_DigestInit.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/OPENSSL_config.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/OPENSSL_load_builtin_modules.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/OpenSSL_add_all_algorithms.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/RSA_print.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/d2i_DSAPublicKey.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/d2i_RSAPublicKey.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/des.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/pem.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/ui.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_COMP_add_compression_method.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssleay.txt#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/openssl.spec#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/kssl.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_clnt.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_enc.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_lib.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_pkt.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_srvr.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_clnt.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_enc.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_lib.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_pkt.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_srvr.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_asn1.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_cert.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_ciph.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_lib.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_sess.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssltest.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/test/Makefile.ssl#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/tools/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/tools/c_rehash#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/extract-names.pl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/mk1mf.pl#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/mkdef.pl#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/pl/OS2-EMX.pl#2 integrate .. //depot/projects/trustedbsd/base/etc/Makefile#38 integrate .. //depot/projects/trustedbsd/base/etc/defaults/devfs.rules#3 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#35 integrate .. //depot/projects/trustedbsd/base/etc/devd.conf#10 integrate .. //depot/projects/trustedbsd/base/etc/etc.powerpc/ttys#1 branch .. //depot/projects/trustedbsd/base/etc/ftpusers#7 integrate .. //depot/projects/trustedbsd/base/etc/group#7 integrate .. //depot/projects/trustedbsd/base/etc/inetd.conf#11 integrate .. //depot/projects/trustedbsd/base/etc/isdn/Makefile#6 integrate .. //depot/projects/trustedbsd/base/etc/mail/aliases#8 integrate .. //depot/projects/trustedbsd/base/etc/master.passwd#6 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#23 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#23 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#34 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.var.dist#9 integrate .. //depot/projects/trustedbsd/base/etc/namedb/named.root#3 integrate .. //depot/projects/trustedbsd/base/etc/netstart#5 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/xdm#7 integrate .. //depot/projects/trustedbsd/base/etc/pccard_ether#9 integrate .. //depot/projects/trustedbsd/base/etc/periodic/daily/110.clean-tmps#3 integrate .. //depot/projects/trustedbsd/base/etc/pf.conf#1 branch .. //depot/projects/trustedbsd/base/etc/pf.os#1 branch .. //depot/projects/trustedbsd/base/etc/protocols#6 integrate .. //depot/projects/trustedbsd/base/etc/rc#24 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/DAEMON#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/LOGIN#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#17 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/NETWORKING#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/SERVERS#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/abi#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/accounting#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/addswap#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/adjkerntz#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/amd#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/apm#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/apmd#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/archdep#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/atm1#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/atm2#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/atm3#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/bgfsck#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/bootparams#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ccd#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/cleanvar#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/cleartmp#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/cron#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/devd#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/devfs#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/dhclient#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/diskless#11 delete .. //depot/projects/trustedbsd/base/etc/rc.d/dmesg#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/dumpon#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/fsck#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/gbde#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/gbde_swap#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/hostname#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ike#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/inetd#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/initdiskless#12 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/initrandom#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ip6fw#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipfilter#12 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipfs#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipfw#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipmon#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipnat#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipsec#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipxrouted#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/isdnd#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/jail#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/kldxref#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ldconfig#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/local#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/lomac#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/lpd#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mixer#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/motd#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mountcritlocal#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mountcritremote#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mountd#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/moused#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mroute6d#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mrouted#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/named#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/netif#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/netoptions#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/network_ipv6#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/nfsclient#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/nfsd#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/nfslocking#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/nfsserver#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ntpd#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ntpdate#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pccard#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pcvt#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pf#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/power_profile#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ppp-user#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pppoed#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pwcheck#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/quota#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ramdisk#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/random#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 26 11:31:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF00816A4D1; Fri, 26 Mar 2004 11:31:32 -0800 (PST) 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 B5E3216A4CF for ; Fri, 26 Mar 2004 11:31:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AAB0843D1D for ; Fri, 26 Mar 2004 11:31:32 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2QJVWGe073728 for ; Fri, 26 Mar 2004 11:31:32 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2QJVSor073671 for perforce@freebsd.org; Fri, 26 Mar 2004 11:31:28 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 26 Mar 2004 11:31:28 -0800 (PST) Message-Id: <200403261931.i2QJVSor073671@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 49731 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Mar 2004 19:31:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=49731 Change 49731 by jhb@jhb_slimer on 2004/03/26 11:30:53 IFC @49729. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/interrupt.c#26 integrate .. //depot/projects/smpng/sys/alpha/alpha/uio_machdep.c#1 branch .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#31 integrate .. //depot/projects/smpng/sys/alpha/include/_types.h#4 integrate .. //depot/projects/smpng/sys/alpha/isa/isa.c#12 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#26 integrate .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#8 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#8 integrate .. //depot/projects/smpng/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#15 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#15 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/smpng/sys/amd64/include/_types.h#3 integrate .. //depot/projects/smpng/sys/amd64/isa/atpic.c#5 integrate .. //depot/projects/smpng/sys/amd64/isa/isa.c#4 integrate .. //depot/projects/smpng/sys/arm/include/_types.h#3 integrate .. //depot/projects/smpng/sys/boot/alpha/common/conf.c#4 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/boot0ext.s#1 branch .. //depot/projects/smpng/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#9 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#46 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#12 integrate .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#9 integrate .. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#7 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#13 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#11 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#31 integrate .. //depot/projects/smpng/sys/conf/NOTES#65 integrate .. //depot/projects/smpng/sys/conf/files#107 integrate .. //depot/projects/smpng/sys/conf/files.alpha#27 integrate .. //depot/projects/smpng/sys/conf/files.amd64#14 integrate .. //depot/projects/smpng/sys/conf/files.i386#57 integrate .. //depot/projects/smpng/sys/conf/files.ia64#38 integrate .. //depot/projects/smpng/sys/conf/files.pc98#55 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#19 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#36 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#35 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#32 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/CHANGES.txt#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acglobal.h#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acmacros.h#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acobject.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl2.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actypes.h#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acutils.h#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/amlcode.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslutils.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbexec.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmethod.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpe.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/excreate.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmutex.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsaccess.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsalloc.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nseval.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psparse.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psscope.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/uteval.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utglobal.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/oltr/if_oltr.c#8 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.c#3 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.h#2 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_norm.c#3 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_osfp.c#2 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#29 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdInterrupt.c#10 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#62 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#22 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#25 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#20 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#15 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#14 integrate .. //depot/projects/smpng/sys/dev/adlink/adlink.c#8 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_eisa.c#6 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/advansys/adw_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/aha/aha_isa.c#9 integrate .. //depot/projects/smpng/sys/dev/aha/aha_mca.c#7 integrate .. //depot/projects/smpng/sys/dev/ahb/ahb.c#10 integrate .. //depot/projects/smpng/sys/dev/aic/aic_cbus.c#4 integrate .. //depot/projects/smpng/sys/dev/aic/aic_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/aic/aic_pccard.c#7 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_eisa.c#11 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_pci.c#17 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahd_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/amd/amd.c#11 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#38 integrate .. //depot/projects/smpng/sys/dev/ar/if_ar.c#12 integrate .. //depot/projects/smpng/sys/dev/arl/if_arl.c#2 integrate .. //depot/projects/smpng/sys/dev/arl/if_arl_isa.c#2 integrate .. //depot/projects/smpng/sys/dev/arl/if_arlreg.h#2 integrate .. //depot/projects/smpng/sys/dev/asr/asr.c#23 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#50 integrate .. //depot/projects/smpng/sys/dev/ata/ata-cbus.c#9 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#33 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#42 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#16 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/awi/awi.c#17 integrate .. //depot/projects/smpng/sys/dev/awi/if_awi_pccard.c#11 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#6 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#41 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#21 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_eisa.c#7 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_mca.c#6 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#19 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#28 integrate .. //depot/projects/smpng/sys/dev/cm/smc90cx6.c#9 integrate .. //depot/projects/smpng/sys/dev/cnw/if_cnw.c#16 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs.c#8 integrate .. //depot/projects/smpng/sys/dev/ct/ct_isa.c#9 integrate .. //depot/projects/smpng/sys/dev/digi/digi_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_scsi.c#11 integrate .. //depot/projects/smpng/sys/dev/drm/drm_irq.h#3 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed.c#20 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#31 integrate .. //depot/projects/smpng/sys/dev/en/if_en_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep.c#15 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_eisa.c#8 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex.c#9 integrate .. //depot/projects/smpng/sys/dev/fatm/if_fatm.c#9 integrate .. //depot/projects/smpng/sys/dev/fb/s3_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe.c#11 integrate .. //depot/projects/smpng/sys/dev/firewire/fwdev.c#16 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#25 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#49 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#17 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/gfb/gfb_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/gx/if_gx.c#15 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm.c#13 integrate .. //depot/projects/smpng/sys/dev/hfa/hfa_freebsd.c#6 integrate .. //depot/projects/smpng/sys/dev/hifn/hifn7751.c#15 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme.c#14 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_sbus.c#7 integrate .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/ida/ida_eisa.c#8 integrate .. //depot/projects/smpng/sys/dev/ida/ida_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/idt/idt_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/ie/if_ie.c#10 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#12 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/iir/iir.h#8 integrate .. //depot/projects/smpng/sys/dev/iir/iir_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/ips/ips.h#7 integrate .. //depot/projects/smpng/sys/dev/ips/ips_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#23 integrate .. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#8 integrate .. //depot/projects/smpng/sys/dev/ispfw/ispfw.c#7 integrate .. //depot/projects/smpng/sys/dev/joy/joy.c#8 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#20 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc_cbus.c#6 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/matcd/matcd_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/mcd/mcd_isa.c#5 integrate .. //depot/projects/smpng/sys/dev/md/md.c#48 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx.c#15 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/mly/mly.c#22 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/musycc/musycc.c#8 integrate .. //depot/projects/smpng/sys/dev/my/if_my.c#16 integrate .. //depot/projects/smpng/sys/dev/ncv/ncr53c500_pccard.c#13 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#30 integrate .. //depot/projects/smpng/sys/dev/nsp/nsp_pccard.c#10 integrate .. //depot/projects/smpng/sys/dev/owi/if_owi.c#6 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_attach.c#5 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#27 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#36 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#36 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#41 integrate .. //depot/projects/smpng/sys/dev/pci/isa_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/pcic/i82365.c#9 integrate .. //depot/projects/smpng/sys/dev/pcic/i82365_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/pdq/if_fea.c#8 integrate .. //depot/projects/smpng/sys/dev/pdq/if_fpa.c#8 integrate .. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#10 integrate .. //depot/projects/smpng/sys/dev/ppbus/lpbb.c#5 integrate .. //depot/projects/smpng/sys/dev/ppbus/lpt.c#9 integrate .. //depot/projects/smpng/sys/dev/ppbus/pcfclock.c#9 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppi.c#9 integrate .. //depot/projects/smpng/sys/dev/ppbus/pps.c#13 integrate .. //depot/projects/smpng/sys/dev/ppbus/vpo.c#8 integrate .. //depot/projects/smpng/sys/dev/ppc/ppc.c#3 integrate .. //depot/projects/smpng/sys/dev/pst/pst-pci.c#5 integrate .. //depot/projects/smpng/sys/dev/puc/puc.c#17 integrate .. //depot/projects/smpng/sys/dev/ray/if_ray.c#12 integrate .. //depot/projects/smpng/sys/dev/rc/rc.c#9 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#8 integrate .. //depot/projects/smpng/sys/dev/rp/rp_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#16 integrate .. //depot/projects/smpng/sys/dev/safe/safe.c#5 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni_isa.c#9 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/sbsh/if_sbsh.c#6 integrate .. //depot/projects/smpng/sys/dev/scd/scd_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/si/si_eisa.c#3 integrate .. //depot/projects/smpng/sys/dev/si/si_isa.c#5 integrate .. //depot/projects/smpng/sys/dev/si/si_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#40 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn.c#15 integrate .. //depot/projects/smpng/sys/dev/snc/if_snc.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ess.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/isa/gusc.c#3 integrate .. //depot/projects/smpng/sys/dev/sound/isa/gusmidi.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/isa/mpu.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/isa/mss.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb16.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb8.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sbc.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/isa/uartsio.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pci/als4000.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/pci/au88x0.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pci/aureal.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#19 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cs4281.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pci/csa.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pci/csamidi.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/pci/csapcm.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ds1.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#17 integrate .. //depot/projects/smpng/sys/dev/sound/pci/es137x.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pci/fm801.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#26 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro3.c#17 integrate .. //depot/projects/smpng/sys/dev/sound/pci/neomagic.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pci/solo.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/pci/t4dwave.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via8233.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via82c686.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pci/vibes.c#10 integrate .. //depot/projects/smpng/sys/dev/sr/if_sr.c#13 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30_subr.c#3 integrate .. //depot/projects/smpng/sys/dev/sym/sym_hipd.c#17 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#37 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#16 integrate .. //depot/projects/smpng/sys/dev/trm/trm.c#16 integrate .. //depot/projects/smpng/sys/dev/twe/twe.c#10 integrate .. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#20 integrate .. //depot/projects/smpng/sys/dev/twe/twevar.h#7 integrate .. //depot/projects/smpng/sys/dev/tx/if_tx.c#17 integrate .. //depot/projects/smpng/sys/dev/txp/if_txp.c#19 integrate .. //depot/projects/smpng/sys/dev/uart/uart_core.c#3 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu.h#3 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_alpha.c#3 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_amd64.c#3 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_i386.c#3 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_ia64.c#3 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_pc98.c#3 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_sparc64.c#4 integrate .. //depot/projects/smpng/sys/dev/uart/uart_subr.c#1 branch .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/ehci.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/ehcireg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/ohci.c#29 integrate .. //depot/projects/smpng/sys/dev/usb/ohci_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/uftdi.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/uhci_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#49 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs.h#49 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#49 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumobj.h#6 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumrequest.c#16 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumvar.h#9 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx_eisa.c#7 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#61 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#27 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#18 integrate .. //depot/projects/smpng/sys/dev/wl/if_wl.c#18 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe.c#16 integrate .. //depot/projects/smpng/sys/dev/zs/zs_macio.c#3 integrate .. //depot/projects/smpng/sys/dev/zs/zs_sbus.c#4 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#40 integrate .. //depot/projects/smpng/sys/i386/bios/smapi.c#6 integrate .. //depot/projects/smpng/sys/i386/bios/smbios.c#3 integrate .. //depot/projects/smpng/sys/i386/bios/vpd.c#3 integrate .. //depot/projects/smpng/sys/i386/i386/uio_machdep.c#1 branch .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#50 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#14 integrate .. //depot/projects/smpng/sys/i386/include/_types.h#6 integrate .. //depot/projects/smpng/sys/i386/isa/atpic.c#5 integrate .. //depot/projects/smpng/sys/i386/isa/ic/scd1400.h#2 delete .. //depot/projects/smpng/sys/i386/isa/if_el.c#10 integrate .. //depot/projects/smpng/sys/i386/isa/isa.c#6 integrate .. //depot/projects/smpng/sys/i386/isa/mse.c#11 integrate .. //depot/projects/smpng/sys/i386/isa/spic.c#10 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_isa.c#9 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_pci.c#10 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#11 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#12 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#8 integrate .. //depot/projects/smpng/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_avm_a1.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_ctx_s0P.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_drn_ngo.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#7 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_isic_pnp.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_itk_ix1.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s016.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s0163.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s08.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_usr_sti.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_pci.c#12 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_pci.c#7 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC.hints#6 integrate .. //depot/projects/smpng/sys/ia64/ia64/uio_machdep.c#1 branch .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#38 integrate .. //depot/projects/smpng/sys/ia64/include/_types.h#6 integrate .. //depot/projects/smpng/sys/ia64/include/cpufunc.h#20 integrate .. //depot/projects/smpng/sys/ia64/include/reg.h#10 integrate .. //depot/projects/smpng/sys/ia64/isa/isa.c#3 integrate .. //depot/projects/smpng/sys/isa/atkbd_isa.c#8 integrate .. //depot/projects/smpng/sys/isa/atkbdc_isa.c#8 integrate .. //depot/projects/smpng/sys/isa/fd.c#31 integrate .. //depot/projects/smpng/sys/isa/isa_common.c#13 integrate .. //depot/projects/smpng/sys/isa/orm.c#4 integrate .. //depot/projects/smpng/sys/isa/psm.c#22 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#32 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#75 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#60 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#54 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#27 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#32 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#114 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#35 integrate .. //depot/projects/smpng/sys/kern/sysv_sem.c#26 integrate .. //depot/projects/smpng/sys/kern/uipc_cow.c#15 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#32 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#49 integrate .. //depot/projects/smpng/sys/modules/Makefile#73 integrate .. //depot/projects/smpng/sys/modules/arl/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/netgraph/sppp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/uart/Makefile#2 integrate .. //depot/projects/smpng/sys/net/if_arcsubr.c#12 integrate .. //depot/projects/smpng/sys/net/if_gif.c#19 integrate .. //depot/projects/smpng/sys/net/if_gre.c#15 integrate .. //depot/projects/smpng/sys/net/if_gre.h#7 integrate .. //depot/projects/smpng/sys/net/if_tap.c#26 integrate .. //depot/projects/smpng/sys/net/if_tapvar.h#5 integrate .. //depot/projects/smpng/sys/net/if_tun.c#31 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#7 integrate .. //depot/projects/smpng/sys/netatalk/aarp.c#11 integrate .. //depot/projects/smpng/sys/netatalk/at_control.c#9 integrate .. //depot/projects/smpng/sys/netatalk/at_rmx.c#2 integrate .. //depot/projects/smpng/sys/netatalk/at_var.h#3 integrate .. //depot/projects/smpng/sys/netatalk/ddp_input.c#9 integrate .. //depot/projects/smpng/sys/netatalk/ddp_output.c#6 integrate .. //depot/projects/smpng/sys/netatalk/ddp_pcb.c#1 branch .. //depot/projects/smpng/sys/netatalk/ddp_pcb.h#1 branch .. //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#18 integrate .. //depot/projects/smpng/sys/netatalk/ddp_var.h#2 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.h#8 integrate .. //depot/projects/smpng/sys/netgraph/ng_sppp.c#1 branch .. //depot/projects/smpng/sys/netgraph/ng_sppp.h#1 branch .. //depot/projects/smpng/sys/netgraph/ng_tee.c#9 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#23 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#43 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#27 integrate .. //depot/projects/smpng/sys/netinet/ip_gre.c#12 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#54 integrate .. //depot/projects/smpng/sys/nfsclient/nfs.h#16 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#22 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_subs.c#17 integrate .. //depot/projects/smpng/sys/pc98/pc98/canbus.c#2 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#30 integrate .. //depot/projects/smpng/sys/pc98/pc98/mse.c#9 integrate .. //depot/projects/smpng/sys/pc98/pc98/olpt.c#9 integrate .. //depot/projects/smpng/sys/pc98/pc98/pc98kbd.c#5 integrate .. //depot/projects/smpng/sys/pc98/pc98/ppc.c#7 integrate .. //depot/projects/smpng/sys/pc98/pc98/sio.c#37 integrate .. //depot/projects/smpng/sys/pccard/mecia.c#4 integrate .. //depot/projects/smpng/sys/pccard/pcic_pci.c#31 integrate .. //depot/projects/smpng/sys/pci/agp.c#19 integrate .. //depot/projects/smpng/sys/pci/agp_amd.c#11 integrate .. //depot/projects/smpng/sys/pci/agp_i810.c#13 integrate .. //depot/projects/smpng/sys/pci/alpm.c#8 integrate .. //depot/projects/smpng/sys/pci/amdpm.c#10 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#53 integrate .. //depot/projects/smpng/sys/pci/if_de.c#15 integrate .. //depot/projects/smpng/sys/pci/if_mn.c#9 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#24 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#46 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#26 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#39 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#30 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#28 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#36 integrate .. //depot/projects/smpng/sys/pci/if_tl.c#21 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#24 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#23 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#42 integrate .. //depot/projects/smpng/sys/pci/intpm.c#9 integrate .. //depot/projects/smpng/sys/pci/ncr.c#14 integrate .. //depot/projects/smpng/sys/pci/viapm.c#6 integrate .. //depot/projects/smpng/sys/pci/xrpu.c#13 integrate .. //depot/projects/smpng/sys/powerpc/include/_types.h#4 integrate .. //depot/projects/smpng/sys/powerpc/powermac/hrowpic.c#4 integrate .. //depot/projects/smpng/sys/powerpc/powermac/openpic_macio.c#4 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/uio_machdep.c#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#33 integrate .. //depot/projects/smpng/sys/powerpc/psim/openpic_iobus.c#2 integrate .. //depot/projects/smpng/sys/rpc/rpcclnt.c#5 integrate .. //depot/projects/smpng/sys/sparc64/include/_types.h#5 integrate .. //depot/projects/smpng/sys/sparc64/isa/isa.c#10 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/eeprom_ebus.c#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/eeprom_fhc.c#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/eeprom_sbus.c#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#21 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/uio_machdep.c#1 branch .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#39 integrate .. //depot/projects/smpng/sys/sys/bus.h#14 integrate .. //depot/projects/smpng/sys/sys/param.h#60 integrate .. //depot/projects/smpng/sys/sys/sf_buf.h#3 integrate .. //depot/projects/smpng/sys/sys/tree.h#2 integrate .. //depot/projects/smpng/sys/sys/types.h#24 integrate .. //depot/projects/smpng/sys/sys/uio.h#17 integrate .. //depot/projects/smpng/sys/sys/wait.h#6 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#25 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#58 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#43 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/interrupt.c#26 (text+ko) ==== @@ -35,7 +35,7 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.76 2003/11/17 06:10:14 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.77 2004/03/23 22:28:16 jhb Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#31 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.99 2003/12/28 08:57:08 silby Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.100 2004/03/16 19:04:27 alc Exp $"); #include "opt_kstack_pages.h" @@ -437,27 +437,12 @@ } /* - * Detatch mapped page and release resources back to the system. + * Release resources back to the system. */ void -sf_buf_free(void *addr, void *args) +sf_buf_free(struct sf_buf *sf) { - struct sf_buf *sf; - struct vm_page *m; - sf = args; - m = sf->m; - vm_page_lock_queues(); - vm_page_unwire(m, 0); - /* - * Check for the object going away on us. This can - * happen since we don't hold a reference to it. - * If so, we're responsible for freeing the page. - */ - if (m->wire_count == 0 && m->object == NULL) - vm_page_free(m); - vm_page_unlock_queues(); - sf->m = NULL; mtx_lock(&sf_freelist.sf_lock); SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); nsfbufsused--; ==== //depot/projects/smpng/sys/alpha/include/_types.h#4 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/alpha/include/_types.h,v 1.4 2003/03/25 00:07:00 jake Exp $ + * $FreeBSD: src/sys/alpha/include/_types.h,v 1.5 2004/03/20 20:41:39 marcel Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -55,6 +55,7 @@ * Standard type definitions. */ typedef __int32_t __clock_t; /* clock()... */ +typedef unsigned int __cpumask_t; typedef __int64_t __critical_t; typedef double __double_t; typedef float __float_t; ==== //depot/projects/smpng/sys/alpha/isa/isa.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.34 2003/11/17 06:10:14 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.35 2004/03/17 21:45:55 jmg Exp $"); #include #include @@ -169,9 +169,7 @@ u_long start, u_long end, u_long count, u_int flags) { /* - * Consider adding a resource definition. We allow rid 0-1 for - * irq and drq, 0-3 for memory and 0-7 for ports which is - * sufficient for isapnp. + * Consider adding a resource definition. */ int passthrough = (device_get_parent(child) != bus); int isdefault = (start == 0UL && end == ~0UL); ==== //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#26 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.45 2004/02/04 21:52:52 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.46 2004/03/17 19:59:59 jhb Exp $"); #include #include @@ -68,6 +68,7 @@ #include #include #include +#include #include #include @@ -1376,27 +1377,23 @@ struct thread *td; struct osf1_wait4_args *uap; { - int error; - caddr_t sg; - struct osf1_rusage *orusage, oru; - struct rusage *rusage = NULL, ru; + int error, status; + struct osf1_rusage oru; + struct rusage ru; - orusage = uap->rusage; - if (orusage) { - sg = stackgap_init(); - rusage = stackgap_alloc(&sg, sizeof(struct rusage)); - uap->rusage = (struct osf1_rusage *)rusage; - } - if ((error = wait4(td, (struct wait_args *)uap))) - return error; - if (orusage && (error = copyin(rusage, &ru, sizeof(ru)) == 0)){ + error = kern_wait(td, uap->pid, &status, uap->options, &ru); + if (error) + return (error); + if (uap->status != NULL) + error = copyout(&status, uap->status, sizeof(status)); + if (uap->rusage != NULL && error == 0) { TV_CP(ru.ru_utime, oru.ru_utime); TV_CP(ru.ru_stime, oru.ru_stime); bcopy(&ru.ru_first, &oru.ru_first, (&(oru.ru_last) - &(oru.ru_first))); - copyout(&oru, orusage, sizeof (struct osf1_rusage)); + error = copyout(&oru, uap->rusage, sizeof (struct osf1_rusage)); } - return (0); + return (error); } ==== //depot/projects/smpng/sys/amd64/amd64/identcpu.c#8 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.129 2004/03/06 00:51:30 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.130 2004/03/25 03:38:31 peter Exp $"); #include "opt_cpu.h" @@ -73,6 +73,7 @@ static void print_AMD_info(void); static void print_AMD_assoc(int i); +int cpu_feature2; /* XXX change cpu_feature to long? */ int cpu_class; u_int cpu_exthigh; /* Highest arg to extended CPUID */ char machine[] = "amd64"; @@ -218,6 +219,44 @@ "\040PBE" /* Pending Break Enable */ ); + if (cpu_feature2 != 0) { + printf("\n Features2=0x%b", cpu_feature2, + "\020" + "\001SSE3" /* SSE3 */ + "\002" + "\003RSVD2>" /* "Reserved" bit 2 */ + "\004MON" /* MONITOR/MWAIT Instructions */ + "\005DS_CPL" /* CPL Qualified Debug Store */ + "\006" /* Machine specific registers */ + "\007" /* Physical address extension */ + "\010EST" /* Enhanced SpeedStep */ + "\011TM2" /* Thermal Monitor 2 */ + "\012" + "\013CNTX-ID" /* L1 context ID available */ + "\014" + "\015" + "\016CX16" /* CMPXCHG16B Instruction */ + "\017" + "\020" + "\021" + "\022" + "\023" + "\024" + "\025" + "\026" + "\027" + "\030" + "\031" + "\032" + "\033" + "\034" + "\035" + "\036" + "\037" + "\040" + ); + } + /* * If this CPU supports hyperthreading then mention * the number of logical CPU's it contains. @@ -227,10 +266,8 @@ printf("\n Hyperthreading: %d logical CPUs", (cpu_procinfo & CPUID_HTT_CORES) >> 16); } - if (strcmp(cpu_vendor, "AuthenticAMD") == 0 && - cpu_exthigh >= 0x80000001) + if (cpu_exthigh >= 0x80000001) print_AMD_features(); - } else if (strcmp(cpu_vendor, "CyrixInstead") == 0) { } /* Avoid ugly blank lines: only print newline when we have to. */ if (*cpu_vendor || cpu_id) @@ -285,6 +322,7 @@ cpu_id = regs[0]; cpu_procinfo = regs[1]; cpu_feature = regs[3]; + cpu_feature2 = regs[2]; /* XXX */ cpu = CPU_CLAWHAMMER; @@ -339,7 +377,7 @@ * http://www.amd.com/products/cpg/athlon/techdocs/pdf/20734.pdf */ do_cpuid(0x80000001, regs); - printf("\n AMD Features=0x%b", regs[3] &~ cpu_feature, + printf("\n AMD Features=0x%b", regs[3] & ~(cpu_feature & 0x0183f3ff), "\020" /* in hex */ "\001FPU" /* Integral FPU */ "\002VME" /* Extended VM86 mode support */ @@ -356,7 +394,7 @@ "\015MTRR" /* Memory Type Range Registers */ "\016PGE" /* PG_G (global bit) support */ "\017MCA" /* Machine Check Architecture */ - "\020ICMOV" /* CMOV instruction */ + "\020CMOV" /* CMOV instruction */ "\021PAT" /* Page attributes table */ "\022PGE36" /* 36 bit address space support */ "\023RSVD" /* Reserved, unknown */ ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.235 2004/03/08 00:25:03 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.236 2004/03/18 02:53:38 obrien Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -1016,7 +1016,8 @@ return (error); } SYSCTL_PROC(_machdep, OID_AUTO, hlt_cpus, CTLTYPE_INT|CTLFLAG_RW, - 0, 0, sysctl_hlt_cpus, "IU", ""); + 0, 0, sysctl_hlt_cpus, "IU", + "Bitmap of CPUs to halt. 101 (binary) will halt CPUs 0 and 2."); static int sysctl_hlt_logical_cpus(SYSCTL_HANDLER_ARGS) ==== //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#15 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.228 2004/01/28 23:58:55 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.230 2004/03/25 03:39:38 peter Exp $"); #include "opt_isa.h" #include "opt_kstack_pages.h" @@ -124,7 +124,8 @@ fpuexit(td1); /* Point the pcb to the top of the stack */ - pcb2 = (struct pcb *)(td2->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; + pcb2 = (struct pcb *)(td2->td_kstack + + td2->td_kstack_pages * PAGE_SIZE) - 1; td2->td_pcb = pcb2; /* Copy p1's pcb */ @@ -247,8 +248,8 @@ cpu_thread_setup(struct thread *td) { - td->td_pcb = - (struct pcb *)(td->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; + td->td_pcb = (struct pcb *)(td->td_kstack + + td->td_kstack_pages * PAGE_SIZE) - 1; td->td_frame = (struct trapframe *)td->td_pcb - 1; } @@ -490,27 +491,12 @@ } /* - * Detatch mapped page and release resources back to the system. + * Release resources back to the system. */ void -sf_buf_free(void *addr, void *args) +sf_buf_free(struct sf_buf *sf) { - struct sf_buf *sf; - struct vm_page *m; - sf = args; - m = sf->m; - vm_page_lock_queues(); - vm_page_unwire(m, 0); - /* - * Check for the object going away on us. This can - * happen since we don't hold a reference to it. - * If so, we're responsible for freeing the page. - */ - if (m->wire_count == 0 && m->object == NULL) - vm_page_free(m); - vm_page_unlock_queues(); - sf->m = NULL; mtx_lock(&sf_freelist.sf_lock); SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); nsfbufsused--; ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#15 (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.404 2004/03/15 00:49:39 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.405 2004/03/25 03:19:28 obrien Exp $ machine amd64 cpu HAMMER @@ -39,6 +39,7 @@ options NFSCLIENT # Network Filesystem Client options NFSSERVER # Network Filesystem Server options NFS_ROOT # NFS usable as /, requires NFSCLIENT +options NTFS # NT File System options MSDOSFS # MSDOS Filesystem options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) ==== //depot/projects/smpng/sys/amd64/conf/GENERIC.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.12 2003/05/01 01:05:22 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.14 2004/03/19 03:28:38 obrien Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" @@ -7,20 +7,6 @@ hint.fd.0.drive="0" hint.fd.1.at="fdc0" hint.fd.1.drive="1" -hint.ata.0.at="isa" -hint.ata.0.port="0x1F0" -hint.ata.0.irq="14" -hint.ata.1.at="isa" -hint.ata.1.port="0x170" -hint.ata.1.irq="15" -hint.adv.0.at="isa" -hint.adv.0.disabled="1" -hint.bt.0.at="isa" -hint.bt.0.disabled="1" -hint.aha.0.at="isa" -hint.aha.0.disabled="1" -hint.aic.0.at="isa" -hint.aic.0.disabled="1" hint.atkbdc.0.at="isa" hint.atkbdc.0.port="0x060" hint.atkbd.0.at="atkbdc" @@ -31,8 +17,6 @@ hint.vga.0.at="isa" hint.sc.0.at="isa" hint.sc.0.flags="0x100" -hint.vt.0.at="isa" -hint.vt.0.disabled="1" hint.pcic.0.at="isa" # hint.pcic.0.irq="10" # Default to polling hint.pcic.0.port="0x3e0" @@ -59,33 +43,3 @@ hint.sio.3.irq="9" hint.ppc.0.at="isa" hint.ppc.0.irq="7" -hint.ed.0.at="isa" -hint.ed.0.disabled="1" -hint.ed.0.port="0x280" -hint.ed.0.irq="10" -hint.ed.0.maddr="0xd8000" -hint.cs.0.at="isa" -hint.cs.0.disabled="1" -hint.cs.0.port="0x300" -hint.sn.0.at="isa" -hint.sn.0.disabled="1" -hint.sn.0.port="0x300" -hint.sn.0.irq="10" -hint.ie.0.at="isa" -hint.ie.0.disabled="1" -hint.ie.0.port="0x300" -hint.ie.0.irq="10" -hint.ie.0.maddr="0xd0000" -hint.fe.0.at="isa" -hint.fe.0.disabled="1" -hint.fe.0.port="0x300" -hint.le.0.at="isa" -hint.le.0.disabled="1" -hint.le.0.port="0x300" -hint.le.0.irq="5" -hint.le.0.maddr="0xd0000" -hint.lnc.0.at="isa" -hint.lnc.0.disabled="1" -hint.lnc.0.port="0x280" -hint.lnc.0.irq="10" -hint.lnc.0.drq="0" ==== //depot/projects/smpng/sys/amd64/include/_types.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/amd64/include/_types.h,v 1.5 2003/05/10 00:55:15 peter Exp $ + * $FreeBSD: src/sys/amd64/include/_types.h,v 1.6 2004/03/20 20:41:39 marcel Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -55,6 +55,7 @@ * Standard type definitions. */ typedef __int32_t __clock_t; /* clock()... */ +typedef unsigned int __cpumask_t; typedef __int64_t __critical_t; typedef double __double_t; typedef double __float_t; ==== //depot/projects/smpng/sys/amd64/isa/atpic.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.9 2004/01/28 23:46:48 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.10 2004/03/17 17:50:23 njl Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" @@ -392,7 +392,7 @@ /* Try to allocate our IRQ and then free it. */ rid = 0; - res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, 0); + res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, 0); if (res != NULL) bus_release_resource(dev, SYS_RES_IRQ, rid, res); return (0); ==== //depot/projects/smpng/sys/amd64/isa/isa.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/isa.c,v 1.145 2003/11/21 03:02:00 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/isa.c,v 1.146 2004/03/17 21:45:55 jmg Exp $"); /* * Modifications for Intel architecture by Garrett A. Wollman. @@ -86,9 +86,7 @@ u_long start, u_long end, u_long count, u_int flags) { /* - * Consider adding a resource definition. We allow rid 0-1 for - * irq and drq, 0-3 for memory and 0-7 for ports which is - * sufficient for isapnp. + * Consider adding a resource definition. */ int passthrough = (device_get_parent(child) != bus); int isdefault = (start == 0UL && end == ~0UL); ==== //depot/projects/smpng/sys/arm/include/_types.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/arm/include/_types.h,v 1.3 2003/03/25 00:07:00 jake Exp $ + * $FreeBSD: src/sys/arm/include/_types.h,v 1.4 2004/03/20 20:41:39 marcel Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -63,6 +63,7 @@ * Standard type definitions. */ typedef __uint32_t __clock_t; /* clock()... */ +typedef unsigned int __cpumask_t; typedef __int32_t __critical_t; typedef __int32_t __intfptr_t; typedef __int64_t __intmax_t; ==== //depot/projects/smpng/sys/boot/alpha/common/conf.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/alpha/common/conf.c,v 1.5 2004/01/04 23:21:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/alpha/common/conf.c,v 1.6 2004/03/25 20:36:57 jhb Exp $"); #include #include "libalpha/libalpha.h" @@ -67,6 +67,7 @@ &nfs_fsops, #endif &gzipfs_fsops, + &splitfs_fsops, NULL }; ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 26 14:12:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5223716A4D0; Fri, 26 Mar 2004 14:12:23 -0800 (PST) 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 1E7A516A4CE for ; Fri, 26 Mar 2004 14:12:23 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 11A5043D45 for ; Fri, 26 Mar 2004 14:12:23 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2QMCMGe016160 for ; Fri, 26 Mar 2004 14:12:22 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2QMBpmf015755 for perforce@freebsd.org; Fri, 26 Mar 2004 14:11:51 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 26 Mar 2004 14:11:51 -0800 (PST) Message-Id: <200403262211.i2QMBpmf015755@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 49742 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Mar 2004 22:12:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=49742 Change 49742 by rwatson@rwatson_hippy on 2004/03/26 14:11:05 Integrate trustedbsd MAC branch from trustedbsd base: dd(1) grows parity support. The usual plethora of type fixes, NULL<->0 changes, whitespace changes, const poisoning, etc. Someone sorted hundreds of Makefiles resulting in tens of thousands of lines of diff I had to wade through, and will later have to resolve conflicts for. df(1) becomes more 64-bit aware. ls(1) unit support fixed. mv(1) handles moving symlinks between partitions. ps(1) support for threads improved. rmdir(1) grows -v. Many tools learn that signal numbers may exceed NSIG, including sh. Use of various contrib imported getopt(3)'s and regexp(3) removed. Import of bsnmp(3) 1.5a. CVS security fix. More tweaks to dhclient(1) in the hopes of making it work better in a more dynamic world. General improvements in multibyte character support. OpenPAM Eelgrass import. Sendmail 8.12.11 upgrade. smbfs userland utilities now use getifaddrs(). OpenSSH now defaults to protocol 2; PasswordAuthentication disabled by default when using PAM. OpenSSH 3.8p1 import. OpenSSL 0.9.7d import. OpenBSD's 'pf' firewall software is imported (kernel, userland, etc). Users proxy, authpf added. rcNG diskless overhaul. named.root update. "nojail" support in rcNG. GNU grep update. Lots of changes to libalias. Multithreaded getaddrinfo(). libdisk and sysinstall substantially more happy with 64-bit file systems. libgeom(3) re-namespaced. TCP-MD5 support. splitfs and complete rewrite of floppy disk creation during release process; no more floppy disk overflow problems. Various and sundry libthr and libpthread changes. Beginnings of changes to better support 32-bit emulation on 64-bit platforms, such as amd64. fsck now changes its process title to report status. Loopback of multilabel flag for newfs, mdmfs. Mount can now look and see if a UFS file system ufs ufs1 or ufs2, although in a somewhat dubious way. Ping no longer irritatingly hangs during DNS lookups that take a long time. routed(8) now supports MD5 checksumming. Vinum no longer supports non-devfs operation and has fewer bugs. contigmalloc() no longer needs Giant. sched_pin() now exists and allows threads to be pinned to CPUs. Console initialization reordered so that sparc64 is happy again. D_NEEDGIANT instead of D_NOGIANT. pmap_pinit2 is gone. options PFIL_HOOKS now in GENERIC. cpumask_t for cpu masks rather than int. Process lock protects rlimits. dosetrlimit(), open(), fork(), and others now use kern_foo(). ACPI upgrades, acpi_cpu, acpi_video driver. Axing of ISA compat shim drivers. FreeBSD now builds with Intel C compiler. Drivers now declare D_VERSION. Many more drivers use automatic major device number assignment. sys/compat/freebsd32 now exists. Lots less Giant required in fork, exec, wait, exit, open; many proc locking improvements. Advent of Project Evil -- support for NDIS drivers on ia32; now also supports pccard, etc. mac_inet and mac_socket breakout from mac_net loopback. Standard watchdog(9) API for watchdog drivers. bus_alloc_resource_any() instead of bus_alloc_resource() in many cases. Various ataNG reliability fixes. if_awi uses 802.11 network framework rather than rolling its own. DRM upgrade, security fix. Ethernet subsystem now announces ethernet addresses, rather than each driver. Goodbye to raidframe. Interface cloning changes; devfs cloning changes: support for 'struct clonedevs' and automatic reclaim on clone state on clone_cleanup() during driver unload. Locking for if_tap. PCM locking fixes. Usual plethora of new vendor IDs for USB, PCI, et al. Giant pushed down in process exit hooks. Unionfs bugfixes. Many geom fixes, API changes, documentation, etc. SCHED_ULE is now the default; many ULE bugfixes, optimizations, and KSE friendliness. Sleep queues. dev_t reference counting. File descriptor allocation performance optimization. Processes in jail can now be restricted from seeing file systems in mount/df. crfree() no longer requires Giant as vrele() on prison vnode root is deferred using callout. Resource limits on the amount of wired memory a process can request during sysctl. Pipe allocation optimized by joining the two pipe endpoints into a single pipe pair; MAC Framework now acts on pipe pairs, not pipes. Mutex profiling now measures contention. Can now reset mutex profiling stats. WITNESS APIs broken out so order checks can take place without acquisition. mi_switch() now takes an explicit voluntary/involuntary flag. Sysctls for process information query now support thread lookup by process, etc. Resource limits on threads/proc, etc, bumped up to take into account MySQL using a lot of threads. HZ on amd64 1024 by default. Improved support for CPU topology. Expensive diagnostic checks now under diagnostics, not under invariants. ptrace, et al, use a new uiomove_fromphys(). ttyinfo() much more informative in the presence of KSE, etc. Malloc flags now passed to various socket allocators rather than custom flags. SO_BINTIME support to timestamp messages using binary timestamps. dup_sockaddr() -> sodupsockaddr. kthreads no longer need Giant to exit. mount()/umount() no longer permitted in jail. Option to disable certain types of hard linking based on subject/object uid and gid. geom_concat module. Giant pushed off MAC Framework BPF code. PFIL_HOOKS for ifnet arrival, clone, departure, etc. Fine-grained locking for if_disc, if_faith, if_gif, if_gre, if_lo, if_stf, if_tap. AF_ARP support. tun_proc -> tun_pid. Various and sundry 802.11 protocol fixes. PCB routines in ddp_usrreq.c broken out into ddp_pcb.c. Nasty MT_TAG stuff removed from ip_input() -- now m_tags are used to carry around meta-data, etc, for DUMMYNET and friends. Much cleaner and nicer. DUMMYNET locking fixes. IP encapsulation library now has fine-grained locking. TCP reassembly queue resource bounds to address DoS issues. Various NFSv4 bug fixes. sysctl changes to MAC Framework to better reflect sysctl API. DIRHASH locking abstracted for portability. smbfs fixes. UMA now reclaims memory more correctly (at all). gaithrstress getaddrinfo() regression tester. ipcs can display information "by user". rmuser now deletes IPC objects for the user when the user is deleted. Countless other bug fixes, enhancements, documentation changes, etc. Affected files ... .. //depot/projects/trustedbsd/mac/MAINTAINERS#21 integrate .. //depot/projects/trustedbsd/mac/Makefile#28 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#46 integrate .. //depot/projects/trustedbsd/mac/UPDATING#37 integrate .. //depot/projects/trustedbsd/mac/UPDATING.64BTT#1 branch .. //depot/projects/trustedbsd/mac/bin/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/bin/cat/cat.1#3 integrate .. //depot/projects/trustedbsd/mac/bin/chflags/chflags.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/csh/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/bin/date/date.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/dd/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/bin/dd/args.c#11 integrate .. //depot/projects/trustedbsd/mac/bin/dd/dd.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/dd/dd.c#11 integrate .. //depot/projects/trustedbsd/mac/bin/dd/dd.h#5 integrate .. //depot/projects/trustedbsd/mac/bin/dd/gen.c#1 branch .. //depot/projects/trustedbsd/mac/bin/dd/ref.ascii#1 branch .. //depot/projects/trustedbsd/mac/bin/dd/ref.ebcdic#1 branch .. //depot/projects/trustedbsd/mac/bin/dd/ref.ibm#1 branch .. //depot/projects/trustedbsd/mac/bin/dd/ref.lcase#1 branch .. //depot/projects/trustedbsd/mac/bin/dd/ref.oldascii#1 branch .. //depot/projects/trustedbsd/mac/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/trustedbsd/mac/bin/dd/ref.oldibm#1 branch .. //depot/projects/trustedbsd/mac/bin/dd/ref.pareven#1 branch .. //depot/projects/trustedbsd/mac/bin/dd/ref.parnone#1 branch .. //depot/projects/trustedbsd/mac/bin/dd/ref.parodd#1 branch .. //depot/projects/trustedbsd/mac/bin/dd/ref.parset#1 branch .. //depot/projects/trustedbsd/mac/bin/dd/ref.swab#1 branch .. //depot/projects/trustedbsd/mac/bin/dd/ref.ucase#1 branch .. //depot/projects/trustedbsd/mac/bin/df/df.c#18 integrate .. //depot/projects/trustedbsd/mac/bin/kill/kill.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.1#22 integrate .. //depot/projects/trustedbsd/mac/bin/ls/print.c#21 integrate .. //depot/projects/trustedbsd/mac/bin/mv/mv.c#11 integrate .. //depot/projects/trustedbsd/mac/bin/pax/cache.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/pax/options.c#10 integrate .. //depot/projects/trustedbsd/mac/bin/ps/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/bin/ps/keyword.c#19 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.1#19 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.c#19 integrate .. //depot/projects/trustedbsd/mac/bin/rmail/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/bin/rmdir/rmdir.1#3 integrate .. //depot/projects/trustedbsd/mac/bin/rmdir/rmdir.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/bin/sh/eval.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/sh/input.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/jobs.c#15 integrate .. //depot/projects/trustedbsd/mac/bin/sh/parser.c#12 integrate .. //depot/projects/trustedbsd/mac/bin/sh/redir.c#10 integrate .. //depot/projects/trustedbsd/mac/bin/sh/redir.h#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/trap.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/amd.conf.5#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bc/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bc/bc/main.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bc/h/getopt.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/bc/lib/getopt.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bc/lib/getopt1.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/include/getopt.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/libiberty/getopt.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/libiberty/getopt1.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bsnmp/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/mac/contrib/bsnmp/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/NEWS#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/README#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/TODO#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/VERSION#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmptree/gensnmptree.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/asn1.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/asn1.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/asn1.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/bsnmpagent.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/bsnmpclient.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/bsnmplib.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/snmp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/snmp.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/snmpagent.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/snmpagent.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/snmpclient.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/snmpclient.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/snmppriv.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_ifmib.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_ifstack.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_ip.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_nettomedia.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_rcvaddr.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_route.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_tcp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_tree.def#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_udp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/snmp_mibII.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/snmp_mibII.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/BEGEMOT-MIB.txt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/FOKUS-MIB.txt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/action.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/bsnmpd.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/config.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/export.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/main.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/snmpd.config#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/snmpd.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/snmpd.sh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/snmpmod.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/snmpmod.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/trans_lsock.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/trans_lsock.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/trans_udp.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/trans_udp.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/trap.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/tree.def#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cpio/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cpio/getopt.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/getopt.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/getopt1.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/cvs/src/modules.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/server.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/diff/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/mac/contrib/diff/diff.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/diff/getopt.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/diff/getopt.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/diff/getopt1.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/FREEBSD-Xlist#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/FREEBSD-deletelist#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/freebsd-spec.h#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/getopt.c#7 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/getopt.h#7 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/getopt1.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/gdtoa/gethex.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtod.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/xsum0.out#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gnu-sort/lib/getopt.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/gnu-sort/lib/getopt.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gnu-sort/lib/getopt1.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/gperf/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gperf/lib/getopt.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/gperf/lib/getopt.c.patch#3 delete .. //depot/projects/trustedbsd/mac/contrib/gperf/lib/getopt.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/gperf/lib/getopt.h.patch#3 delete .. //depot/projects/trustedbsd/mac/contrib/gperf/lib/getopt1.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/FREEBSD-Xlist#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/getopt.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/getopt.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/getopt1.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/FREEBSD-upgrade#8 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/dhclient.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/convert.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/errwarn.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/hash.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/inet_addr.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/hash.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/sysconf.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/libreadline/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/bind.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/complete.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/display.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/readline.3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/mbutil.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/readline.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/readline.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rlconf.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/shell.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/terminal.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/util.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/vi_mode.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/FIXES#7 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/FREEBSD-upgrade#7 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/b.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/lex.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/main.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/run.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/CREDITS#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/HISTORY#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/RELNOTES#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/configure#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/configure.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_borrow_cred.3#13 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_free_data.3#13 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_get_option.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_log.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_nullconv.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_readline.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_restore_cred.3#13 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_set_option.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_ttyconv.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_acct_mgmt.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_authenticate.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_chauthtok.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_close_session.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_conv.3#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_end.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_error.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_authtok.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_data.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_item.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_user.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenv.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenvlist.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_info.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_open_session.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_prompt.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_putenv.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_data.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_item.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setcred.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setenv.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_authenticate.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_chauthtok.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_close_session.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_open_session.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_setcred.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_start.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_strerror.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_verror.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vinfo.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vprompt.3#16 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/openpam.h#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/openpam_version.h#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_appl.h#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_borrow_cred.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_impl.h#15 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_restore_cred.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_authtok.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_data.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_user.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_vprompt.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/ltmain.sh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/stamp-h.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/pf/authpf/authpf.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/authpf/authpf.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/authpf/pathnames.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/ftp-proxy/ftp-proxy.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/ftp-proxy/ftp-proxy.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/ftp-proxy/getline.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/ftp-proxy/util.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/ftp-proxy/util.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/man/pf.4#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/man/pf.conf.5#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/man/pf.os.5#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/man/pflog.4#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/man/pfsync.4#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/pfctl/parse.y#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/pfctl/pf_print_state.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/pfctl/pfctl.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/pfctl/pfctl.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/pfctl/pfctl.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/pfctl/pfctl_altq.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/pfctl/pfctl_osfp.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/pfctl/pfctl_parser.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/pfctl/pfctl_parser.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/pfctl/pfctl_qstats.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/pfctl/pfctl_radix.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/pfctl/pfctl_table.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/pflogd/pflogd.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/pflogd/pflogd.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/pflogd/pidfile.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/pflogd/pidfile.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/FREEBSD-upgrade#13 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/PGPKEYS#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/RELEASE_NOTES#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/README#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/submit.cf#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/cfhead.m4#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/proto.m4#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/version.m4#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/doc/op/op.me#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/libmilter/mfapi.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/libmilter/milter.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/cdefs.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/conf.h#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_setreply.html#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_connect.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/engine.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/libmilter.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/listener.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/main.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/signal.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/assert.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/exc.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/ldap.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/local.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/smrsh/smrsh.8#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/smrsh/smrsh.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/README#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/alias.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/conf.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/daemon.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/deliver.c#16 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/headers.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/main.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/milter.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/mime.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/queue.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/readcf.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/recipient.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sendmail.8#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sendmail.h#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/srvrsmtp.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/tls.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/util.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/version.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/lib/smb/nb_net.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sort/Makefile#2 delete .. //depot/projects/trustedbsd/mac/contrib/sort/append.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/sort/extern.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/sort/fields.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/sort/files.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/sort/fsort.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/sort/fsort.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/sort/init.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/sort/msort.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/sort/pathnames.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/sort/regress/Makefile#2 delete .. //depot/projects/trustedbsd/mac/contrib/sort/regress/stests#2 delete .. //depot/projects/trustedbsd/mac/contrib/sort/sort.1#2 delete .. //depot/projects/trustedbsd/mac/contrib/sort/sort.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/sort/sort.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/sort/tmp.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/tar/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tar/lib/getopt.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/tar/lib/getopt.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/tar/lib/getopt1.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/texinfo/FREEBSD-Xlist#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/getopt.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/getopt.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/getopt1.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/traceroute/traceroute.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/CREDITS#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ChangeLog#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/FREEBSD-upgrade#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/INSTALL#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/LICENCE#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/Makefile.in#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/OVERVIEW#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/README#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/README.dns#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/README.platform#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/README.privsep#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/README.smartcard#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/RFC.nroff#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/TODO#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/WARNING.RNG#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/acconfig.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/acss.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/acss.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-chall.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-krb5.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-pam.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-pam.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-passwd.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-rh-rsa.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-rhosts.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-rsa.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-shadow.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-sia.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth.h#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth1.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-gss.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-hostbased.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-passwd.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-pubkey.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/authfd.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/authfd.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/authfile.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/bufaux.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/bufaux.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/buffer.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/canohost.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/channels.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/channels.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/cipher-3des1.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/cipher-acss.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/cipher-aes.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/cipher-ctr.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/cipher.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/cipher.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/cleanup.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/clientloop.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/clientloop.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/compat.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/compat.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/compress.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/config.guess#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/config.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/config.sub#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/configure.ac#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/defines.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/dh.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/dns.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/dns.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/entropy.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/fatal.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/fixprogs#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/groupaccess.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/gss-genr.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/gss-serv-krb5.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/gss-serv.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/hostfile.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/hostfile.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/includes.h#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/install-sh#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kex.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kexgexc.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/key.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/key.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/log.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/log.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/loginrec.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/mac.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/md5crypt.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/mdoc2man.awk#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/misc.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/mkinstalldirs#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/moduli#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/moduli.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_wrap.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_wrap.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/msg.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/msg.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/nchan.ms#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/nchan2.ms#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/Makefile.in#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/base64.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/basename.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-arc4random.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-cray.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-cray.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-getpeereid.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-misc.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-misc.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-openpty.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/daemon.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/dirname.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/fake-rfc2553.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/fake-rfc2553.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getcwd.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getgrouplist.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getopt.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getrrsetbyname.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getrrsetbyname.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/glob.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/glob.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/inet_aton.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/inet_ntoa.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/inet_ntop.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/mktemp.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/openbsd-compat.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-aix.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-aix.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/readpassphrase.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/readpassphrase.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/realpath.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/rresvport.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/setenv.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/setproctitle.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/sigact.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/strlcat.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/strlcpy.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/strmode.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/strsep.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/strtoul.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/sys-queue.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/sys-tree.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/vis.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/vis.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/xcrypt.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/packet.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/pathnames.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/progressmeter.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/readconf.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/readconf.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/README.regress#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/agent-ptrace.sh#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/banner.sh#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/sftp-badcmds.sh#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/sftp-batch.sh#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/sftp-cmds.sh#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/ssh-com.sh#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/test-exec.sh#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/rijndael.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/scard-opensc.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/scp.1#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/scp.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/servconf.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/servconf.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/serverloop.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/session.c#19 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/session.h#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-client.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-client.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-common.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-common.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-glob.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-glob.h#5 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-int.c#8 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-int.h#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-server.8#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-server.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp.1#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-add.1#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-add.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-agent.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-dss.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-gss.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keygen.1#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keygen.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keyscan.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keysign.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-rand-helper.8#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-rand-helper.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-rsa.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh.1#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh.h#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config.5#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_prng_cmds.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect2.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd.8#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config#14 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config.5#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshpty.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshtty.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshtty.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/uidswap.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/uuencode.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/uuencode.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/version.h#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/CHANGES#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Configure#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/FAQ#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/LICENSE#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.org#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.ssl#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/NEWS#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/README#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/CA.pl#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/Makefile.ssl#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/apps.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/apps.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/asn1pars.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/ca.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/der_chop#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/dgst.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/enc.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/engine.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/ocsp.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/openssl.cnf#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/pkcs12.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/pkcs7.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/req.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/rsautl.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/s_socket.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/s_time.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/speed.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/x509.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/expired/vsign3.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/vsign3.pem#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/config#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes_cbc.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_gentm.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_mbstr.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_strex.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_time.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_utctm.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1_lib.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1_par.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn_moid.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/t_pkey.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_long.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bf/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/b_dump.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/b_print.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/b_sock.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bio_cb.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_conn.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_file.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/bn-586.pl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_lcl.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_lib.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_print.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/buffer/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cast/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/comp/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf_def.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf_mod.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cversion.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/cfb_enc.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/ecb_enc.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dso/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dso/dso_lib.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ecp_smpl.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_ctrl.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_fat.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/engine.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_cryptodev.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/err/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/err/err.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/bio_ok.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/digest.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evp.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evp_enc.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evp_pbe.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evp_pkey.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/hmac/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/idea/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/krb5/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/lhash/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md2/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md4/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md5/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/mdc2/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/mem.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/mem_dbg.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/obj_dat.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/obj_dat.pl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ocsp/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ocsp/ocsp_ext.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ocsp/ocsp_lib.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ocsp/ocsp_vfy.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/opensslconf.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/opensslv.h#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/pem_lib.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/pem_pkey.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs12/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/pk7_doit.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/rand_egd.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/rand_unix.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/rand_win.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/randfile.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc2/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc4/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc5/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ripemd/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/asm/sha1-586.pl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/stack/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/threads/mttest.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/txt_db/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ui/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ui/ui_lib.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/by_dir.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509_txt.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509_vfy.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509_vfy.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509type.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_alt.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_crld.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_info.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_purp.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/config.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/openssl.pod#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/s_client.pod#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/s_time.pod#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/smime.pod#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/BIO_f_ssl.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/CONF_modules_free.pod#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/CONF_modules_load_file.pod#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/EVP_BytesToKey.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/EVP_DigestInit.pod#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/OPENSSL_config.pod#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/OPENSSL_load_builtin_modules.pod#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/OpenSSL_add_all_algorithms.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/RSA_print.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/d2i_DSAPublicKey.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/d2i_RSAPublicKey.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/des.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/pem.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/ui.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_COMP_add_compression_method.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssleay.txt#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/openssl.spec#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/kssl.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s2_clnt.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s2_enc.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s2_lib.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s2_pkt.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s2_srvr.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_clnt.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_enc.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_lib.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_pkt.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_srvr.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_asn1.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_cert.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_ciph.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_lib.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_sess.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssltest.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/Makefile.ssl#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/tools/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/tools/c_rehash#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/extract-names.pl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/mk1mf.pl#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/mkdef.pl#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/pl/OS2-EMX.pl#2 integrate .. //depot/projects/trustedbsd/mac/etc/Makefile#39 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/devfs.rules#2 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#33 integrate .. //depot/projects/trustedbsd/mac/etc/devd.conf#9 integrate .. //depot/projects/trustedbsd/mac/etc/etc.powerpc/ttys#1 branch .. //depot/projects/trustedbsd/mac/etc/ftpusers#7 integrate .. //depot/projects/trustedbsd/mac/etc/group#7 integrate .. //depot/projects/trustedbsd/mac/etc/inetd.conf#11 integrate .. //depot/projects/trustedbsd/mac/etc/isdn/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/etc/mail/aliases#8 integrate .. //depot/projects/trustedbsd/mac/etc/master.passwd#6 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#31 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.local.dist#20 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.usr.dist#32 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.var.dist#9 integrate .. //depot/projects/trustedbsd/mac/etc/namedb/named.root#3 integrate .. //depot/projects/trustedbsd/mac/etc/netstart#5 integrate .. //depot/projects/trustedbsd/mac/etc/pam.d/xdm#7 integrate .. //depot/projects/trustedbsd/mac/etc/pccard_ether#8 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/daily/110.clean-tmps#3 integrate .. //depot/projects/trustedbsd/mac/etc/pf.conf#1 branch .. //depot/projects/trustedbsd/mac/etc/pf.os#1 branch .. //depot/projects/trustedbsd/mac/etc/protocols#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc#26 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/DAEMON#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/LOGIN#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#17 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/NETWORKING#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/SERVERS#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/abi#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/accounting#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/addswap#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/adjkerntz#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/amd#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/apm#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/apmd#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/archdep#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/atm1#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/atm2#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/atm3#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/bgfsck#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/bootparams#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ccd#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/cleanvar#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/cleartmp#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/cron#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/devd#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/devfs#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/dhclient#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/diskless#12 delete .. //depot/projects/trustedbsd/mac/etc/rc.d/dmesg#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/dumpon#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/fsck#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/gbde#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/gbde_swap#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/hostname#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ike#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/inetd#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/initdiskless#12 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/initrandom#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ip6fw#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ipfilter#12 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ipfs#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ipfw#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ipmon#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ipnat#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ipsec#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ipxrouted#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/isdnd#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/jail#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/kldxref#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ldconfig#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/local#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/lomac#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/lpd#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/mixer#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/motd#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/mountcritlocal#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/mountcritremote#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/mountd#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/moused#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/mroute6d#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/mrouted#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/named#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/netif#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/netoptions#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/network_ipv6#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/nfsclient#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/nfsd#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/nfslocking#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/nfsserver#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ntpd#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ntpdate#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/pccard#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/pcvt#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/pf#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/power_profile#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ppp-user#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/pppoed#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/pwcheck#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/quota#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ramdisk#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/random#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 26 23:20:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 273F616A4D0; Fri, 26 Mar 2004 23:20:08 -0800 (PST) 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 EEF7716A4CE for ; Fri, 26 Mar 2004 23:20:07 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E920F43D1D for ; Fri, 26 Mar 2004 23:20:07 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2R7K7Ge048285 for ; Fri, 26 Mar 2004 23:20:07 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2R7K7JB048282 for perforce@freebsd.org; Fri, 26 Mar 2004 23:20:07 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 26 Mar 2004 23:20:07 -0800 (PST) Message-Id: <200403270720.i2R7K7JB048282@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 49769 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Mar 2004 07:20:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=49769 Change 49769 by jmallett@jmallett_oingo on 2004/03/26 23:19:06 Snag cpumask_t, 64-bit time_t. Affected files ... .. //depot/projects/mips/sys/mips/include/_types.h#4 integrate Differences ... ==== //depot/projects/mips/sys/mips/include/_types.h#4 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/sparc64/include/_types.h,v 1.3 2003/02/08 20:37:55 mike Exp $ + * $FreeBSD: src/sys/sparc64/include/_types.h,v 1.6 2004/03/20 20:41:40 marcel Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -55,6 +55,7 @@ * Standard type definitions. */ typedef __int32_t __clock_t; /* clock()... */ +typedef unsigned int __cpumask_t; typedef __int64_t __critical_t; typedef double __double_t; typedef float __float_t; @@ -74,7 +75,7 @@ typedef __int64_t __segsz_t; /* segment size (in pages) */ typedef __uint64_t __size_t; /* sizeof() */ typedef __int64_t __ssize_t; /* byte count or error */ -typedef __int32_t __time_t; /* time()... */ +typedef __int64_t __time_t; /* time()... */ typedef __uint64_t __uintfptr_t; typedef __uint64_t __uintmax_t; typedef __uint64_t __uintptr_t; From owner-p4-projects@FreeBSD.ORG Fri Mar 26 23:27:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6523D16A4D0; Fri, 26 Mar 2004 23:27:17 -0800 (PST) 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 3F6D416A4CE for ; Fri, 26 Mar 2004 23:27:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 22F2543D2F for ; Fri, 26 Mar 2004 23:27:17 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2R7RGGe050161 for ; Fri, 26 Mar 2004 23:27:16 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2R7RGId050158 for perforce@freebsd.org; Fri, 26 Mar 2004 23:27:16 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 26 Mar 2004 23:27:16 -0800 (PST) Message-Id: <200403270727.i2R7RGId050158@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 49770 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Mar 2004 07:27:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=49770 Change 49770 by jmallett@jmallett_oingo on 2004/03/26 23:27:06 Catch up. Affected files ... .. //depot/projects/mips/sys/mips/mips/vm_machdep.c#13 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/vm_machdep.c#13 (text+ko) ==== @@ -169,7 +169,7 @@ } void -sf_buf_free(void *addr, void *args) +sf_buf_free(struct sf_buf *sf) { panic("%s", __func__); } From owner-p4-projects@FreeBSD.ORG Sat Mar 27 00:30:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 018ED16A4D2; Sat, 27 Mar 2004 00:30:35 -0800 (PST) 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 CDB4716A4CF for ; Sat, 27 Mar 2004 00:30:35 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C2A7A43D2F for ; Sat, 27 Mar 2004 00:30:35 -0800 (PST) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2R8UZGe064020 for ; Sat, 27 Mar 2004 00:30:35 -0800 (PST) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2R8UZiC064017 for perforce@freebsd.org; Sat, 27 Mar 2004 00:30:35 -0800 (PST) (envelope-from scottl@freebsd.org) Date: Sat, 27 Mar 2004 00:30:35 -0800 (PST) Message-Id: <200403270830.i2R8UZiC064017@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 49774 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Mar 2004 08:30:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=49774 Change 49774 by scottl@scottl-junior-camlock on 2004/03/27 00:30:33 Mechanical split of the lun probe and probe periph code into it's own file. The XPT is still painfully SCSI-aware and will require a lot of work, but this is a first step. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_probe.c#1 add .. //depot/projects/scottl-camlock/src/sys/cam/cam_probe.h#1 add .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#2 edit .. //depot/projects/scottl-camlock/src/sys/modules/cam/Makefile#2 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#2 (text+ko) ==== @@ -55,28 +55,13 @@ #include #include #include +#include #include #include #include #include "opt_cam.h" -/* Datastructures internal to the xpt layer */ - -/* - * Definition of an async handler callback block. These are used to add - * SIMs and peripherals to the async callback lists. - */ -struct async_node { - SLIST_ENTRY(async_node) links; - u_int32_t event_enable; /* Async Event enables */ - void (*callback)(void *arg, u_int32_t code, - struct cam_path *path, void *args); - void *callback_arg; -}; - -SLIST_HEAD(async_list, async_node); -SLIST_HEAD(periph_list, cam_periph); static STAILQ_HEAD(highpowerlist, ccb_hdr) highpowerq; /* @@ -90,120 +75,6 @@ /* number of high powered commands that can go through right now */ static int num_highpower = CAM_MAX_HIGHPOWER; -/* - * Structure for queueing a device in a run queue. - * There is one run queue for allocating new ccbs, - * and another for sending ccbs to the controller. - */ -struct cam_ed_qinfo { - cam_pinfo pinfo; - struct cam_ed *device; -}; - -/* - * The CAM EDT (Existing Device Table) contains the device information for - * all devices for all busses in the system. The table contains a - * cam_ed structure for each device on the bus. - */ -struct cam_ed { - TAILQ_ENTRY(cam_ed) links; - struct cam_ed_qinfo alloc_ccb_entry; - struct cam_ed_qinfo send_ccb_entry; - struct cam_et *target; - lun_id_t lun_id; - struct camq drvq; /* - * Queue of type drivers wanting to do - * work on this device. - */ - struct cam_ccbq ccbq; /* Queue of pending ccbs */ - struct async_list asyncs; /* Async callback info for this B/T/L */ - struct periph_list periphs; /* All attached devices */ - u_int generation; /* Generation number */ - struct cam_periph *owner; /* Peripheral driver's ownership tag */ - struct xpt_quirk_entry *quirk; /* Oddities about this device */ - /* Storage for the inquiry data */ -#ifdef CAM_NEW_TRAN_CODE - cam_proto protocol; - u_int protocol_version; - cam_xport transport; - u_int transport_version; -#endif /* CAM_NEW_TRAN_CODE */ - struct scsi_inquiry_data inq_data; - u_int8_t inq_flags; /* - * Current settings for inquiry flags. - * This allows us to override settings - * like disconnection and tagged - * queuing for a device. - */ - u_int8_t queue_flags; /* Queue flags from the control page */ - u_int8_t serial_num_len; - u_int8_t *serial_num; - u_int32_t qfrozen_cnt; - u_int32_t flags; -#define CAM_DEV_UNCONFIGURED 0x01 -#define CAM_DEV_REL_TIMEOUT_PENDING 0x02 -#define CAM_DEV_REL_ON_COMPLETE 0x04 -#define CAM_DEV_REL_ON_QUEUE_EMPTY 0x08 -#define CAM_DEV_RESIZE_QUEUE_NEEDED 0x10 -#define CAM_DEV_TAG_AFTER_COUNT 0x20 -#define CAM_DEV_INQUIRY_DATA_VALID 0x40 - u_int32_t tag_delay_count; -#define CAM_TAG_DELAY_COUNT 5 - u_int32_t refcount; - struct callout_handle c_handle; -}; - -/* - * Each target is represented by an ET (Existing Target). These - * entries are created when a target is successfully probed with an - * identify, and removed when a device fails to respond after a number - * of retries, or a bus rescan finds the device missing. - */ -struct cam_et { - TAILQ_HEAD(, cam_ed) ed_entries; - TAILQ_ENTRY(cam_et) links; - struct cam_eb *bus; - target_id_t target_id; - u_int32_t refcount; - u_int generation; - struct timeval last_reset; -}; - -/* - * Each bus is represented by an EB (Existing Bus). These entries - * are created by calls to xpt_bus_register and deleted by calls to - * xpt_bus_deregister. - */ -struct cam_eb { - TAILQ_HEAD(, cam_et) et_entries; - TAILQ_ENTRY(cam_eb) links; - path_id_t path_id; - struct cam_sim *sim; - struct timeval last_reset; - u_int32_t flags; -#define CAM_EB_RUNQ_SCHEDULED 0x01 - u_int32_t refcount; - u_int generation; -}; - -struct cam_path { - struct cam_periph *periph; - struct cam_eb *bus; - struct cam_et *target; - struct cam_ed *device; -}; - -struct xpt_quirk_entry { - struct scsi_inquiry_pattern inq_pat; - u_int8_t quirks; -#define CAM_QUIRK_NOLUNS 0x01 -#define CAM_QUIRK_NOSERIAL 0x02 -#define CAM_QUIRK_HILUNS 0x04 - u_int mintags; - u_int maxtags; -}; -#define CAM_SCSI2_MAXLUN 8 - typedef enum { XPT_FLAG_OPEN = 0x01 } xpt_flags; @@ -613,22 +484,13 @@ static periph_init_t xpt_periph_init; -static periph_init_t probe_periph_init; - static struct periph_driver xpt_driver = { xpt_periph_init, "xpt", TAILQ_HEAD_INITIALIZER(xpt_driver.units) }; -static struct periph_driver probe_driver = -{ - probe_periph_init, "probe", - TAILQ_HEAD_INITIALIZER(probe_driver.units) -}; - PERIPHDRIVER_DECLARE(xpt, xpt_driver); -PERIPHDRIVER_DECLARE(probe, probe_driver); static d_open_t xptopen; @@ -697,15 +559,6 @@ DECLARE_MODULE(cam, cam_moduledata, SI_SUB_CONFIGURE, SI_ORDER_SECOND); MODULE_VERSION(cam, 1); - -static cam_status xpt_compile_path(struct cam_path *new_path, - struct cam_periph *perph, - path_id_t path_id, - target_id_t target_id, - lun_id_t lun_id); - -static void xpt_release_path(struct cam_path *path); - static void xpt_async_bcast(struct async_list *async_head, u_int32_t async_code, struct cam_path *path, @@ -743,10 +596,6 @@ static struct cam_ed* xpt_find_device(struct cam_et *target, lun_id_t lun_id); static void xpt_scan_bus(struct cam_periph *periph, union ccb *ccb); -static void xpt_scan_lun(struct cam_periph *periph, - struct cam_path *path, cam_flags flags, - union ccb *ccb); -static void xptscandone(struct cam_periph *periph, union ccb *done_ccb); static xpt_busfunc_t xptconfigbuscountfunc; static xpt_busfunc_t xptconfigfunc; static void xpt_config(void *arg); @@ -812,14 +661,6 @@ static xpt_busfunc_t xptsetasyncbusfunc; static cam_status xptregister(struct cam_periph *periph, void *arg); -static cam_status proberegister(struct cam_periph *periph, - void *arg); -static void probeschedule(struct cam_periph *probe_periph); -static void probestart(struct cam_periph *periph, union ccb *start_ccb); -static void proberequestdefaultnegotiation(struct cam_periph *periph); -static void probedone(struct cam_periph *periph, union ccb *done_ccb); -static void probecleanup(struct cam_periph *periph); -static void xpt_find_quirk(struct cam_ed *device); #ifdef CAM_NEW_TRAN_CODE static void xpt_devise_transport(struct cam_path *path); #endif /* CAM_NEW_TRAN_CODE */ @@ -923,12 +764,6 @@ } static void -probe_periph_init() -{ -} - - -static void xptdone(struct cam_periph *periph, union ccb *done_ccb) { /* Caller will release the CCB */ @@ -4012,7 +3847,7 @@ return (status); } -static cam_status +cam_status xpt_compile_path(struct cam_path *new_path, struct cam_periph *perph, path_id_t path_id, target_id_t target_id, lun_id_t lun_id) { @@ -4086,7 +3921,7 @@ return (status); } -static void +void xpt_release_path(struct cam_path *path) { CAM_DEBUG(path, CAM_DEBUG_TRACE, ("xpt_release_path\n")); @@ -5379,682 +5214,7 @@ } } -typedef enum { - PROBE_TUR, - PROBE_INQUIRY, - PROBE_FULL_INQUIRY, - PROBE_MODE_SENSE, - PROBE_SERIAL_NUM, - PROBE_TUR_FOR_NEGOTIATION -} probe_action; - -typedef enum { - PROBE_INQUIRY_CKSUM = 0x01, - PROBE_SERIAL_CKSUM = 0x02, - PROBE_NO_ANNOUNCE = 0x04 -} probe_flags; - -typedef struct { - TAILQ_HEAD(, ccb_hdr) request_ccbs; - probe_action action; - union ccb saved_ccb; - probe_flags flags; - MD5_CTX context; - u_int8_t digest[16]; -} probe_softc; - -static void -xpt_scan_lun(struct cam_periph *periph, struct cam_path *path, - cam_flags flags, union ccb *request_ccb) -{ - struct ccb_pathinq cpi; - cam_status status; - struct cam_path *new_path; - struct cam_periph *old_periph; - int s; - - CAM_DEBUG(request_ccb->ccb_h.path, CAM_DEBUG_TRACE, - ("xpt_scan_lun\n")); - - xpt_setup_ccb(&cpi.ccb_h, path, /*priority*/1); - cpi.ccb_h.func_code = XPT_PATH_INQ; - xpt_action((union ccb *)&cpi); - - if (cpi.ccb_h.status != CAM_REQ_CMP) { - if (request_ccb != NULL) { - request_ccb->ccb_h.status = cpi.ccb_h.status; - xpt_done(request_ccb); - } - return; - } - - if ((cpi.hba_misc & PIM_NOINITIATOR) != 0) { - /* - * Can't scan the bus on an adapter that - * cannot perform the initiator role. - */ - if (request_ccb != NULL) { - request_ccb->ccb_h.status = CAM_REQ_CMP; - xpt_done(request_ccb); - } - return; - } - - if (request_ccb == NULL) { - request_ccb = malloc(sizeof(union ccb), M_TEMP, M_NOWAIT); - if (request_ccb == NULL) { - xpt_print_path(path); - printf("xpt_scan_lun: can't allocate CCB, can't " - "continue\n"); - return; - } - new_path = malloc(sizeof(*new_path), M_TEMP, M_NOWAIT); - if (new_path == NULL) { - xpt_print_path(path); - printf("xpt_scan_lun: can't allocate path, can't " - "continue\n"); - free(request_ccb, M_TEMP); - return; - } - status = xpt_compile_path(new_path, xpt_periph, - path->bus->path_id, - path->target->target_id, - path->device->lun_id); - - if (status != CAM_REQ_CMP) { - xpt_print_path(path); - printf("xpt_scan_lun: can't compile path, can't " - "continue\n"); - free(request_ccb, M_TEMP); - free(new_path, M_TEMP); - return; - } - xpt_setup_ccb(&request_ccb->ccb_h, new_path, /*priority*/ 1); - request_ccb->ccb_h.cbfcnp = xptscandone; - request_ccb->ccb_h.func_code = XPT_SCAN_LUN; - request_ccb->crcn.flags = flags; - } - - s = splsoftcam(); - if ((old_periph = cam_periph_find(path, "probe")) != NULL) { - probe_softc *softc; - - softc = (probe_softc *)old_periph->softc; - TAILQ_INSERT_TAIL(&softc->request_ccbs, &request_ccb->ccb_h, - periph_links.tqe); - } else { - status = cam_periph_alloc(proberegister, NULL, probecleanup, - probestart, "probe", - CAM_PERIPH_BIO, - request_ccb->ccb_h.path, NULL, 0, - request_ccb); - - if (status != CAM_REQ_CMP) { - xpt_print_path(path); - printf("xpt_scan_lun: cam_alloc_periph returned an " - "error, can't continue probe\n"); - request_ccb->ccb_h.status = status; - xpt_done(request_ccb); - } - } - splx(s); -} - -static void -xptscandone(struct cam_periph *periph, union ccb *done_ccb) -{ - xpt_release_path(done_ccb->ccb_h.path); - free(done_ccb->ccb_h.path, M_TEMP); - free(done_ccb, M_TEMP); -} - -static cam_status -proberegister(struct cam_periph *periph, void *arg) -{ - union ccb *request_ccb; /* CCB representing the probe request */ - probe_softc *softc; - - request_ccb = (union ccb *)arg; - if (periph == NULL) { - printf("proberegister: periph was NULL!!\n"); - return(CAM_REQ_CMP_ERR); - } - - if (request_ccb == NULL) { - printf("proberegister: no probe CCB, " - "can't register device\n"); - return(CAM_REQ_CMP_ERR); - } - - softc = (probe_softc *)malloc(sizeof(*softc), M_TEMP, M_NOWAIT); - - if (softc == NULL) { - printf("proberegister: Unable to probe new device. " - "Unable to allocate softc\n"); - return(CAM_REQ_CMP_ERR); - } - TAILQ_INIT(&softc->request_ccbs); - TAILQ_INSERT_TAIL(&softc->request_ccbs, &request_ccb->ccb_h, - periph_links.tqe); - softc->flags = 0; - periph->softc = softc; - cam_periph_acquire(periph); - /* - * Ensure we've waited at least a bus settle - * delay before attempting to probe the device. - * For HBAs that don't do bus resets, this won't make a difference. - */ - cam_periph_freeze_after_event(periph, &periph->path->bus->last_reset, - scsi_delay); - probeschedule(periph); - return(CAM_REQ_CMP); -} - -static void -probeschedule(struct cam_periph *periph) -{ - struct ccb_pathinq cpi; - union ccb *ccb; - probe_softc *softc; - - softc = (probe_softc *)periph->softc; - ccb = (union ccb *)TAILQ_FIRST(&softc->request_ccbs); - - xpt_setup_ccb(&cpi.ccb_h, periph->path, /*priority*/1); - cpi.ccb_h.func_code = XPT_PATH_INQ; - xpt_action((union ccb *)&cpi); - - /* - * If a device has gone away and another device, or the same one, - * is back in the same place, it should have a unit attention - * condition pending. It will not report the unit attention in - * response to an inquiry, which may leave invalid transfer - * negotiations in effect. The TUR will reveal the unit attention - * condition. Only send the TUR for lun 0, since some devices - * will get confused by commands other than inquiry to non-existent - * luns. If you think a device has gone away start your scan from - * lun 0. This will insure that any bogus transfer settings are - * invalidated. - * - * If we haven't seen the device before and the controller supports - * some kind of transfer negotiation, negotiate with the first - * sent command if no bus reset was performed at startup. This - * ensures that the device is not confused by transfer negotiation - * settings left over by loader or BIOS action. - */ - if (((ccb->ccb_h.path->device->flags & CAM_DEV_UNCONFIGURED) == 0) - && (ccb->ccb_h.target_lun == 0)) { - softc->action = PROBE_TUR; - } else if ((cpi.hba_inquiry & (PI_WIDE_32|PI_WIDE_16|PI_SDTR_ABLE)) != 0 - && (cpi.hba_misc & PIM_NOBUSRESET) != 0) { - proberequestdefaultnegotiation(periph); - softc->action = PROBE_INQUIRY; - } else { - softc->action = PROBE_INQUIRY; - } - - if (ccb->crcn.flags & CAM_EXPECT_INQ_CHANGE) - softc->flags |= PROBE_NO_ANNOUNCE; - else - softc->flags &= ~PROBE_NO_ANNOUNCE; - - xpt_schedule(periph, ccb->ccb_h.pinfo.priority); -} - -static void -probestart(struct cam_periph *periph, union ccb *start_ccb) -{ - /* Probe the device that our peripheral driver points to */ - struct ccb_scsiio *csio; - probe_softc *softc; - - CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("probestart\n")); - - softc = (probe_softc *)periph->softc; - csio = &start_ccb->csio; - - switch (softc->action) { - case PROBE_TUR: - case PROBE_TUR_FOR_NEGOTIATION: - { - scsi_test_unit_ready(csio, - /*retries*/4, - probedone, - MSG_SIMPLE_Q_TAG, - SSD_FULL_SIZE, - /*timeout*/60000); - break; - } - case PROBE_INQUIRY: - case PROBE_FULL_INQUIRY: - { - u_int inquiry_len; - struct scsi_inquiry_data *inq_buf; - - inq_buf = &periph->path->device->inq_data; - /* - * If the device is currently configured, we calculate an - * MD5 checksum of the inquiry data, and if the serial number - * length is greater than 0, add the serial number data - * into the checksum as well. Once the inquiry and the - * serial number check finish, we attempt to figure out - * whether we still have the same device. - */ - if ((periph->path->device->flags & CAM_DEV_UNCONFIGURED) == 0) { - - MD5Init(&softc->context); - MD5Update(&softc->context, (unsigned char *)inq_buf, - sizeof(struct scsi_inquiry_data)); - softc->flags |= PROBE_INQUIRY_CKSUM; - if (periph->path->device->serial_num_len > 0) { - MD5Update(&softc->context, - periph->path->device->serial_num, - periph->path->device->serial_num_len); - softc->flags |= PROBE_SERIAL_CKSUM; - } - MD5Final(softc->digest, &softc->context); - } - - if (softc->action == PROBE_INQUIRY) - inquiry_len = SHORT_INQUIRY_LENGTH; - else - inquiry_len = inq_buf->additional_length + 4; - - scsi_inquiry(csio, - /*retries*/4, - probedone, - MSG_SIMPLE_Q_TAG, - (u_int8_t *)inq_buf, - inquiry_len, - /*evpd*/FALSE, - /*page_code*/0, - SSD_MIN_SIZE, - /*timeout*/60 * 1000); - break; - } - case PROBE_MODE_SENSE: - { - void *mode_buf; - int mode_buf_len; - - mode_buf_len = sizeof(struct scsi_mode_header_6) - + sizeof(struct scsi_mode_blk_desc) - + sizeof(struct scsi_control_page); - mode_buf = malloc(mode_buf_len, M_TEMP, M_NOWAIT); - if (mode_buf != NULL) { - scsi_mode_sense(csio, - /*retries*/4, - probedone, - MSG_SIMPLE_Q_TAG, - /*dbd*/FALSE, - SMS_PAGE_CTRL_CURRENT, - SMS_CONTROL_MODE_PAGE, - mode_buf, - mode_buf_len, - SSD_FULL_SIZE, - /*timeout*/60000); - break; - } - xpt_print_path(periph->path); - printf("Unable to mode sense control page - malloc failure\n"); - softc->action = PROBE_SERIAL_NUM; - } - /* FALLTHROUGH */ - case PROBE_SERIAL_NUM: - { - struct scsi_vpd_unit_serial_number *serial_buf; - struct cam_ed* device; - - serial_buf = NULL; - device = periph->path->device; - device->serial_num = NULL; - device->serial_num_len = 0; - - if ((device->quirk->quirks & CAM_QUIRK_NOSERIAL) == 0) - serial_buf = (struct scsi_vpd_unit_serial_number *) - malloc(sizeof(*serial_buf), M_TEMP, - M_NOWAIT | M_ZERO); - - if (serial_buf != NULL) { - scsi_inquiry(csio, - /*retries*/4, - probedone, - MSG_SIMPLE_Q_TAG, - (u_int8_t *)serial_buf, - sizeof(*serial_buf), - /*evpd*/TRUE, - SVPD_UNIT_SERIAL_NUMBER, - SSD_MIN_SIZE, - /*timeout*/60 * 1000); - break; - } - /* - * We'll have to do without, let our probedone - * routine finish up for us. - */ - start_ccb->csio.data_ptr = NULL; - probedone(periph, start_ccb); - return; - } - } - xpt_action(start_ccb); -} - -static void -proberequestdefaultnegotiation(struct cam_periph *periph) -{ - struct ccb_trans_settings cts; - - xpt_setup_ccb(&cts.ccb_h, periph->path, /*priority*/1); - cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; -#ifdef CAM_NEW_TRAN_CODE - cts.type = CTS_TYPE_USER_SETTINGS; -#else /* CAM_NEW_TRAN_CODE */ - cts.flags = CCB_TRANS_USER_SETTINGS; -#endif /* CAM_NEW_TRAN_CODE */ - xpt_action((union ccb *)&cts); - cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS; -#ifdef CAM_NEW_TRAN_CODE - cts.type = CTS_TYPE_CURRENT_SETTINGS; -#else /* CAM_NEW_TRAN_CODE */ - cts.flags &= ~CCB_TRANS_USER_SETTINGS; - cts.flags |= CCB_TRANS_CURRENT_SETTINGS; -#endif /* CAM_NEW_TRAN_CODE */ - xpt_action((union ccb *)&cts); -} - -static void -probedone(struct cam_periph *periph, union ccb *done_ccb) -{ - probe_softc *softc; - struct cam_path *path; - u_int32_t priority; - - CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("probedone\n")); - - softc = (probe_softc *)periph->softc; - path = done_ccb->ccb_h.path; - priority = done_ccb->ccb_h.pinfo.priority; - - switch (softc->action) { - case PROBE_TUR: - { - if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { - - if (cam_periph_error(done_ccb, 0, - SF_NO_PRINT, NULL) == ERESTART) - return; - else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) - /* Don't wedge the queue */ - xpt_release_devq(done_ccb->ccb_h.path, - /*count*/1, - /*run_queue*/TRUE); - } - softc->action = PROBE_INQUIRY; - xpt_release_ccb(done_ccb); - xpt_schedule(periph, priority); - return; - } - case PROBE_INQUIRY: - case PROBE_FULL_INQUIRY: - { - if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) { - struct scsi_inquiry_data *inq_buf; - u_int8_t periph_qual; - - path->device->flags |= CAM_DEV_INQUIRY_DATA_VALID; - inq_buf = &path->device->inq_data; - - periph_qual = SID_QUAL(inq_buf); - - switch(periph_qual) { - case SID_QUAL_LU_CONNECTED: - { - u_int8_t alen; - - /* - * We conservatively request only - * SHORT_INQUIRY_LEN bytes of inquiry - * information during our first try - * at sending an INQUIRY. If the device - * has more information to give, - * perform a second request specifying - * the amount of information the device - * is willing to give. - */ - alen = inq_buf->additional_length; - if (softc->action == PROBE_INQUIRY - && alen > (SHORT_INQUIRY_LENGTH - 4)) { - softc->action = PROBE_FULL_INQUIRY; - xpt_release_ccb(done_ccb); - xpt_schedule(periph, priority); - return; - } - - xpt_find_quirk(path->device); - -#ifdef CAM_NEW_TRAN_CODE - xpt_devise_transport(path); -#endif /* CAM_NEW_TRAN_CODE */ - if ((inq_buf->flags & SID_CmdQue) != 0) - softc->action = PROBE_MODE_SENSE; - else - softc->action = PROBE_SERIAL_NUM; - - path->device->flags &= ~CAM_DEV_UNCONFIGURED; - - xpt_release_ccb(done_ccb); - xpt_schedule(periph, priority); - return; - } - default: - break; - } - } else if (cam_periph_error(done_ccb, 0, - done_ccb->ccb_h.target_lun > 0 - ? SF_RETRY_UA|SF_QUIET_IR - : SF_RETRY_UA, - &softc->saved_ccb) == ERESTART) { - return; - } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { - /* Don't wedge the queue */ - xpt_release_devq(done_ccb->ccb_h.path, /*count*/1, - /*run_queue*/TRUE); - } - /* - * If we get to this point, we got an error status back - * from the inquiry and the error status doesn't require - * automatically retrying the command. Therefore, the - * inquiry failed. If we had inquiry information before - * for this device, but this latest inquiry command failed, - * the device has probably gone away. If this device isn't - * already marked unconfigured, notify the peripheral - * drivers that this device is no more. - */ - if ((path->device->flags & CAM_DEV_UNCONFIGURED) == 0) - /* Send the async notification. */ - xpt_async(AC_LOST_DEVICE, path, NULL); - - xpt_release_ccb(done_ccb); - break; - } - case PROBE_MODE_SENSE: - { - struct ccb_scsiio *csio; - struct scsi_mode_header_6 *mode_hdr; - - csio = &done_ccb->csio; - mode_hdr = (struct scsi_mode_header_6 *)csio->data_ptr; - if ((csio->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) { - struct scsi_control_page *page; - u_int8_t *offset; - - offset = ((u_int8_t *)&mode_hdr[1]) - + mode_hdr->blk_desc_len; - page = (struct scsi_control_page *)offset; - path->device->queue_flags = page->queue_flags; - } else if (cam_periph_error(done_ccb, 0, - SF_RETRY_UA|SF_NO_PRINT, - &softc->saved_ccb) == ERESTART) { - return; - } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { - /* Don't wedge the queue */ - xpt_release_devq(done_ccb->ccb_h.path, - /*count*/1, /*run_queue*/TRUE); - } - xpt_release_ccb(done_ccb); - free(mode_hdr, M_TEMP); - softc->action = PROBE_SERIAL_NUM; - xpt_schedule(periph, priority); - return; - } - case PROBE_SERIAL_NUM: - { - struct ccb_scsiio *csio; - struct scsi_vpd_unit_serial_number *serial_buf; - u_int32_t priority; - int changed; - int have_serialnum; - - changed = 1; - have_serialnum = 0; - csio = &done_ccb->csio; - priority = done_ccb->ccb_h.pinfo.priority; - serial_buf = - (struct scsi_vpd_unit_serial_number *)csio->data_ptr; - - /* Clean up from previous instance of this device */ - if (path->device->serial_num != NULL) { - free(path->device->serial_num, M_DEVBUF); - path->device->serial_num = NULL; - path->device->serial_num_len = 0; - } - - if (serial_buf == NULL) { - /* - * Don't process the command as it was never sent - */ - } else if ((csio->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP - && (serial_buf->length > 0)) { - - have_serialnum = 1; - path->device->serial_num = - (u_int8_t *)malloc((serial_buf->length + 1), - M_DEVBUF, M_NOWAIT); - if (path->device->serial_num != NULL) { - bcopy(serial_buf->serial_num, - path->device->serial_num, - serial_buf->length); - path->device->serial_num_len = - serial_buf->length; - path->device->serial_num[serial_buf->length] - = '\0'; - } - } else if (cam_periph_error(done_ccb, 0, - SF_RETRY_UA|SF_NO_PRINT, - &softc->saved_ccb) == ERESTART) { - return; - } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { - /* Don't wedge the queue */ - xpt_release_devq(done_ccb->ccb_h.path, /*count*/1, - /*run_queue*/TRUE); - } - - /* - * Let's see if we have seen this device before. - */ - if ((softc->flags & PROBE_INQUIRY_CKSUM) != 0) { - MD5_CTX context; - u_int8_t digest[16]; - - MD5Init(&context); - - MD5Update(&context, - (unsigned char *)&path->device->inq_data, - sizeof(struct scsi_inquiry_data)); - - if (have_serialnum) - MD5Update(&context, serial_buf->serial_num, - serial_buf->length); - - MD5Final(digest, &context); - if (bcmp(softc->digest, digest, 16) == 0) - changed = 0; - - /* - * XXX Do we need to do a TUR in order to ensure - * that the device really hasn't changed??? - */ - if ((changed != 0) - && ((softc->flags & PROBE_NO_ANNOUNCE) == 0)) - xpt_async(AC_LOST_DEVICE, path, NULL); - } - if (serial_buf != NULL) - free(serial_buf, M_TEMP); - - if (changed != 0) { - /* - * Now that we have all the necessary - * information to safely perform transfer - * negotiations... Controllers don't perform - * any negotiation or tagged queuing until - * after the first XPT_SET_TRAN_SETTINGS ccb is - * received. So, on a new device, just retreive - * the user settings, and set them as the current - * settings to set the device up. - */ - proberequestdefaultnegotiation(periph); - xpt_release_ccb(done_ccb); - - /* - * Perform a TUR to allow the controller to - * perform any necessary transfer negotiation. - */ - softc->action = PROBE_TUR_FOR_NEGOTIATION; - xpt_schedule(periph, priority); - return; - } - xpt_release_ccb(done_ccb); - break; - } - case PROBE_TUR_FOR_NEGOTIATION: - if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { - /* Don't wedge the queue */ - xpt_release_devq(done_ccb->ccb_h.path, /*count*/1, - /*run_queue*/TRUE); - } - - path->device->flags &= ~CAM_DEV_UNCONFIGURED; - - if ((softc->flags & PROBE_NO_ANNOUNCE) == 0) { - /* Inform the XPT that a new device has been found */ - done_ccb->ccb_h.func_code = XPT_GDEV_TYPE; - xpt_action(done_ccb); - - xpt_async(AC_FOUND_DEVICE, xpt_periph->path, done_ccb); - } - xpt_release_ccb(done_ccb); - break; - } - done_ccb = (union ccb *)TAILQ_FIRST(&softc->request_ccbs); - TAILQ_REMOVE(&softc->request_ccbs, &done_ccb->ccb_h, periph_links.tqe); - done_ccb->ccb_h.status = CAM_REQ_CMP; - xpt_done(done_ccb); - if (TAILQ_FIRST(&softc->request_ccbs) == NULL) { - cam_periph_invalidate(periph); - cam_periph_release(periph); - } else { - probeschedule(periph); - } -} - -static void -probecleanup(struct cam_periph *periph) -{ - free(periph->softc, M_TEMP); -} - -static void +void xpt_find_quirk(struct cam_ed *device) { caddr_t match; ==== //depot/projects/scottl-camlock/src/sys/modules/cam/Makefile#2 (text+ko) ==== @@ -19,6 +19,7 @@ SRCS+= device_if.h bus_if.h vnode_if.h SRCS+= cam.c cam_periph.c cam_queue.c SRCS+= cam_sim.c cam_xpt.c +SRCS+= scsi_probe.c SRCS+= scsi_all.c scsi_cd.c scsi_ch.c SRCS+= scsi_da.c SRCS+= scsi_pass.c From owner-p4-projects@FreeBSD.ORG Sat Mar 27 19:11:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E46216A4D0; Sat, 27 Mar 2004 19:11:50 -0800 (PST) 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 6510816A4CE for ; Sat, 27 Mar 2004 19:11:50 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5986C43D1D for ; Sat, 27 Mar 2004 19:11:50 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2S3BoGe045031 for ; Sat, 27 Mar 2004 19:11:50 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2S3Bm2j045001 for perforce@freebsd.org; Sat, 27 Mar 2004 19:11:48 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sat, 27 Mar 2004 19:11:48 -0800 (PST) Message-Id: <200403280311.i2S3Bm2j045001@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 49825 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Mar 2004 03:11:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=49825 Change 49825 by marcel@marcel_nfs on 2004/03/27 19:10:57 IFC @49823 Affected files ... .. //depot/projects/gdb/MAINTAINERS#4 integrate .. //depot/projects/gdb/Makefile#4 integrate .. //depot/projects/gdb/Makefile.inc1#6 integrate .. //depot/projects/gdb/bin/ps/print.c#2 integrate .. //depot/projects/gdb/bin/ps/ps.1#5 integrate .. //depot/projects/gdb/bin/ps/ps.c#4 integrate .. //depot/projects/gdb/contrib/amd/scripts/amd.conf.5#2 integrate .. //depot/projects/gdb/etc/Makefile#5 integrate .. //depot/projects/gdb/etc/defaults/rc.conf#5 integrate .. //depot/projects/gdb/etc/mtree/BSD.local.dist#3 integrate .. //depot/projects/gdb/etc/mtree/BSD.usr.dist#3 integrate .. //depot/projects/gdb/etc/rc.d/Makefile#5 integrate .. //depot/projects/gdb/etc/rc.d/cleanvar#2 integrate .. //depot/projects/gdb/etc/rc.d/cleartmp#4 integrate .. //depot/projects/gdb/etc/rc.d/diskless#3 delete .. //depot/projects/gdb/etc/rc.d/hostname#3 integrate .. //depot/projects/gdb/etc/rc.d/mixer#2 integrate .. //depot/projects/gdb/etc/rc.d/pf#1 branch .. //depot/projects/gdb/etc/rc.d/resolv#1 branch .. //depot/projects/gdb/etc/rc.d/tmp#1 branch .. //depot/projects/gdb/etc/rc.d/var#1 branch .. //depot/projects/gdb/etc/rc.subr#4 integrate .. //depot/projects/gdb/lib/libarchive/tar.5#3 integrate .. //depot/projects/gdb/lib/libc/gen/arc4random.c#4 integrate .. //depot/projects/gdb/lib/libc/gen/sysctl.3#3 integrate .. //depot/projects/gdb/lib/libc/locale/wctype.3#2 integrate .. //depot/projects/gdb/lib/libc/locale/wctype.c#2 integrate .. //depot/projects/gdb/lib/libkvm/kvm.3#2 integrate .. //depot/projects/gdb/lib/libkvm/kvm_open.3#2 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_cond.c#2 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_find_thread.c#2 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_kern.c#3 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_mutex.c#3 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_private.h#3 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_resume_np.c#2 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_sig.c#3 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_syscalls.c#2 integrate .. //depot/projects/gdb/release/Makefile#3 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#6 integrate .. //depot/projects/gdb/release/picobsd/README.html#2 delete .. //depot/projects/gdb/release/picobsd/bridge/crunch.conf#2 integrate .. //depot/projects/gdb/release/picobsd/dial/PICOBSD#2 delete .. //depot/projects/gdb/release/picobsd/dial/PICOBSD.hints#2 delete .. //depot/projects/gdb/release/picobsd/dial/config#2 delete .. //depot/projects/gdb/release/picobsd/dial/crunch.conf#2 delete .. //depot/projects/gdb/release/picobsd/dial/floppy.tree.exclude#2 delete .. //depot/projects/gdb/release/picobsd/dial/floppy.tree/etc/master.passwd#2 delete .. //depot/projects/gdb/release/picobsd/dial/floppy.tree/etc/mfs.rc#2 delete .. //depot/projects/gdb/release/picobsd/dial/floppy.tree/etc/ppp/ppp.conf#2 delete .. //depot/projects/gdb/release/picobsd/dial/floppy.tree/etc/ppp/ppp.conf.template#2 delete .. //depot/projects/gdb/release/picobsd/dial/floppy.tree/etc/ppp/ppp.linkup#2 delete .. //depot/projects/gdb/release/picobsd/dial/floppy.tree/etc/rc#2 delete .. //depot/projects/gdb/release/picobsd/dial/floppy.tree/etc/rc.conf#2 delete .. //depot/projects/gdb/release/picobsd/dial/floppy.tree/etc/ttys#2 delete .. //depot/projects/gdb/release/picobsd/dial/lang/LICENCE.ssh#2 delete .. //depot/projects/gdb/release/picobsd/dial/lang/README.en#2 delete .. //depot/projects/gdb/release/picobsd/dial/lang/README.pl#2 delete .. //depot/projects/gdb/release/picobsd/dial/lang/boot.help.en#2 delete .. //depot/projects/gdb/release/picobsd/dial/lang/boot.help.pl#2 delete .. //depot/projects/gdb/release/picobsd/dial/lang/dialup.en#2 delete .. //depot/projects/gdb/release/picobsd/dial/lang/dialup.pl#2 delete .. //depot/projects/gdb/release/picobsd/dial/lang/hosts.en#2 delete .. //depot/projects/gdb/release/picobsd/dial/lang/hosts.pl#2 delete .. //depot/projects/gdb/release/picobsd/dial/lang/login.en#2 delete .. //depot/projects/gdb/release/picobsd/dial/lang/login.pl#2 delete .. //depot/projects/gdb/release/picobsd/dial/lang/motd.en#2 delete .. //depot/projects/gdb/release/picobsd/dial/lang/motd.pl#2 delete .. //depot/projects/gdb/release/picobsd/doc/src/Makefile#2 delete .. //depot/projects/gdb/release/picobsd/doc/src/TODO.html#2 delete .. //depot/projects/gdb/release/picobsd/doc/src/UCI.html#2 delete .. //depot/projects/gdb/release/picobsd/doc/src/bugs.html#2 delete .. //depot/projects/gdb/release/picobsd/doc/src/faq.html#2 delete .. //depot/projects/gdb/release/picobsd/doc/src/hardware.html#2 delete .. //depot/projects/gdb/release/picobsd/doc/src/how2build.html#2 delete .. //depot/projects/gdb/release/picobsd/doc/src/installflp.html#2 delete .. //depot/projects/gdb/release/picobsd/doc/src/intrinsics.html#2 delete .. //depot/projects/gdb/release/picobsd/doc/src/intro.html#2 delete .. //depot/projects/gdb/release/picobsd/help/README#2 delete .. //depot/projects/gdb/release/picobsd/help/cat.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/cat.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/chmod.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/chmod.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/chown.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/chown.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/cp.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/cp.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/df.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/df.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/dialup.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/dialup.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/dmesg.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/dmesg.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/echo.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/echo.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/ee.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/ee.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/fsck.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/fsck.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/ftp.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/ftp.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/gzip.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/gzip.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/help.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/help.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/hostname.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/hostname.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/ifconfig.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/ifconfig.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/kbdcontrol.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/kbdcontrol.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/kget.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/kget.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/kill.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/kill.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/ln.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/ln.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/ls.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/ls.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/mkdir.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/mkdir.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/more.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/more.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/mount.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/mount.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/mount_cd9660.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/mount_cd9660.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/mount_ext2fs.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/mount_ext2fs.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/mount_msdosfs.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/mount_msdosfs.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/moused.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/moused.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/mv.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/mv.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/ping.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/ping.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/ppp.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/ppp.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/ps.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/ps.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/pwd.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/pwd.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/reboot.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/reboot.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/rm.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/rm.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/route.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/route.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/sh.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/sh.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/shutdown.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/shutdown.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/ssh.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/ssh.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/sysctl.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/sysctl.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/telnet.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/telnet.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/test.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/test.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/traceroute.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/traceroute.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/umount.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/umount.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/vidcontrol.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/vidcontrol.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/help/vm.hlp.en#2 delete .. //depot/projects/gdb/release/picobsd/help/vm.hlp.pl#2 delete .. //depot/projects/gdb/release/picobsd/isp/PICOBSD#2 delete .. //depot/projects/gdb/release/picobsd/isp/PICOBSD.hints#2 delete .. //depot/projects/gdb/release/picobsd/isp/config#2 delete .. //depot/projects/gdb/release/picobsd/isp/crunch.conf#2 delete .. //depot/projects/gdb/release/picobsd/isp/floppy.tree.exclude#2 delete .. //depot/projects/gdb/release/picobsd/isp/lang/README.en#2 delete .. //depot/projects/gdb/release/picobsd/isp/lang/README.pl#2 delete .. //depot/projects/gdb/release/picobsd/isp/lang/boot.help.en#2 delete .. //depot/projects/gdb/release/picobsd/isp/lang/boot.help.pl#2 delete .. //depot/projects/gdb/release/picobsd/isp/lang/motd.en#2 delete .. //depot/projects/gdb/release/picobsd/isp/lang/motd.pl#2 delete .. //depot/projects/gdb/release/picobsd/isp/mfs.mtree#2 delete .. //depot/projects/gdb/release/picobsd/net/PICOBSD#2 delete .. //depot/projects/gdb/release/picobsd/net/PICOBSD.hints#2 delete .. //depot/projects/gdb/release/picobsd/net/config#2 delete .. //depot/projects/gdb/release/picobsd/net/crunch.conf#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/boot.config#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/disktab#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/fstab#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/gettytab#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/group#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/host.conf#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/inetd.conf#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/login.conf#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/master.passwd#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/mfs.rc#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/ppp/ppp.conf#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/ppp/ppp.deny#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/ppp/ppp.linkup#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/ppp/ppp.secret.sample#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/profile#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/protocols#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/rc#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/rc.conf#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/rc.firewall#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/rc.network#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/rc.serial#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/remote#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/resolv.conf#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/services#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/shells#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/snmpd.conf#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/termcap#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/etc/ttys#2 delete .. //depot/projects/gdb/release/picobsd/net/floppy.tree/kernel.config#2 delete .. //depot/projects/gdb/release/picobsd/net/lang/README.en#2 delete .. //depot/projects/gdb/release/picobsd/net/lang/README.pl#2 delete .. //depot/projects/gdb/release/picobsd/net/lang/boot.help.en#2 delete .. //depot/projects/gdb/release/picobsd/net/lang/boot.help.pl#2 delete .. //depot/projects/gdb/release/picobsd/net/lang/hosts.en#2 delete .. //depot/projects/gdb/release/picobsd/net/lang/hosts.pl#2 delete .. //depot/projects/gdb/release/picobsd/net/lang/motd.en#2 delete .. //depot/projects/gdb/release/picobsd/net/lang/motd.pl#2 delete .. //depot/projects/gdb/release/picobsd/router/PICOBSD#2 delete .. //depot/projects/gdb/release/picobsd/router/PICOBSD.hints#2 delete .. //depot/projects/gdb/release/picobsd/router/config#2 delete .. //depot/projects/gdb/release/picobsd/router/crunch.conf#2 delete .. //depot/projects/gdb/release/picobsd/router/floppy.tree.exclude#2 delete .. //depot/projects/gdb/release/picobsd/router/floppy.tree/etc/mfs.rc#2 delete .. //depot/projects/gdb/release/picobsd/router/floppy.tree/etc/rc#2 delete .. //depot/projects/gdb/release/picobsd/router/floppy.tree/etc/rc.firewall#2 delete .. //depot/projects/gdb/release/picobsd/router/lang/BAD_DOCS!!!#2 delete .. //depot/projects/gdb/release/picobsd/router/lang/README.en#2 delete .. //depot/projects/gdb/release/picobsd/router/lang/README.pl#2 delete .. //depot/projects/gdb/release/picobsd/router/lang/boot.help.en#2 delete .. //depot/projects/gdb/release/picobsd/router/lang/boot.help.pl#2 delete .. //depot/projects/gdb/release/picobsd/router/lang/hosts.en#2 delete .. //depot/projects/gdb/release/picobsd/router/lang/hosts.pl#2 delete .. //depot/projects/gdb/release/picobsd/router/lang/motd.en#2 delete .. //depot/projects/gdb/release/picobsd/router/lang/motd.pl#2 delete .. //depot/projects/gdb/release/scripts/print-cdrom-packages.sh#3 integrate .. //depot/projects/gdb/sbin/dmesg/dmesg.8#2 integrate .. //depot/projects/gdb/sbin/dmesg/dmesg.c#3 integrate .. //depot/projects/gdb/sbin/growfs/growfs.c#2 integrate .. //depot/projects/gdb/sbin/idmapd/idmapd.c#3 integrate .. //depot/projects/gdb/sbin/ipfw/ipfw.8#4 integrate .. //depot/projects/gdb/sbin/mount/mount.8#4 integrate .. //depot/projects/gdb/sbin/nologin/Makefile#3 delete .. //depot/projects/gdb/sbin/nologin/nologin.5#2 delete .. //depot/projects/gdb/sbin/nologin/nologin.8#2 delete .. //depot/projects/gdb/sbin/nologin/nologin.c#3 delete .. //depot/projects/gdb/sbin/tunefs/tunefs.c#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/Makefile#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/Makefile.asm#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/i386/bf-586.s#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/i386/bf-686.s#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/i386/bn-586.s#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/i386/cast-586.s#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/i386/co-586.s#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/i386/crypt586.s#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/i386/des-586.s#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/i386/md5-586.s#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/i386/rc4-586.s#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/i386/rc5-586.s#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/i386/rmd-586.s#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/i386/sha1-586.s#2 integrate .. //depot/projects/gdb/share/colldef/Makefile#3 integrate .. //depot/projects/gdb/share/examples/etc/make.conf#4 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/Makefile#5 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/ct.4#3 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/ctau.4#1 branch .. //depot/projects/gdb/share/man/man4/smp.4#2 integrate .. //depot/projects/gdb/share/man/man5/make.conf.5#4 integrate .. //depot/projects/gdb/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/gdb/share/man/man7/hier.7#2 integrate .. //depot/projects/gdb/share/man/man9/g_access.9#2 integrate .. //depot/projects/gdb/share/man/man9/g_attach.9#3 integrate .. //depot/projects/gdb/share/man/man9/g_consumer.9#3 integrate .. //depot/projects/gdb/share/man/man9/g_geom.9#3 integrate .. //depot/projects/gdb/share/man/man9/g_provider.9#3 integrate .. //depot/projects/gdb/share/mklocale/Makefile#3 integrate .. //depot/projects/gdb/share/mklocale/UTF-8.src#1 branch .. //depot/projects/gdb/share/monetdef/Makefile#3 integrate .. //depot/projects/gdb/share/monetdef/be_BY.UTF-8.src#1 branch .. //depot/projects/gdb/share/monetdef/bg_BG.UTF-8.src#1 branch .. //depot/projects/gdb/share/monetdef/cs_CZ.UTF-8.src#1 branch .. //depot/projects/gdb/share/monetdef/en_GB.UTF-8.src#1 branch .. //depot/projects/gdb/share/monetdef/en_IE.UTF-8.src#1 branch .. //depot/projects/gdb/share/monetdef/hy_AM.UTF-8.src#1 branch .. //depot/projects/gdb/share/monetdef/kk_KZ.UTF-8.src#1 branch .. //depot/projects/gdb/share/monetdef/pl_PL.UTF-8.src#1 branch .. //depot/projects/gdb/share/monetdef/ru_RU.UTF-8.src#1 branch .. //depot/projects/gdb/share/monetdef/sr_YU.UTF-8.src#1 branch .. //depot/projects/gdb/share/monetdef/uk_UA.UTF-8.src#1 branch .. //depot/projects/gdb/share/monetdef/zh_CN.UTF-8.src#1 branch .. //depot/projects/gdb/share/monetdef/zh_HK.UTF-8.src#1 branch .. //depot/projects/gdb/share/msgdef/Makefile#3 integrate .. //depot/projects/gdb/share/msgdef/be_BY.UTF-8.src#1 branch .. //depot/projects/gdb/share/msgdef/bg_BG.UTF-8.src#1 branch .. //depot/projects/gdb/share/msgdef/el_GR.UTF-8.src#1 branch .. //depot/projects/gdb/share/msgdef/hy_AM.UTF-8.src#1 branch .. //depot/projects/gdb/share/msgdef/ja_JP.UTF-8.src#1 branch .. //depot/projects/gdb/share/msgdef/kk_KZ.UTF-8.src#1 branch .. //depot/projects/gdb/share/msgdef/ru_RU.UTF-8.src#1 branch .. //depot/projects/gdb/share/msgdef/sr_YU.UTF-8.src#1 branch .. //depot/projects/gdb/share/msgdef/uk_UA.UTF-8.src#1 branch .. //depot/projects/gdb/share/msgdef/zh_CN.UTF-8.src#1 branch .. //depot/projects/gdb/share/msgdef/zh_TW.UTF-8.src#1 branch .. //depot/projects/gdb/share/numericdef/Makefile#3 integrate .. //depot/projects/gdb/share/timedef/Makefile#3 integrate .. //depot/projects/gdb/share/timedef/be_BY.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/bg_BG.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/ca_ES.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/cs_CZ.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/da_DK.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/de_AT.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/de_DE.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/el_GR.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/es_ES.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/et_EE.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/fi_FI.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/fr_FR.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/hr_HR.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/hu_HU.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/hy_AM.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/is_IS.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/it_IT.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/ja_JP.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/kk_KZ.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/ko_KR.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/lt_LT.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/no_NO.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/pl_PL.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/pt_BR.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/pt_PT.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/ro_RO.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/ru_RU.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/sk_SK.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/sl_SI.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/sr_YU.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/sv_SE.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/tr_TR.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/uk_UA.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/zh_CN.UTF-8.src#1 branch .. //depot/projects/gdb/share/timedef/zh_TW.UTF-8.src#1 branch .. //depot/projects/gdb/sys/alpha/alpha/interrupt.c#4 integrate .. //depot/projects/gdb/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/gdb/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/gdb/sys/boot/alpha/common/conf.c#2 integrate .. //depot/projects/gdb/sys/boot/i386/boot0/boot0ext.s#1 branch .. //depot/projects/gdb/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/gdb/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/gdb/sys/compat/ndis/kern_ndis.c#7 integrate .. //depot/projects/gdb/sys/compat/ndis/subr_ndis.c#7 integrate .. //depot/projects/gdb/sys/compat/ndis/subr_ntoskrnl.c#9 integrate .. //depot/projects/gdb/sys/conf/files.powerpc#3 integrate .. //depot/projects/gdb/sys/conf/kern.pre.mk#6 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/gdb/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/gdb/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/gdb/sys/dev/firewire/firewirereg.h#2 integrate .. //depot/projects/gdb/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/gdb/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/gdb/sys/dev/firewire/fwdma.c#2 integrate .. //depot/projects/gdb/sys/dev/firewire/fwmem.c#2 integrate .. //depot/projects/gdb/sys/dev/firewire/fwohci.c#3 integrate .. //depot/projects/gdb/sys/dev/firewire/fwohci_pci.c#4 integrate .. //depot/projects/gdb/sys/dev/firewire/fwohcivar.h#2 integrate .. //depot/projects/gdb/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/gdb/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/gdb/sys/dev/firewire/sbp_targ.c#3 integrate .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis.c#7 integrate .. //depot/projects/gdb/sys/dev/ips/ips.h#4 integrate .. //depot/projects/gdb/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/gdb/sys/dev/pccard/pccarddevs#3 integrate .. //depot/projects/gdb/sys/dev/pccard/pccarddevs.h#3 integrate .. //depot/projects/gdb/sys/dev/twe/twe.c#3 integrate .. //depot/projects/gdb/sys/dev/twe/twe_freebsd.c#5 integrate .. //depot/projects/gdb/sys/dev/twe/twevar.h#3 integrate .. //depot/projects/gdb/sys/dev/usb/ohci.c#2 integrate .. //depot/projects/gdb/sys/dev/wi/if_wi_pccard.c#2 integrate .. //depot/projects/gdb/sys/ia64/ia64/vm_machdep.c#3 integrate .. //depot/projects/gdb/sys/kern/init_sysent.c#4 integrate .. //depot/projects/gdb/sys/kern/kern_thr.c#2 integrate .. //depot/projects/gdb/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/gdb/sys/kern/sched_ule.c#6 integrate .. //depot/projects/gdb/sys/kern/subr_bus.c#4 integrate .. //depot/projects/gdb/sys/kern/subr_param.c#3 integrate .. //depot/projects/gdb/sys/kern/subr_smp.c#5 integrate .. //depot/projects/gdb/sys/kern/sys_pipe.c#4 integrate .. //depot/projects/gdb/sys/kern/sys_process.c#4 integrate .. //depot/projects/gdb/sys/kern/syscalls.c#4 integrate .. //depot/projects/gdb/sys/kern/syscalls.master#4 integrate .. //depot/projects/gdb/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/gdb/sys/modules/Makefile#6 integrate .. //depot/projects/gdb/sys/modules/netgraph/sppp/Makefile#1 branch .. //depot/projects/gdb/sys/netgraph/ng_sppp.c#1 branch .. //depot/projects/gdb/sys/netgraph/ng_sppp.h#1 branch .. //depot/projects/gdb/sys/netgraph/ng_tee.c#3 integrate .. //depot/projects/gdb/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/gdb/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/gdb/sys/netinet/ip6.h#2 integrate .. //depot/projects/gdb/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/gdb/sys/netinet/ip_output.c#4 integrate .. //depot/projects/gdb/sys/netinet/raw_ip.c#3 integrate .. //depot/projects/gdb/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/gdb/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/gdb/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/gdb/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/gdb/sys/netinet6/in6_pcb.h#3 integrate .. //depot/projects/gdb/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/gdb/sys/netinet6/ip6_output.c#3 integrate .. //depot/projects/gdb/sys/netinet6/raw_ip6.c#3 integrate .. //depot/projects/gdb/sys/netinet6/udp6_output.c#3 integrate .. //depot/projects/gdb/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/gdb/sys/nfs4client/nfs4_dev.h#2 integrate .. //depot/projects/gdb/sys/nfsclient/nfs.h#4 integrate .. //depot/projects/gdb/sys/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/gdb/sys/nfsclient/nfs_subs.c#3 integrate .. //depot/projects/gdb/sys/pci/if_ste.c#3 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/uio_machdep.c#1 branch .. //depot/projects/gdb/sys/rpc/rpcclnt.c#4 integrate .. //depot/projects/gdb/sys/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/gdb/sys/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/iommu.c#2 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/vm_machdep.c#3 integrate .. //depot/projects/gdb/sys/sys/param.h#8 integrate .. //depot/projects/gdb/sys/sys/pcpu.h#3 integrate .. //depot/projects/gdb/sys/sys/pipe.h#3 integrate .. //depot/projects/gdb/sys/sys/proc.h#6 integrate .. //depot/projects/gdb/sys/sys/smp.h#2 integrate .. //depot/projects/gdb/sys/sys/syscall.h#4 integrate .. //depot/projects/gdb/sys/sys/syscall.mk#4 integrate .. //depot/projects/gdb/sys/sys/sysproto.h#4 integrate .. //depot/projects/gdb/sys/sys/thr.h#2 integrate .. //depot/projects/gdb/sys/sys/tree.h#3 integrate .. //depot/projects/gdb/sys/vm/vm_map.c#4 integrate .. //depot/projects/gdb/usr.bin/Makefile#5 integrate .. //depot/projects/gdb/usr.bin/doscmd/AsyncIO.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/AsyncIO.h#2 delete .. //depot/projects/gdb/usr.bin/doscmd/Makefile#3 delete .. //depot/projects/gdb/usr.bin/doscmd/Makefile.dos#2 delete .. //depot/projects/gdb/usr.bin/doscmd/PROBLEMS#2 delete .. //depot/projects/gdb/usr.bin/doscmd/ParseBuffer.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/README#2 delete .. //depot/projects/gdb/usr.bin/doscmd/README.booting_dos#2 delete .. //depot/projects/gdb/usr.bin/doscmd/bios.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/callback.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/callback.h#2 delete .. //depot/projects/gdb/usr.bin/doscmd/cmos.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/com.h#2 delete .. //depot/projects/gdb/usr.bin/doscmd/config.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/cp437-8x14.pcf.gz.uu#2 delete .. //depot/projects/gdb/usr.bin/doscmd/cp437-8x16.pcf.gz.uu#2 delete .. //depot/projects/gdb/usr.bin/doscmd/cp437-8x8.pcf.gz.uu#2 delete .. //depot/projects/gdb/usr.bin/doscmd/cpu.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/crt0.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/cwd.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/cwd.h#2 delete .. //depot/projects/gdb/usr.bin/doscmd/debug.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/disktab.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/dispatch.h#2 delete .. //depot/projects/gdb/usr.bin/doscmd/dos.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/dos.h#2 delete .. //depot/projects/gdb/usr.bin/doscmd/doscmd.1#2 delete .. //depot/projects/gdb/usr.bin/doscmd/doscmd.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/doscmd.h#2 delete .. //depot/projects/gdb/usr.bin/doscmd/doscmd_loader.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/ems.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/ems.h#2 delete .. //depot/projects/gdb/usr.bin/doscmd/emsdriv.S#2 delete .. //depot/projects/gdb/usr.bin/doscmd/emsdriv.sys.uu#2 delete .. //depot/projects/gdb/usr.bin/doscmd/emuint.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/emuint.h#2 delete .. //depot/projects/gdb/usr.bin/doscmd/exe.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/fonts.dir#2 delete .. //depot/projects/gdb/usr.bin/doscmd/i386-pinsn.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/int.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/int10.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/int13.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/int14.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/int16.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/int17.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/int1a.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/int2f.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/intff.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/mem.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/mouse.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/mouse.h#2 delete .. //depot/projects/gdb/usr.bin/doscmd/net.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/port.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/redir.S#2 delete .. //depot/projects/gdb/usr.bin/doscmd/redir.com.uu#2 delete .. //depot/projects/gdb/usr.bin/doscmd/register.h#2 delete .. //depot/projects/gdb/usr.bin/doscmd/setver.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/signal.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/timer.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/trace.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/trap.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/trap.h#2 delete .. //depot/projects/gdb/usr.bin/doscmd/tty.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/tty.h#2 delete .. //depot/projects/gdb/usr.bin/doscmd/video.c#2 delete .. //depot/projects/gdb/usr.bin/doscmd/video.h#2 delete .. //depot/projects/gdb/usr.bin/doscmd/vparams.h#2 delete .. //depot/projects/gdb/usr.bin/doscmd/xms.c#3 delete .. //depot/projects/gdb/usr.bin/doscmd/xms.h#2 delete .. //depot/projects/gdb/usr.bin/fstat/fstat.1#2 integrate .. //depot/projects/gdb/usr.bin/ipcs/ipcs.1#2 integrate .. //depot/projects/gdb/usr.bin/ipcs/ipcs.c#2 integrate .. //depot/projects/gdb/usr.bin/kdump/kdump.c#2 integrate .. //depot/projects/gdb/usr.bin/killall/killall.1#3 integrate .. //depot/projects/gdb/usr.bin/netstat/Makefile#2 integrate .. //depot/projects/gdb/usr.bin/netstat/main.c#3 integrate .. //depot/projects/gdb/usr.bin/netstat/mcast.c#1 branch .. //depot/projects/gdb/usr.bin/netstat/netstat.1#2 integrate .. //depot/projects/gdb/usr.bin/netstat/netstat.h#2 integrate .. //depot/projects/gdb/usr.bin/pkill/Makefile#1 branch .. //depot/projects/gdb/usr.bin/pkill/pkill.1#1 branch .. //depot/projects/gdb/usr.bin/pkill/pkill.c#1 branch .. //depot/projects/gdb/usr.bin/truss/Makefile#2 integrate .. //depot/projects/gdb/usr.bin/truss/syscall.h#2 integrate .. //depot/projects/gdb/usr.bin/truss/syscalls.c#2 integrate .. //depot/projects/gdb/usr.bin/vmstat/vmstat.8#2 integrate .. //depot/projects/gdb/usr.bin/vmstat/vmstat.c#3 integrate .. //depot/projects/gdb/usr.sbin/mountd/exports.5#3 integrate .. //depot/projects/gdb/usr.sbin/pstat/pstat.8#2 integrate .. //depot/projects/gdb/usr.sbin/pstat/pstat.c#3 integrate Differences ... ==== //depot/projects/gdb/MAINTAINERS#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.82 2004/03/01 16:34:39 obrien Exp $ +$FreeBSD: src/MAINTAINERS,v 1.84 2004/03/25 20:02:17 scottl Exp $ subsystem login notes ----------------------------- @@ -31,7 +31,6 @@ mlx scottl Pre-commit review requested. mly scottl Pre-commit review requested. maestro3 scottl Pre-commit review requested. -raidframe scottl Pre-commit review requested. CAM gibbs, ken Pre-commit review requested. send to scsi@freebsd.org devstat(9) ken Pre-commit review requested. @@ -90,6 +89,7 @@ requested. contrib/smbfs bp Open for in-tree committs. In case of functional changes pre-commit review requested. +contrib/pf mlaier Pre-commit review requested. binutils obrien Insists on BU blocked from unapproved commits ==== //depot/projects/gdb/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.297 2004/03/02 14:32:23 ru Exp $ +# $FreeBSD: src/Makefile,v 1.298 2004/03/24 08:26:22 ru Exp $ # # The user-driven targets are: # @@ -67,7 +67,7 @@ hierarchy install installcheck installkernel installkernel.debug\ reinstallkernel reinstallkernel.debug installworld \ libraries lint maninstall \ - obj objlink regress rerelease tags update \ + obj objlink regress rerelease tags toolchain update \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _cross-tools _includes _libraries _depend ==== //depot/projects/gdb/Makefile.inc1#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.420 2004/03/19 17:57:07 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.421 2004/03/24 08:26:22 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -343,6 +343,8 @@ buildworld: ${WMAKE_TGTS} .ORDER: ${WMAKE_TGTS} +toolchain: ${WMAKE_TGTS:N_depend:Neverything} + # # Use this to add checks to installworld/installkernel targets. # ==== //depot/projects/gdb/bin/ps/print.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.83 2003/08/13 07:35:07 harti Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.84 2004/03/28 02:13:31 gad Exp $"); #include #include @@ -653,9 +653,9 @@ struct priority *lpri; char str[8]; unsigned class, level; - + v = ve->var; - lpri = (struct priority *) ((char *)k + v->off); + lpri = &k->ki_p->ki_pri; class = lpri->pri_class; level = lpri->pri_level; switch (class) { ==== //depot/projects/gdb/bin/ps/ps.1#5 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.68 2004/03/21 11:24:06 tjr Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.72 2004/03/27 18:26:40 gad Exp $ .\" -.Dd March 21, 2004 +.Dd March 27, 2004 .Dt PS 1 .Os .Sh NAME @@ -40,7 +40,11 @@ .Nd process status .Sh SYNOPSIS .Nm -.Op Fl aCcefHhjlmrSTuvwxZ +.Op Fl aCcefHhjlmrSTuvwXxZ +.Oo Fl G Ar gid Ns Xo +.Op , Ns Ar gid Ns No ... +.Xc +.Oc .Op Fl M Ar core .Op Fl N Ar system .Op Fl O Ar fmt @@ -49,7 +53,10 @@ .Op , Ns Ar pid Ns No ... .Xc .Oc -.Op Fl t Ar tty +.Oo Fl t Ar tty Ns Xo +.Op , Ns Ar tty Ns No ... +.Xc +.Oc .Oo Fl U Ar username Ns Xo .Op , Ns Ar username Ns No ... .Xc @@ -65,7 +72,19 @@ This information is sorted by controlling terminal, then by process .Tn ID . .Pp -The information displayed is selected based on a set of keywords (see the +A different set of processes can be selected for display by using any +combination of the +.Fl a, G , p , T , t +and +.Fl U +options. +If more than one of these options are given, then +.Nm +will select all processes which are matched by at least one of the +given options. +.Pp +For the processes which have been selected for display, the information +to display is selected based on a set of keywords (see the .Fl L .Fl O and @@ -86,6 +105,10 @@ .Bl -tag -width indent .It Fl a Display information about other users' processes as well as your own. +This will skip any processes which do not have a controlling teminal, +unless the +.Fl x +option is also specified. This can be disabled by setting the .Va security.bsd.see_other_uids sysctl to zero. @@ -101,6 +124,10 @@ .It Fl f Show commandline and environment information about swapped out processes. This option is honored only if the uid of the user is 0. +.It Fl G +Display information about processes which are running with the specified +real group +.Tn ID(s) . .It Fl H Show all of the .Em kernel visible @@ -121,14 +148,13 @@ and command. .It Fl M Extract values associated with the name list from the specified core -instead of the default -.Pa /dev/kmem . +instead of the currently running system. .It Fl m Sort by memory usage, instead of by process .Tn ID . .It Fl N -Extract the name list from the specified system instead of the default -.Pa /boot/kernel/kernel . +Extract the name list from the specified system instead of the default, +which is the kernel image the system has booted from. .It Fl O Add the information associated with the space or comma separated list of keywords specified, after the process @@ -148,7 +174,7 @@ This causes the printed header to use the specified string instead of the standard header. .It Fl p -Display information associated with the specified process +Display information about processes which match the specified process .Tn ID(s) . .It Fl r Sort by current cpu usage, instead of by process @@ -161,7 +187,7 @@ with the standard input. .It Fl t Display information about processes attached to the specified terminal -device. +device(s). .It Fl U Display the processes belonging to the specified .Ar username Ns (s) . @@ -190,8 +216,22 @@ option is specified more than once, .Nm will use as many columns as necessary without regard for your window size. +.It Fl X +When displaying processes matched by other options, skip any processes +which do not have a controlling terminal. .It Fl x -Display information about processes without controlling terminals. +When displaying processes matched by other options, include processes +which do not have a controlling terminal. +This is the opposite of the +.Fl X +option. +If both +.Fl X +and +.Fl x +are specified in the same command, then +.Nm +will use the one which was specified last. .It Fl Z Add label to the list of keywords for which .Nm @@ -522,17 +562,11 @@ attempts to automatically determine the terminal width. .El .Sh FILES -.Bl -tag -width /var/db/kvm_kernel.db -compact -.It Pa /dev/kmem -default kernel memory +.Bl -tag -width ".Pa /boot/kernel/kernel" -compact .It Pa /dev/lomac interface used to query the .Xr lomac 4 KLD -.It Pa /var/run/dev.db -/dev name database -.It Pa /var/db/kvm_kernel.db -system namelist database .It Pa /boot/kernel/kernel default system namelist .It Pa /proc @@ -549,6 +583,14 @@ .Xr pstat 8 , .Xr sysctl 8 , .Xr mutex 9 +.Sh STANDARDS +For historical reasons, +.Nm +utility under +.Fx +supports a different set of options from what is described by +.St -p1003.2 , +and what is supported on non-BSD operating systems. .Sh HISTORY The .Nm ==== //depot/projects/gdb/bin/ps/ps.c#4 (text+ko) ==== @@ -29,6 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * ------+---------+---------+-------- + --------+---------+---------+---------* + * Copyright (c) 2004 - Garance Alistair Drosehn . + * All rights reserved. + * + * Significant modifications made to bring `ps' options somewhat closer + * to the standard for `ps' as described in SingleUnixSpec-v3. + * ------+---------+---------+-------- + --------+---------+---------+---------* */ #ifndef lint @@ -44,7 +51,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.66 2004/03/18 01:28:23 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.71 2004/03/27 22:14:42 gad Exp $"); #include #include @@ -56,11 +63,13 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -68,13 +77,15 @@ #include "ps.h" -#define SEP ", \t" /* username separators */ +#define W_SEP " \t" /* "Whitespace" list separators */ +#define T_SEP "," /* "Terminate-element" list separators */ static KINFO *kinfo; struct varent *vhead; int eval; /* exit value */ int cflag; /* -c */ +int optfatal; /* Fatal error parsing some list-option */ int rawcpu; /* -C */ int sumrusage; /* -S */ int termwidth; /* width of screen (0 == infinity) */ @@ -82,11 +93,32 @@ time_t now; /* current time(3) value */ +struct listinfo; +typedef int addelem_rtn(struct listinfo *_inf, const char *elem); + +struct listinfo { + int count; + int maxcount; + int elemsize; + addelem_rtn *addelem; + const char *lname; + union { + gid_t *gids; + pid_t *pids; + dev_t *ttys; + uid_t *uids; + void *ptr; + }; +}; + static int needuser, needcomm, needenv; -#if defined(LAZY_PS) -static int forceuread=0; + +#ifdef LAZY_PS +static int forceuread = 0; +#define OPT_LAZY_f "f" #else -static int forceuread=1; +static int forceuread = 1; +#define OPT_LAZY_f /* Ie, the `-f' option is not added. */ #endif static enum sort { DEFAULT, SORTMEM, SORTCPU } sortby = DEFAULT; @@ -100,8 +132,15 @@ static void dynsizevars(KINFO *); static void sizevars(void); static void usage(void); -static pid_t *getpids(const char *, int *); -static uid_t *getuids(const char *, int *); + +static int addelem_gid(struct listinfo *, const char *); +static int addelem_pid(struct listinfo *, const char *); +static int addelem_tty(struct listinfo *, const char *); +static int addelem_uid(struct listinfo *, const char *); +static void add_list(struct listinfo *, const char *); +static void *expand_list(struct listinfo *); +static void free_list(struct listinfo *); +static void init_list(struct listinfo *, addelem_rtn, int, const char *); static char dfmt[] = "pid,tt,state,time,command"; static char jfmt[] = "user,pid,ppid,pgid,jobc,state,tt,time,command"; @@ -114,24 +153,19 @@ static kvm_t *kd; -#if defined(LAZY_PS) -#define PS_ARGS "aCcefgHhjLlM:mN:O:o:p:rSTt:U:uvwxZ" -#else -#define PS_ARGS "aCcegHhjLlM:mN:O:o:p:rSTt:U:uvwxZ" -#endif +#define PS_ARGS "AaCc" OPT_LAZY_f "G:gHhjLlM:mN:O:o:p:rSTt:U:uvwXxZ" int main(int argc, char *argv[]) { + struct listinfo gidlist, pgrplist, pidlist; + struct listinfo ruidlist, sesslist, ttylist, uidlist; struct kinfo_proc *kp; struct varent *vent; struct winsize ws; - dev_t ttydev; - pid_t *pids; - uid_t *uids; - int all, ch, dropgid, flag, _fmt, i, lineno; - int nentries, nocludge, noutput, npids, nuids, pid; - int prtheader, showthreads, uid, wflag, what, xflg; + int all, ch, dropgid, elem, flag, _fmt, i, lineno; + int nentries, nocludge, nkept, nselectors; + int prtheader, showthreads, wflag, what, xkeep, xkeep_implied; char *cols; char errbuf[_POSIX2_LINE_MAX]; const char *cp, *nlistf, *memf; @@ -170,16 +204,32 @@ argv[1] = kludge_oldps_options(argv[1]); } - all = _fmt = prtheader = wflag = xflg = 0; - npids = nuids = 0; - pids = uids = NULL; - ttydev = NODEV; + xkeep = -1; /* Neither -x nor -X */ + all = _fmt = nselectors = prtheader = wflag = xkeep_implied = 0; + init_list(&gidlist, addelem_gid, sizeof(gid_t), "group"); + init_list(&pgrplist, addelem_pid, sizeof(pid_t), "process group"); + init_list(&pidlist, addelem_pid, sizeof(pid_t), "process id"); + init_list(&ruidlist, addelem_uid, sizeof(uid_t), "ruser"); + init_list(&sesslist, addelem_pid, sizeof(pid_t), "session id"); + init_list(&ttylist, addelem_tty, sizeof(dev_t), "tty"); + init_list(&uidlist, addelem_uid, sizeof(uid_t), "user"); dropgid = 0; + optfatal = 0; memf = nlistf = _PATH_DEVNULL; showthreads = 0; while ((ch = getopt(argc, argv, PS_ARGS)) != -1) switch((char)ch) { + case 'A': + /* + * Exactly the same as `-ax'. This has been + * added for compatability with SUSv3, but for + * now it will not be described in the man page. + */ + nselectors++; + all = xkeep = 1; + break; case 'a': + nselectors++; all = 1; break; case 'C': @@ -191,8 +241,30 @@ case 'e': /* XXX set ufmt */ needenv = 1; break; +#ifdef LAZY_PS + case 'f': + if (getuid() == 0 || getgid() == 0) + forceuread = 1; + break; +#endif + case 'G': + add_list(&gidlist, optarg); + xkeep_implied = 1; + nselectors++; + break; +#if 0 + /* XXX - This SUSv3 option is still under debate. */ + /* (it conflicts with the undocumented `-g' option) */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 27 23:14:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87FBA16A4D0; Sat, 27 Mar 2004 23:14:45 -0800 (PST) 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 5BE1E16A4CE for ; Sat, 27 Mar 2004 23:14:45 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 54FD243D3F for ; Sat, 27 Mar 2004 23:14:45 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2S7EjGe003789 for ; Sat, 27 Mar 2004 23:14:45 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2S7Ei6u003786 for perforce@freebsd.org; Sat, 27 Mar 2004 23:14:44 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sat, 27 Mar 2004 23:14:44 -0800 (PST) Message-Id: <200403280714.i2S7Ei6u003786@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 49829 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Mar 2004 07:14:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=49829 Change 49829 by marcel@marcel_nfs on 2004/03/27 23:14:33 Handle the T command. It's sent by gdb to check if a thread is alive. The command is sent prior to switching to that thread. This allows us to switch threads in gdb. Affected files ... .. //depot/projects/gdb/sys/gdb/gdb_main.c#10 edit Differences ... ==== //depot/projects/gdb/sys/gdb/gdb_main.c#10 (text+ko) ==== @@ -193,6 +193,18 @@ kdb_cpu_set_singlestep(); return (1); } + case 'T': { + intmax_t tid; + pid_t curtid; + gdb_rx_varhex(&tid); + curtid = kdb_thread->td_tid; + if (kdb_set_thread(tid)) + gdb_tx_ok(); + else + gdb_tx_err(ENOENT); + kdb_set_thread(tid); + break; + } case -1: /* Empty command. Treat as unknown command. */ /* FALLTHROUGH */