From owner-p4-projects@FreeBSD.ORG Sun Mar 13 00:28:41 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40C0D16A4D0; Sun, 13 Mar 2005 00:28:41 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F356916A4CE for ; Sun, 13 Mar 2005 00:28:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CBAED43D2F for ; Sun, 13 Mar 2005 00:28:40 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2D0SeuQ090625 for ; Sun, 13 Mar 2005 00:28:40 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2D0Se0I090622 for perforce@freebsd.org; Sun, 13 Mar 2005 00:28:40 GMT (envelope-from sam@freebsd.org) Date: Sun, 13 Mar 2005 00:28:40 GMT Message-Id: <200503130028.j2D0Se0I090622@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 72991 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, 13 Mar 2005 00:28:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=72991 Change 72991 by sam@sam_ebb on 2005/03/13 00:27:42 replace m_defrag with a private version that does what the driver needs with much less overhead Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#75 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#75 (text+ko) ==== @@ -3269,6 +3269,89 @@ ath_tx_cleanupq(sc, &sc->sc_txq[i]); } +/* + * Defragment an mbuf chain, returning at most maxfrags separate + * mbufs+clusters. If this is not possible NULL is returned and + * the original mbuf chain is left in it's present (potentially + * modified) state. We use two techniques: collapsing consecutive + * mbufs and replacing consecutive mbufs by a cluster. + */ +static struct mbuf * +ath_defrag(struct mbuf *m0, int how, int maxfrags) +{ + struct mbuf *m, *n, *n2, **prev; + u_int curfrags; + + /* + * Calculate the current number of frags. + */ + curfrags = 0; + for (m = m0; m != NULL; m = m->m_next) + curfrags++; + /* + * First, try to collapse mbufs. Note that we always collapse + * towards the front so we don't need to deal with moving the + * pkthdr. This may be suboptimal if the first mbuf has much + * less data than the following. + */ + m = m0; +again: + for (;;) { + n = m->m_next; + if (n == NULL) + break; + if (n->m_len < M_TRAILINGSPACE(m)) { + bcopy(mtod(n, void *), mtod(m, char *) + m->m_len, + n->m_len); + m->m_len += n->m_len; + m->m_next = n->m_next; + m_free(n); + if (--curfrags <= maxfrags) + return m0; + } else + m = n; + } + KASSERT(maxfrags > 1, + ("maxfrags %u, but normal collapse failed", maxfrags)); + /* + * Collapse consecutive mbufs to a cluster. + */ + prev = &m0->m_next; /* NB: not the first mbuf */ + while ((n = *prev) != NULL) { + if ((n2 = n->m_next) != NULL && + n->m_len + n2->m_len < MCLBYTES) { + m = m_getcl(how, MT_DATA, 0); + if (m == NULL) + goto bad; + bcopy(mtod(n, void *), mtod(m, void *), n->m_len); + bcopy(mtod(n2, void *), mtod(m, char *) + n->m_len, + n2->m_len); + m->m_len = n->m_len + n2->m_len; + m->m_next = n2->m_next; + *prev = m; + m_free(n); + m_free(n2); + if (--curfrags <= maxfrags) /* +1 cl -2 mbufs */ + return m0; + /* + * Still not there, try the normal collapse + * again before we allocate another cluster. + */ + goto again; + } + prev = &n->m_next; + } + /* + * No place where we can collapse to a cluster; punt. + * This can occur if, for example, you request 2 frags + * but the packet requires that both be clusters (we + * never reallocate the first mbuf to avoid moving the + * packet header). + */ +bad: + return NULL; +} + static int ath_tx_start(struct ath_softc *sc, struct ieee80211_node *ni, struct ath_buf *bf, struct mbuf *m0) @@ -3287,6 +3370,7 @@ const HAL_RATE_TABLE *rt; HAL_BOOL shortPreamble; struct ath_node *an; + struct mbuf *m; wh = mtod(m0, struct ieee80211_frame *); iswep = wh->i_fc[1] & IEEE80211_FC1_WEP; @@ -3361,12 +3445,14 @@ */ if (bf->bf_nseg > ATH_TXDESC) { /* too many desc's, linearize */ sc->sc_stats.ast_tx_linear++; - m0 = m_defrag(m0, M_DONTWAIT); + m = ath_defrag(m0, M_DONTWAIT, ATH_TXDESC); if (m0 == NULL) { + m_freem(m0); sc->sc_stats.ast_tx_nombuf++; m_freem(m0); return ENOMEM; } + m0 = m; error = bus_dmamap_load_mbuf_sg(sc->sc_dmat, bf->bf_dmamap, m0, bf->bf_segs, &bf->bf_nseg, BUS_DMA_NOWAIT); From owner-p4-projects@FreeBSD.ORG Sun Mar 13 18:36:02 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E64516A4DF; Sun, 13 Mar 2005 18:36:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1833D16A4D7 for ; Sun, 13 Mar 2005 18:36:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A090C43D46 for ; Sun, 13 Mar 2005 18:36:01 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2DIa101071464 for ; Sun, 13 Mar 2005 18:36:01 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2DIa196071461 for perforce@freebsd.org; Sun, 13 Mar 2005 18:36:01 GMT (envelope-from sam@freebsd.org) Date: Sun, 13 Mar 2005 18:36:01 GMT Message-Id: <200503131836.j2DIa196071461@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 73025 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, 13 Mar 2005 18:36:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=73025 Change 73025 by sam@sam_ebb on 2005/03/13 18:35:34 o check for rdonly mbuf's when coalescing o save stats+test stuff since this is a private branch Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#76 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#76 (text+ko) ==== @@ -3269,6 +3269,18 @@ ath_tx_cleanupq(sc, &sc->sc_txq[i]); } +SYSCTL_NODE(_hw_ath, OID_AUTO, defrag, CTLFLAG_RD, 0, "defrag testing"); +static int ath_maxfrags = 4; +SYSCTL_INT(_hw_ath_defrag, OID_AUTO, max, CTLFLAG_RW, &ath_maxfrags, 0, ""); +static int ath_defrags; +SYSCTL_INT(_hw_ath_defrag, OID_AUTO, calls, CTLFLAG_RW, &ath_defrags, 0, ""); +static int ath_collectedfrags; +SYSCTL_INT(_hw_ath_defrag, OID_AUTO, combined, CTLFLAG_RW, &ath_collectedfrags, 0, ""); +static int ath_replacedfrags; +SYSCTL_INT(_hw_ath_defrag, OID_AUTO, replaced, CTLFLAG_RW, &ath_replacedfrags, 0, ""); +static int ath_defragsfail; +SYSCTL_INT(_hw_ath_defrag, OID_AUTO, fail, CTLFLAG_RW, &ath_defragsfail, 0, ""); + /* * Defragment an mbuf chain, returning at most maxfrags separate * mbufs+clusters. If this is not possible NULL is returned and @@ -3282,12 +3294,14 @@ struct mbuf *m, *n, *n2, **prev; u_int curfrags; +ath_defrags++;/*XXX*/ /* * Calculate the current number of frags. */ curfrags = 0; for (m = m0; m != NULL; m = m->m_next) curfrags++; +if (curfrags <= maxfrags) return m0; /* XXX for testing */ /* * First, try to collapse mbufs. Note that we always collapse * towards the front so we don't need to deal with moving the @@ -3300,12 +3314,14 @@ n = m->m_next; if (n == NULL) break; - if (n->m_len < M_TRAILINGSPACE(m)) { + if ((m->m_flags & M_RDONLY) == 0 && + n->m_len < M_TRAILINGSPACE(m)) { bcopy(mtod(n, void *), mtod(m, char *) + m->m_len, n->m_len); m->m_len += n->m_len; m->m_next = n->m_next; m_free(n); +ath_collectedfrags++;/*XXX*/ if (--curfrags <= maxfrags) return m0; } else @@ -3331,6 +3347,7 @@ *prev = m; m_free(n); m_free(n2); +ath_replacedfrags++;/*XXX*/ if (--curfrags <= maxfrags) /* +1 cl -2 mbufs */ return m0; /* @@ -3349,6 +3366,7 @@ * packet header). */ bad: +ath_defragsfail++;/*XXX*/ return NULL; } @@ -3423,6 +3441,8 @@ pktlen += IEEE80211_CRC_LEN; +m = ath_defrag(m0, M_DONTWAIT, ath_maxfrags); if (m != NULL) m0 = m; /*XXX*/ + /* * Load the DMA map so any coalescing is done. This * also calculates the number of descriptors we need. From owner-p4-projects@FreeBSD.ORG Sun Mar 13 23:19:59 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15ABF16A4D0; Sun, 13 Mar 2005 23:19:59 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CB90616A4CE; Sun, 13 Mar 2005 23:19:58 +0000 (GMT) Received: from gw-kit.locore.ca (gw-kit.locore.ca [67.43.130.39]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6BACD43D1D; Sun, 13 Mar 2005 23:19:58 +0000 (GMT) (envelope-from jake@locore.ca) Received: from [10.0.0.3] (ws.locore.ca [10.0.0.3]) by gw-kit.locore.ca (Postfix) with ESMTP id 944041BAC7B; Sun, 13 Mar 2005 18:19:57 -0500 (EST) Message-ID: <4234CA9D.9080108@locore.ca> Date: Sun, 13 Mar 2005 18:19:57 -0500 From: Jake Burkholder User-Agent: Mozilla Thunderbird 1.0 (X11/20050213) X-Accept-Language: en-us, en MIME-Version: 1.0 To: John Baldwin References: <200503032211.j23MBlia013010@repoman.freebsd.org> In-Reply-To: <200503032211.j23MBlia013010@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit cc: Perforce Change Reviews Subject: Re: PERFORCE change 72454 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Mar 2005 23:19:59 -0000 John Baldwin wrote: >http://perforce.freebsd.org/chv.cgi?CH=72454 > >Change 72454 by jhb@jhb_slimer on 2005/03/03 22:11:16 > > Clobber all memory for atomic ops with an acquire barrier. > > Suggested by: alc > >Affected files ... > >.. //depot/projects/smpng/sys/sparc64/include/atomic.h#7 edit > >Differences ... > >==== //depot/projects/smpng/sys/sparc64/include/atomic.h#7 (text+ko) ==== > >@@ -90,6 +90,7 @@ > itype(sz) v; \ > v = atomic_cas(p, e, s, sz); \ > membar(LoadLoad | LoadStore); \ >+ __asm __volatile("" : : : "memory"); \ > v; \ > }) > >@@ -115,6 +116,7 @@ > itype(sz) t; \ > t = atomic_op(p, op, v, sz); \ > membar(LoadLoad | LoadStore); \ >+ __asm __volatile("" : : : "memory"); \ > t; \ > }) > >@@ -132,6 +134,7 @@ > itype(sz) v; \ > v = atomic_load(p, sz); \ > membar(LoadLoad | LoadStore); \ >+ __asm __volatile("" : : : "memory"); \ > v; \ > }) > > > > membar already has a memory clobber fwiw. Jake From owner-p4-projects@FreeBSD.ORG Mon Mar 14 18:58:47 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2661316A4D0; Mon, 14 Mar 2005 18:58:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EFB8516A4CE for ; Mon, 14 Mar 2005 18:58:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2FEF943D48 for ; Mon, 14 Mar 2005 18:58:46 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2EIwk5R084437 for ; Mon, 14 Mar 2005 18:58:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2EIwjSY084434 for perforce@freebsd.org; Mon, 14 Mar 2005 18:58:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 14 Mar 2005 18:58:45 GMT Message-Id: <200503141858.j2EIwjSY084434@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 73130 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, 14 Mar 2005 18:58:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=73130 Change 73130 by rwatson@rwatson_zoo on 2005/03/14 18:58:38 Integrate netperf_socket from FreeBSD CVS HEAD: - Busdma API moves MI. - pxeclient now always does a mountroot to get root FH. - Coda now uses the vnode lock not c_lock. - Centralized VFS inode hashes rather than per-fs hashes. - UDF bug involving races on hash insertion fixed. - Various other VFSisms, including ENOVXLOCK. - PSEUDOFS_TRACE - ehci, amr bug fixes. - vgone/vop_close/vop_reclaim/vop_revoke/vop_inactive/... VOP's now require vnode lock. - ng_device uses subr_unit. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/include/bus.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/include/bus_dma.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/bus_dma.h#3 integrate .. //depot/projects/netperf_socket/sys/arm/include/bus.h#5 integrate .. //depot/projects/netperf_socket/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/netperf_socket/sys/coda/cnode.h#5 integrate .. //depot/projects/netperf_socket/sys/coda/coda_subr.c#4 integrate .. //depot/projects/netperf_socket/sys/coda/coda_vnops.c#7 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#50 integrate .. //depot/projects/netperf_socket/sys/conf/files#62 integrate .. //depot/projects/netperf_socket/sys/conf/options#37 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amr.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/re/if_re.c#18 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_cpu_sparc64.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ehci.c#16 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_axe.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#31 integrate .. //depot/projects/netperf_socket/sys/fs/deadfs/dead_vnops.c#6 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_vnops.c#14 integrate .. //depot/projects/netperf_socket/sys/fs/fdescfs/fdesc_vnops.c#6 integrate .. //depot/projects/netperf_socket/sys/fs/fifofs/fifo_vnops.c#17 integrate .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs.h#5 integrate .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_hash.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_vfsops.c#10 integrate .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_vnops.c#8 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/denode.h#5 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_denode.c#7 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vfsops.c#14 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfsmount.h#7 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_vnops.c#8 integrate .. //depot/projects/netperf_socket/sys/fs/nullfs/null_subr.c#6 integrate .. //depot/projects/netperf_socket/sys/fs/nullfs/null_vnops.c#6 integrate .. //depot/projects/netperf_socket/sys/fs/nwfs/nwfs_io.c#7 integrate .. //depot/projects/netperf_socket/sys/fs/nwfs/nwfs_node.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs.c#6 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs_fileno.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs_vncache.c#7 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs_vnops.c#9 integrate .. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_io.c#7 integrate .. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_node.c#7 integrate .. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_vnops.c#8 integrate .. //depot/projects/netperf_socket/sys/fs/udf/udf.h#6 integrate .. //depot/projects/netperf_socket/sys/fs/udf/udf_vfsops.c#9 integrate .. //depot/projects/netperf_socket/sys/fs/udf/udf_vnops.c#10 integrate .. //depot/projects/netperf_socket/sys/fs/umapfs/umap_vnops.c#6 integrate .. //depot/projects/netperf_socket/sys/fs/unionfs/union_vnops.c#9 integrate .. //depot/projects/netperf_socket/sys/geom/geom_mbr.c#9 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_extern.h#7 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_inode.c#6 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vfsops.c#15 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vnops.c#14 integrate .. //depot/projects/netperf_socket/sys/i386/conf/PAE#6 integrate .. //depot/projects/netperf_socket/sys/i386/include/bus_dma.h#3 integrate .. //depot/projects/netperf_socket/sys/ia64/include/bus.h#3 integrate .. //depot/projects/netperf_socket/sys/ia64/include/bus_dma.h#1 branch .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_node.c#7 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_node.h#5 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_vfsops.c#14 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_vnops.c#9 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/iso.h#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exit.c#24 integrate .. //depot/projects/netperf_socket/sys/kern/kern_proc.c#22 integrate .. //depot/projects/netperf_socket/sys/kern/subr_unit.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_default.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_hash.c#1 branch .. //depot/projects/netperf_socket/sys/kern/vfs_subr.c#32 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_syscalls.c#18 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_vnops.c#16 integrate .. //depot/projects/netperf_socket/sys/kern/vnode_if.src#7 integrate .. //depot/projects/netperf_socket/sys/modules/ext2fs/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/pseudofs/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ufs/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_device.c#12 integrate .. //depot/projects/netperf_socket/sys/netinet/if_ether.c#16 integrate .. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vnops.c#12 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_bio.c#16 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_node.c#8 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_subs.c#15 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_vnops.c#13 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/bus.h#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/bus_dma.h#1 branch .. //depot/projects/netperf_socket/sys/sparc64/include/bus.h#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/bus_dma.h#1 branch .. //depot/projects/netperf_socket/sys/sys/bus_dma.h#1 branch .. //depot/projects/netperf_socket/sys/sys/vnode.h#18 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_inode.c#6 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_snapshot.c#13 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_softdep.c#10 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vfsops.c#19 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vnops.c#14 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/inode.h#6 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_extern.h#8 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_inode.c#5 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_vfsops.c#6 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_vnops.c#16 integrate .. //depot/projects/netperf_socket/sys/vm/vnode_pager.c#12 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/include/bus.h#3 (text+ko) ==== @@ -67,7 +67,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/sys/alpha/include/bus.h,v 1.28 2005/01/29 21:43:33 ru Exp $ */ +/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.29 2005/03/14 16:46:27 scottl Exp $ */ #ifndef _ALPHA_BUS_H_ #define _ALPHA_BUS_H_ @@ -481,195 +481,6 @@ #define bus_space_copy_region_stream_4(t, h1, o1, h2, o2, c) \ bus_space_copy_region_4((t), (h1), (o1), (h2), (o2), (c)) -/* - * Flags used in various bus DMA methods. - */ -#define BUS_DMA_WAITOK 0x00 /* safe to sleep (pseudo-flag) */ -#define BUS_DMA_NOWAIT 0x01 /* not safe to sleep */ -#define BUS_DMA_ALLOCNOW 0x02 /* perform resource allocation now */ -#define BUS_DMA_COHERENT 0x04 /* hint: map memory in a coherent way */ -#define BUS_DMA_ZERO 0x08 /* allocate zero'ed memory */ -#define BUS_DMA_ISA 0x10 /* map memory for ISA dma */ -#define BUS_DMA_BUS2 0x20 /* placeholders for bus functions... */ -#define BUS_DMA_BUS3 0x40 -#define BUS_DMA_BUS4 0x80 - -/* Forwards needed by prototypes below. */ -struct mbuf; -struct uio; - -/* - * Operations performed by bus_dmamap_sync(). - */ -typedef int bus_dmasync_op_t; -#define BUS_DMASYNC_PREREAD 1 -#define BUS_DMASYNC_POSTREAD 2 -#define BUS_DMASYNC_PREWRITE 4 -#define BUS_DMASYNC_POSTWRITE 8 - -/* - * bus_dma_tag_t - * - * A machine-dependent opaque type describing the characteristics - * of how to perform DMA mappings. This structure encapsultes - * information concerning address and alignment restrictions, number - * of S/G segments, amount of data per S/G segment, etc. - */ -typedef struct bus_dma_tag *bus_dma_tag_t; - -/* - * bus_dmamap_t - * - * DMA mapping instance information. - */ -typedef struct bus_dmamap *bus_dmamap_t; - -/* - * bus_dma_segment_t - * - * Describes a single contiguous DMA transaction. Values - * are suitable for programming into DMA registers. - */ -typedef struct bus_dma_segment { - bus_addr_t ds_addr; /* DMA address */ - bus_size_t ds_len; /* length of transfer */ -} bus_dma_segment_t; - -/* - * A function that returns 1 if the address cannot be accessed by - * a device and 0 if it can be. - */ -typedef int bus_dma_filter_t(void *, bus_addr_t); - -/* - * A function that performs driver-specific syncronization on behalf of - * busdma. - */ -typedef enum { - BUS_DMA_LOCK = 0x01, - BUS_DMA_UNLOCK = 0x02, -} bus_dma_lock_op_t; - -typedef void bus_dma_lock_t(void *, bus_dma_lock_op_t); - -/* - * Allocate a device specific dma_tag encapsulating the constraints of - * the parent tag in addition to other restrictions specified: - * - * alignment: alignment for segments. - * boundary: Boundary that segments cannot cross. - * lowaddr: Low restricted address that cannot appear in a mapping. - * highaddr: High restricted address that cannot appear in a mapping. - * filtfunc: An optional function to further test if an address - * within the range of lowaddr and highaddr cannot appear - * in a mapping. - * filtfuncarg: An argument that will be passed to filtfunc in addition - * to the address to test. - * maxsize: Maximum mapping size supported by this tag. - * nsegments: Number of discontinuities allowed in maps. - * maxsegsz: Maximum size of a segment in the map. - * flags: Bus DMA flags. - * lockfunc: An optional function to handle driver-defined lock - * operations. - * lockfuncarg: An argument that will be passed to lockfunc in addition - * to the lock operation. - * dmat: A pointer to set to a valid dma tag should the return - * value of this function indicate success. - */ -/* XXX Should probably allow specification of alignment */ -int bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignemnt, - bus_size_t boundary, bus_addr_t lowaddr, - bus_addr_t highaddr, bus_dma_filter_t *filtfunc, - void *filtfuncarg, bus_size_t maxsize, int nsegments, - bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, - void *lockfuncarg, bus_dma_tag_t *dmat); - -int bus_dma_tag_destroy(bus_dma_tag_t dmat); - -/* - * Allocate a handle for mapping from kva/uva/physical - * address space into bus device space. - */ -int bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp); - -/* - * Destroy a handle for mapping from kva/uva/physical - * address space into bus device space. - */ -int bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map); - -/* - * Allocate a piece of memory that can be efficiently mapped into - * bus device space based on the constraints lited in the dma tag. - * A dmamap to for use with dmamap_load is also allocated. - */ -int bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags, - bus_dmamap_t *mapp); - -/* - * Free a piece of memory and it's allociated dmamap, that was allocated - * via bus_dmamem_alloc. - */ -void bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map); - -/* - * A function that processes a successfully loaded dma map or an error - * from a delayed load map. - */ -typedef void bus_dmamap_callback_t(void *, bus_dma_segment_t *, int, int); - -/* - * Map the buffer buf into bus space using the dmamap map. - */ -int bus_dmamap_load(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, - bus_size_t buflen, bus_dmamap_callback_t *callback, - void *callback_arg, int flags); - -/* - * Like bus_dmamap_callback but includes map size in bytes. This is - * defined as a separate interface to maintain compatiiblity for users - * of bus_dmamap_callback_t--at some point these interfaces should be merged. - */ -typedef void bus_dmamap_callback2_t(void *, bus_dma_segment_t *, int, bus_size_t, int); -/* - * Like bus_dmamap_load but for mbufs. Note the use of the - * bus_dmamap_callback2_t interface. - */ -int bus_dmamap_load_mbuf(bus_dma_tag_t dmat, bus_dmamap_t map, - struct mbuf *mbuf, - bus_dmamap_callback2_t *callback, void *callback_arg, - int flags); -int bus_dmamap_load_mbuf_sg(bus_dma_tag_t dmat, bus_dmamap_t map, - struct mbuf *mbuf, bus_dma_segment_t *segs, - int *nsegs, int flags); -/* - * Like bus_dmamap_load but for uios. Note the use of the - * bus_dmamap_callback2_t interface. - */ -int bus_dmamap_load_uio(bus_dma_tag_t dmat, bus_dmamap_t map, - struct uio *ui, - bus_dmamap_callback2_t *callback, void *callback_arg, - int flags); - -/* - * Perform a syncronization operation on the given map. - */ -void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_dmasync_op_t); -#define bus_dmamap_sync(dmat, dmamap, op) \ - if ((dmamap) != NULL) \ - _bus_dmamap_sync(dmat, dmamap, op) - -/* - * Release the mapping held by map. - */ -void _bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map); -#define bus_dmamap_unload(dmat, dmamap) \ - if ((dmamap) != NULL) \ - _bus_dmamap_unload(dmat, dmamap) - -/* - * Generic helper function for manipulating mutexes. - */ -void busdma_lock_mutex(void *arg, bus_dma_lock_op_t op); +#include #endif /* _ALPHA_BUS_H_ */ ==== //depot/projects/netperf_socket/sys/amd64/include/bus_dma.h#3 (text+ko) ==== @@ -1,13 +1,7 @@ -/* $NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $ */ - /*- - * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. + * Copyright (c) 2005 Scott Long * All rights reserved. * - * This code is derived from software contributed to The NetBSD Foundation - * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility, - * NASA Ames Research Center. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -16,252 +10,24 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ +/* $FreeBSD: src/sys/amd64/include/bus_dma.h,v 1.29 2005/03/14 16:46:27 scottl Exp $ */ -/*- - * Copyright (c) 1996 Charles M. Hannum. All rights reserved. - * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Christopher G. Demetriou - * for the NetBSD Project. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -/* $FreeBSD: src/sys/amd64/include/bus_dma.h,v 1.28 2005/01/21 05:56:41 peter Exp $ */ - #ifndef _AMD64_BUS_DMA_H_ #define _AMD64_BUS_DMA_H_ -/* - * Flags used in various bus DMA methods. - */ -#define BUS_DMA_WAITOK 0x00 /* safe to sleep (pseudo-flag) */ -#define BUS_DMA_NOWAIT 0x01 /* not safe to sleep */ -#define BUS_DMA_ALLOCNOW 0x02 /* perform resource allocation now */ -#define BUS_DMA_COHERENT 0x04 /* hint: map memory in a coherent way */ -#define BUS_DMA_ZERO 0x08 /* allocate zero'ed memory */ -#define BUS_DMA_BUS1 0x10 /* placeholders for bus functions... */ -#define BUS_DMA_BUS2 0x20 -#define BUS_DMA_BUS3 0x40 -#define BUS_DMA_BUS4 0x80 - -/* Forwards needed by prototypes below. */ -struct mbuf; -struct uio; - -/* - * Operations performed by bus_dmamap_sync(). - */ -typedef int bus_dmasync_op_t; -#define BUS_DMASYNC_PREREAD 1 -#define BUS_DMASYNC_POSTREAD 2 -#define BUS_DMASYNC_PREWRITE 4 -#define BUS_DMASYNC_POSTWRITE 8 - -/* - * bus_dma_tag_t - * - * A machine-dependent opaque type describing the characteristics - * of how to perform DMA mappings. This structure encapsultes - * information concerning address and alignment restrictions, number - * of S/G segments, amount of data per S/G segment, etc. - */ -typedef struct bus_dma_tag *bus_dma_tag_t; - -/* - * bus_dmamap_t - * - * DMA mapping instance information. - */ -typedef struct bus_dmamap *bus_dmamap_t; - -/* - * bus_dma_segment_t - * - * Describes a single contiguous DMA transaction. Values - * are suitable for programming into DMA registers. - */ -typedef struct bus_dma_segment { - bus_addr_t ds_addr; /* DMA address */ - bus_size_t ds_len; /* length of transfer */ -} bus_dma_segment_t; - -/* - * A function that returns 1 if the address cannot be accessed by - * a device and 0 if it can be. - */ -typedef int bus_dma_filter_t(void *, bus_addr_t); - -/* - * A function that performs driver-specific synchronization on behalf of - * busdma. - */ -typedef enum { - BUS_DMA_LOCK = 0x01, - BUS_DMA_UNLOCK = 0x02, -} bus_dma_lock_op_t; - -typedef void bus_dma_lock_t(void *, bus_dma_lock_op_t); - -/* - * Allocate a device specific dma_tag encapsulating the constraints of - * the parent tag in addition to other restrictions specified: - * - * alignment: Alignment for segments. - * boundary: Boundary that segments cannot cross. - * lowaddr: Low restricted address that cannot appear in a mapping. - * highaddr: High restricted address that cannot appear in a mapping. - * filtfunc: An optional function to further test if an address - * within the range of lowaddr and highaddr cannot appear - * in a mapping. - * filtfuncarg: An argument that will be passed to filtfunc in addition - * to the address to test. - * maxsize: Maximum mapping size supported by this tag. - * nsegments: Number of discontinuities allowed in maps. - * maxsegsz: Maximum size of a segment in the map. - * flags: Bus DMA flags. - * lockfunc: An optional function to handle driver-defined lock - * operations. - * lockfuncarg: An argument that will be passed to lockfunc in addition - * to the lock operation. - * dmat: A pointer to set to a valid dma tag should the return - * value of this function indicate success. - */ -/* XXX Should probably allow specification of alignment */ -int bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, - bus_size_t boundary, bus_addr_t lowaddr, - bus_addr_t highaddr, bus_dma_filter_t *filtfunc, - void *filtfuncarg, bus_size_t maxsize, int nsegments, - bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, - void *lockfuncarg, bus_dma_tag_t *dmat); - -int bus_dma_tag_destroy(bus_dma_tag_t dmat); - -/* - * Allocate a handle for mapping from kva/uva/physical - * address space into bus device space. - */ -int bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp); +#include -/* - * Destroy a handle for mapping from kva/uva/physical - * address space into bus device space. - */ -int bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map); - -/* - * Allocate a piece of memory that can be efficiently mapped into - * bus device space based on the constraints listed in the dma tag. - * A dmamap to for use with dmamap_load is also allocated. - */ -int bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags, - bus_dmamap_t *mapp); - -/* - * Free a piece of memory and its allocated dmamap, that was allocated - * via bus_dmamem_alloc. - */ -void bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map); - -/* - * A function that processes a successfully loaded dma map or an error - * from a delayed load map. - */ -typedef void bus_dmamap_callback_t(void *, bus_dma_segment_t *, int, int); - -/* - * Map the buffer buf into bus space using the dmamap map. - */ -int bus_dmamap_load(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, - bus_size_t buflen, bus_dmamap_callback_t *callback, - void *callback_arg, int flags); - -/* - * Like bus_dmamap_callback but includes map size in bytes. This is - * defined as a separate interface to maintain compatibility for users - * of bus_dmamap_callback_t--at some point these interfaces should be merged. - */ -typedef void bus_dmamap_callback2_t(void *, bus_dma_segment_t *, int, bus_size_t, int); -/* - * Like bus_dmamap_load but for mbufs. Note the use of the - * bus_dmamap_callback2_t interface. - */ -int bus_dmamap_load_mbuf(bus_dma_tag_t dmat, bus_dmamap_t map, - struct mbuf *mbuf, - bus_dmamap_callback2_t *callback, void *callback_arg, - int flags); - -int bus_dmamap_load_mbuf_sg(bus_dma_tag_t dmat, bus_dmamap_t map, - struct mbuf *mbuf, bus_dma_segment_t *segs, - int *nsegs, int flags); - -/* - * Like bus_dmamap_load but for uios. Note the use of the - * bus_dmamap_callback2_t interface. - */ -int bus_dmamap_load_uio(bus_dma_tag_t dmat, bus_dmamap_t map, - struct uio *ui, - bus_dmamap_callback2_t *callback, void *callback_arg, - int flags); - -/* - * Perform a synchronization operation on the given map. - */ -void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_dmasync_op_t); -#define bus_dmamap_sync(dmat, dmamap, op) \ - if ((dmamap) != NULL) \ - _bus_dmamap_sync(dmat, dmamap, op) - -/* - * Release the mapping held by map. - */ -void _bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map); -#define bus_dmamap_unload(dmat, dmamap) \ - if ((dmamap) != NULL) \ - _bus_dmamap_unload(dmat, dmamap) - -/* - * Generic helper function for manipulating mutexes. - */ -void busdma_lock_mutex(void *arg, bus_dma_lock_op_t op); #endif /* _AMD64_BUS_DMA_H_ */ ==== //depot/projects/netperf_socket/sys/arm/include/bus.h#5 (text+ko) ==== @@ -67,7 +67,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/sys/arm/include/bus.h,v 1.6 2005/01/15 19:31:08 cognet Exp $ + * $FreeBSD: src/sys/arm/include/bus.h,v 1.7 2005/03/14 16:46:27 scottl Exp $ */ #ifndef _MACHINE_BUS_H_ @@ -592,158 +592,6 @@ #define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t) -/* Bus Space DMA macros */ - -/* - * Flags used in various bus DMA methods. - */ -#define BUS_DMA_WAITOK 0x000 /* safe to sleep (pseudo-flag) */ -#define BUS_DMA_NOWAIT 0x001 /* not safe to sleep */ -#define BUS_DMA_ALLOCNOW 0x002 /* perform resource allocation now */ -#define BUS_DMA_COHERENT 0x004 /* hint: map memory DMA coherent */ -#define BUS_DMA_ZERO 0x008 /* hint: sequential, unidirectional */ -#define BUS_DMA_BUS1 0x010 /* placeholders for bus functions... */ -#define BUS_DMA_BUS2 0x020 -#define BUS_DMA_BUS3 0x040 -#define BUS_DMA_BUS4 0x080 - -/* Forwards needed by prototypes below. */ -struct mbuf; -struct uio; - -/* - * Operations performed by bus_dmamap_sync(). - */ -#define BUS_DMASYNC_PREREAD 0x01 /* pre-read synchronization */ -#define BUS_DMASYNC_POSTREAD 0x02 /* post-read synchronization */ -#define BUS_DMASYNC_PREWRITE 0x04 /* pre-write synchronization */ -#define BUS_DMASYNC_POSTWRITE 0x08 /* post-write synchronization */ - -typedef struct bus_dma_tag *bus_dma_tag_t; -typedef struct bus_dmamap *bus_dmamap_t; - -#define BUS_DMA_TAG_VALID(t) ((t) != (bus_dma_tag_t)0) - -/* - * bus_dma_segment_t - * - * Describes a single contiguous DMA transaction. Values - * are suitable for programming into DMA registers. - */ -struct bus_dma_segment { - /* - * PUBLIC MEMBERS: these are used by machine-independent code. - */ - bus_addr_t ds_addr; /* DMA address */ - bus_size_t ds_len; /* length of transfer */ -}; -typedef struct bus_dma_segment bus_dma_segment_t; - -/* - * arm32_dma_range - * - * This structure describes a valid DMA range. - */ -struct arm32_dma_range { - bus_addr_t dr_sysbase; /* system base address */ - bus_addr_t dr_busbase; /* appears here on bus */ - bus_size_t dr_len; /* length of range */ -}; - -/* - * bus_dma_tag_t - * - * A machine-dependent opaque type describing the implementation of - * DMA for a given bus. - */ - -typedef void bus_dmamap_callback_t(void *, bus_dma_segment_t *, int, int); -typedef int bus_dmasync_op_t; -typedef void bus_dmamap_callback2_t(void *, bus_dma_segment_t *, int, bus_size_t, int); - - -#ifdef _ARM32_BUS_DMA_PRIVATE - -/* _dm_buftype */ -#define ARM32_BUFTYPE_INVALID 0 -#define ARM32_BUFTYPE_LINEAR 1 -#define ARM32_BUFTYPE_MBUF 2 -#define ARM32_BUFTYPE_UIO 3 -#define ARM32_BUFTYPE_RAW 4 - -struct arm32_dma_range *bus_dma_get_range(void); -int bus_dma_get_range_nb(void); -#endif /* _ARM32_BUS_DMA_PRIVATE */ - -/* - * A function that returns 1 if the address cannot be accessed by - * a device and 0 if it can be. - */ -typedef int bus_dma_filter_t(void *, bus_addr_t); - -/* - * A function that performs driver-specific syncronization on behalf of - * busdma. - */ -typedef enum { - BUS_DMA_LOCK = 0x01, - BUS_DMA_UNLOCK = 0x02, -} bus_dma_lock_op_t; - -typedef void bus_dma_lock_t(void *, bus_dma_lock_op_t); - -/* - * Allocate a device specific dma_tag encapsulating the constraints of - * the parent tag in addition to other restrictions specified: - * - * alignment: alignment for segments. - * boundary: Boundary that segments cannot cross. - * lowaddr: Low restricted address that cannot appear in a mapping. - * highaddr: High restricted address that cannot appear in a mapping. - * filtfunc: An optional function to further test if an address - * within the range of lowaddr and highaddr cannot appear - * in a mapping. - * filtfuncarg: An argument that will be passed to filtfunc in addition - * to the address to test. - * maxsize: Maximum mapping size supported by this tag. - * nsegments: Number of discontinuities allowed in maps. - * maxsegsz: Maximum size of a segment in the map. - * flags: Bus DMA flags. - * dmat: A pointer to set to a valid dma tag should the return - * value of this function indicate success. - */ -int bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, - bus_size_t boundary, bus_addr_t lowaddr, - bus_addr_t highaddr, bus_dma_filter_t *filtfunc, - void *filtfuncarg, bus_size_t maxsize, int nsegments, - bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, - void *lockfuncarg, bus_dma_tag_t *dmat); - -int bus_dma_tag_destroy(bus_dma_tag_t dmat); - -int bus_dmamap_create (bus_dma_tag_t, int, bus_dmamap_t *); -int bus_dmamap_destroy (bus_dma_tag_t, bus_dmamap_t); -int bus_dmamap_load (bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, bus_dmamap_callback_t *, void *, int); -int bus_dmamap_load_mbuf (bus_dma_tag_t, bus_dmamap_t, - struct mbuf *, bus_dmamap_callback2_t *, void *, int); -int bus_dmamap_load_mbuf_sg(bus_dma_tag_t dmat, bus_dmamap_t map, - struct mbuf *mbuf, bus_dma_segment_t *segs, - int *nsegs, int flags); -int bus_dmamap_load_uio (bus_dma_tag_t, bus_dmamap_t, - struct uio *, bus_dmamap_callback2_t *, void *, int); -void bus_dmamap_unload (bus_dma_tag_t, bus_dmamap_t); -void bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_dmasync_op_t); - -int bus_dmamem_alloc (bus_dma_tag_t tag, void **vaddr, int flag, - bus_dmamap_t *mapp); -void bus_dmamem_free (bus_dma_tag_t tag, void *vaddr, bus_dmamap_t map); - -/* - * Generic helper function for manipulating mutexes. - */ -void busdma_lock_mutex(void *arg, bus_dma_lock_op_t op); - #define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF #define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF #define BUS_SPACE_MAXADDR 0xFFFFFFFF @@ -778,4 +626,6 @@ bus_space_write_multi_4((t), (h), (o), (a), (c)) +#include + #endif /* _MACHINE_BUS_H_ */ ==== //depot/projects/netperf_socket/sys/boot/i386/libi386/pxe.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/pxe.c,v 1.20 2003/08/25 23:28:31 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/pxe.c,v 1.21 2005/03/12 21:26:53 kan Exp $"); #include #include @@ -413,6 +413,22 @@ /* structure truncated here */ }; extern struct nfs_iodesc nfs_root_node; +extern int rpc_port; + +static void +pxe_rpcmountcall() +{ + struct iodesc *d; + int error; + + if (!(d = socktodesc(pxe_sock))) + return; + d->myport = htons(--rpc_port); + d->destip = rootip; + if ((error = nfs_getrootfh(d, rootpath, nfs_root_node.fh)) != 0) + printf("NFS MOUNT RPC error: %d\n", error); + nfs_root_node.iodesc = d; +} static void pxe_setnfshandle(char *rootpath) @@ -421,6 +437,14 @@ u_char *fh; char buf[2 * NFS_FHSIZE + 3], *cp; + /* + * If NFS files were never opened, we need to do mount call + * ourselves. Use nfs_root_node.iodesc as flag indicating + * previous NFS usage. + */ + if (nfs_root_node.iodesc == NULL) + pxe_rpcmountcall(); + fh = &nfs_root_node.fh[0]; buf[0] = 'X'; cp = &buf[1]; ==== //depot/projects/netperf_socket/sys/coda/cnode.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/cnode.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/cnode.h,v 1.16 2005/01/05 23:35:00 imp Exp $ + * $FreeBSD: src/sys/coda/cnode.h,v 1.17 2005/03/13 12:09:34 jeff Exp $ * */ @@ -102,7 +102,6 @@ struct vnode *c_vnode; u_short c_flags; /* flags (see below) */ CodaFid c_fid; /* file handle */ - struct lock c_lock; /* new lock protocol */ struct vnode *c_ovp; /* open vnode pointer */ u_short c_ocount; /* count of openers */ u_short c_owrite; /* count of open for write */ ==== //depot/projects/netperf_socket/sys/coda/coda_subr.c#4 (text+ko) ==== @@ -52,7 +52,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_subr.c,v 1.30 2005/01/05 23:35:00 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_subr.c,v 1.31 2005/03/13 12:10:15 jeff Exp $"); #include #include @@ -315,7 +315,7 @@ MNT_ILOCK(mp); MNT_VNODE_FOREACH(vp, mp, nvp) { VI_LOCK(vp); - if (vp->v_iflag & VI_XLOCK) { + if (vp->v_iflag & VI_DOOMED) { VI_UNLOCK(vp); continue; } ==== //depot/projects/netperf_socket/sys/coda/coda_vnops.c#7 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.63 2005/02/07 08:04:24 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.64 2005/03/13 12:09:34 jeff Exp $"); #include #include @@ -847,7 +847,6 @@ printf("coda_inactive: cp->ovp != NULL use %d: vp %p, cp %p\n", vrefcnt(vp), vp, cp); #endif - lockmgr(&cp->c_lock, LK_RELEASE, &vp->v_interlock, td); } else { #ifdef OLD_DIAGNOSTIC if (vrefcnt(CTOV(cp))) { @@ -857,7 +856,6 @@ panic("coda_inactive: cp->ovp != NULL"); } #endif - VOP_UNLOCK(vp, 0, td); vgone(vp); } @@ -1630,7 +1628,6 @@ #endif } cache_purge(vp); - lockdestroy(&(VTOC(vp)->c_lock)); coda_free(VTOC(vp)); vp->v_data = NULL; vnode_destroy_vobject(vp); @@ -1643,23 +1640,22 @@ /* true args */ struct vnode *vp = ap->a_vp; struct cnode *cp = VTOC(vp); - struct thread *td = ap->a_td; /* upcall decl */ /* locals */ ENTRY; + if ((ap->a_flags & LK_INTERLOCK) == 0) { + VI_LOCK(vp); + ap->a_flags |= LK_INTERLOCK; + } + if (coda_lockdebug) { myprintf(("Attempting lock on %s\n", coda_f2s(&cp->c_fid))); } -#ifndef DEBUG_LOCKS - return (lockmgr(&cp->c_lock, ap->a_flags, &vp->v_interlock, td)); -#else - return (debuglockmgr(&cp->c_lock, ap->a_flags, &vp->v_interlock, td, - "coda_lock", vp->filename, vp->line)); -#endif + return (vop_stdlock(ap)); } int @@ -1668,7 +1664,6 @@ /* true args */ struct vnode *vp = ap->a_vp; struct cnode *cp = VTOC(vp); - struct thread *td = ap->a_td; /* upcall decl */ /* locals */ @@ -1678,17 +1673,16 @@ coda_f2s(&cp->c_fid))); } - return (lockmgr(&cp->c_lock, ap->a_flags | LK_RELEASE, &vp->v_interlock, td)); + return (vop_stdunlock(ap)); } int coda_islocked(struct vop_islocked_args *ap) { /* true args */ - struct cnode *cp = VTOC(ap->a_vp); ENTRY; - return (lockstatus(&cp->c_lock, ap->a_td)); + return (vop_stdislocked(ap)); } /* How one looks up a vnode given a device/inode pair: */ @@ -1808,7 +1802,6 @@ struct vnode *vp; cp = coda_alloc(); - lockinit(&cp->c_lock, PINOD, "cnode", 0, 0); cp->c_fid = *fid; err = getnewvnode("coda", vfsp, &coda_vnodeops, &vp); ==== //depot/projects/netperf_socket/sys/conf/NOTES#50 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1303 2005/03/07 02:20:14 grog Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1304 2005/03/14 16:04:26 des Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -807,6 +807,7 @@ options PORTALFS #Portal filesystem options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework +options PSEUDOFS_TRACE #Debugging support for PSEUDOFS options SMBFS #SMB/CIFS filesystem options UDF #Universal Disk Format # Broken (seriously (functionally) broken): ==== //depot/projects/netperf_socket/sys/conf/files#62 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 15 00:33:46 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF1EB16A4D0; Tue, 15 Mar 2005 00:33:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 57A6B16A4CE for ; Tue, 15 Mar 2005 00:33:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 63DCE43D48 for ; Tue, 15 Mar 2005 00:33:44 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2F0XijU005440 for ; Tue, 15 Mar 2005 00:33:44 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2F0XhmM005437 for perforce@freebsd.org; Tue, 15 Mar 2005 00:33:43 GMT (envelope-from peter@freebsd.org) Date: Tue, 15 Mar 2005 00:33:43 GMT Message-Id: <200503150033.j2F0XhmM005437@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 73153 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, 15 Mar 2005 00:33:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=73153 Change 73153 by peter@peter_daintree on 2005/03/15 00:33:33 IFC @73152 Affected files ... .. //depot/projects/hammer/MAINTAINERS#31 integrate .. //depot/projects/hammer/bin/pax/ar_io.c#7 integrate .. //depot/projects/hammer/contrib/top/top.X#5 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#50 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#33 integrate .. //depot/projects/hammer/etc/rc.d/lomac#5 delete .. //depot/projects/hammer/etc/syslog.conf#8 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#41 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#18 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#15 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.h#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#19 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_open_file.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_gzip.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_cpio.c#10 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#19 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_open_file.c#10 integrate .. //depot/projects/hammer/lib/libbsnmp/Makefile#3 integrate .. //depot/projects/hammer/lib/libbsnmp/modules/Makefile#4 delete .. //depot/projects/hammer/lib/libbsnmp/modules/Makefile.inc#6 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt#2 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_atm/Makefile#2 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_atm/atm_freebsd.def#2 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_atm/atm_sys.c#2 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_mibII/Makefile#5 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt#3 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/Makefile#5 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.def#2 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3#8 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.c#5 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.h#2 delete .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#87 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#23 integrate .. //depot/projects/hammer/sbin/gbde/gbde.c#15 integrate .. //depot/projects/hammer/sbin/geom/class/concat/gconcat.8#10 integrate .. //depot/projects/hammer/sbin/geom/class/concat/geom_concat.c#8 integrate .. //depot/projects/hammer/sbin/geom/class/label/geom_label.c#6 integrate .. //depot/projects/hammer/sbin/geom/class/label/glabel.8#9 integrate .. //depot/projects/hammer/sbin/geom/class/mirror/geom_mirror.c#7 integrate .. //depot/projects/hammer/sbin/geom/class/mirror/gmirror.8#8 integrate .. //depot/projects/hammer/sbin/geom/class/nop/geom_nop.c#5 integrate .. //depot/projects/hammer/sbin/geom/class/nop/gnop.8#10 integrate .. //depot/projects/hammer/sbin/geom/class/raid3/geom_raid3.c#10 integrate .. //depot/projects/hammer/sbin/geom/class/raid3/graid3.8#8 integrate .. //depot/projects/hammer/sbin/geom/class/shsec/geom_shsec.c#4 integrate .. //depot/projects/hammer/sbin/geom/class/shsec/gshsec.8#5 integrate .. //depot/projects/hammer/sbin/geom/class/stripe/geom_stripe.c#11 integrate .. //depot/projects/hammer/sbin/geom/class/stripe/gstripe.8#13 integrate .. //depot/projects/hammer/sbin/geom/core/geom.8#11 integrate .. //depot/projects/hammer/sbin/geom/core/geom.c#7 integrate .. //depot/projects/hammer/sbin/geom/core/geom.h#2 integrate .. //depot/projects/hammer/share/man/man4/altq.4#8 integrate .. //depot/projects/hammer/share/man/man4/ng_ccatm.4#2 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#51 integrate .. //depot/projects/hammer/share/man/man9/VFS_VGET.9#8 integrate .. //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#18 integrate .. //depot/projects/hammer/sys/alpha/include/bus.h#16 integrate .. //depot/projects/hammer/sys/alpha/include/bus_dma.h#1 branch .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#33 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#65 integrate .. //depot/projects/hammer/sys/amd64/include/bus_dma.h#16 integrate .. //depot/projects/hammer/sys/arm/include/bus.h#7 integrate .. //depot/projects/hammer/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/hammer/sys/boot/i386/libi386/pxe.c#4 integrate .. //depot/projects/hammer/sys/coda/cnode.h#7 integrate .. //depot/projects/hammer/sys/coda/coda_subr.c#9 integrate .. //depot/projects/hammer/sys/coda/coda_vnops.c#16 integrate .. //depot/projects/hammer/sys/conf/NOTES#83 integrate .. //depot/projects/hammer/sys/conf/files#107 integrate .. //depot/projects/hammer/sys/conf/files.amd64#64 integrate .. //depot/projects/hammer/sys/conf/files.i386#53 integrate .. //depot/projects/hammer/sys/conf/options#70 integrate .. //depot/projects/hammer/sys/contrib/dev/nve/adapter.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/nve/basetype.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/nve/drvinfo.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/nve/os.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/nve/phy.h#1 branch .. //depot/projects/hammer/sys/dev/amr/amr.c#19 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#42 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#22 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_isa.c#15 integrate .. //depot/projects/hammer/sys/dev/nve/if_nve.c#1 branch .. //depot/projects/hammer/sys/dev/nve/if_nvereg.h#1 branch .. //depot/projects/hammer/sys/dev/re/if_re.c#24 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_sparc64.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#20 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#19 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#56 integrate .. //depot/projects/hammer/sys/fs/deadfs/dead_vnops.c#12 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#29 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#14 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#29 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs.h#6 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_hash.c#6 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#17 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vnops.c#16 integrate .. //depot/projects/hammer/sys/fs/msdosfs/denode.h#9 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_conv.c#10 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_denode.c#18 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#31 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfsmount.h#10 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vnops.c#16 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_subr.c#11 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#17 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_io.c#14 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_node.c#12 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs.c#9 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_fileno.c#4 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vncache.c#12 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#16 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_io.c#15 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.c#17 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#22 integrate .. //depot/projects/hammer/sys/fs/udf/udf.h#9 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#18 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#23 integrate .. //depot/projects/hammer/sys/fs/umapfs/umap_vnops.c#11 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#23 integrate .. //depot/projects/hammer/sys/geom/geom_mbr.c#22 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_extern.h#7 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_ihash.c#6 delete .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_inode.c#12 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vfsops.c#27 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vnops.c#23 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#34 integrate .. //depot/projects/hammer/sys/i386/conf/PAE#12 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#26 integrate .. //depot/projects/hammer/sys/i386/include/bus_dma.h#12 integrate .. //depot/projects/hammer/sys/ia64/include/bus.h#14 integrate .. //depot/projects/hammer/sys/ia64/include/bus_dma.h#1 branch .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_node.c#11 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_node.h#7 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vfsops.c#27 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vnops.c#19 integrate .. //depot/projects/hammer/sys/isofs/cd9660/iso.h#7 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#42 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#43 integrate .. //depot/projects/hammer/sys/kern/subr_unit.c#5 integrate .. //depot/projects/hammer/sys/kern/tty.c#43 integrate .. //depot/projects/hammer/sys/kern/uipc_accf.c#8 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#54 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#34 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#36 integrate .. //depot/projects/hammer/sys/kern/vfs_hash.c#1 branch .. //depot/projects/hammer/sys/kern/vfs_subr.c#76 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#43 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#31 integrate .. //depot/projects/hammer/sys/kern/vnode_if.src#16 integrate .. //depot/projects/hammer/sys/modules/Makefile#70 integrate .. //depot/projects/hammer/sys/modules/ext2fs/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/nve/Makefile#1 branch .. //depot/projects/hammer/sys/modules/pseudofs/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ufs/Makefile#3 integrate .. //depot/projects/hammer/sys/net/if.c#42 integrate .. //depot/projects/hammer/sys/netgraph/ng_device.c#17 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.c#18 integrate .. //depot/projects/hammer/sys/netgraph/ng_etf.c#8 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.c#17 integrate .. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#17 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#21 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#27 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#18 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#32 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_node.c#17 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#22 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#38 integrate .. //depot/projects/hammer/sys/pc98/pc98/clock.c#18 integrate .. //depot/projects/hammer/sys/powerpc/include/bus.h#11 integrate .. //depot/projects/hammer/sys/powerpc/include/bus_dma.h#1 branch .. //depot/projects/hammer/sys/sparc64/include/bus.h#18 integrate .. //depot/projects/hammer/sys/sparc64/include/bus_dma.h#1 branch .. //depot/projects/hammer/sys/sys/bus_dma.h#1 branch .. //depot/projects/hammer/sys/sys/socketvar.h#28 integrate .. //depot/projects/hammer/sys/sys/vnode.h#48 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_inode.c#15 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#35 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#25 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#45 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#33 integrate .. //depot/projects/hammer/sys/ufs/ufs/inode.h#11 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_extern.h#10 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_ihash.c#9 delete .. //depot/projects/hammer/sys/ufs/ufs/ufs_inode.c#14 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vfsops.c#10 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#33 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#32 integrate .. //depot/projects/hammer/tools/sched/schedgraph.py#2 integrate .. //depot/projects/hammer/tools/tools/nanobsd/Makefile#7 integrate .. //depot/projects/hammer/tools/tools/nanobsd/i386.diskimage#10 integrate .. //depot/projects/hammer/tools/tools/nanobsd/make.conf#11 integrate .. //depot/projects/hammer/usr.bin/make/suff.c#16 integrate .. //depot/projects/hammer/usr.bin/make/var.c#23 integrate .. //depot/projects/hammer/usr.bin/quota/quota.c#5 integrate .. //depot/projects/hammer/usr.bin/tar/Makefile#10 integrate .. //depot/projects/hammer/usr.bin/tar/Makefile.am#2 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.1#16 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.c#22 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.h#12 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar_platform.h#7 integrate .. //depot/projects/hammer/usr.bin/tar/configure.ac.in#3 integrate .. //depot/projects/hammer/usr.bin/tar/getdate.y#1 branch .. //depot/projects/hammer/usr.bin/tar/matching.c#9 integrate .. //depot/projects/hammer/usr.bin/tar/read.c#13 integrate .. //depot/projects/hammer/usr.bin/tar/write.c#13 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/Makefile.inc#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_atm/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_atm/atm_sys.c#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.h#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_pf/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def#1 branch .. //depot/projects/hammer/usr.sbin/tcpdrop/tcpdrop.8#2 integrate Differences ... ==== //depot/projects/hammer/MAINTAINERS#31 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.102 2004/12/29 03:49:58 gad Exp $ +$FreeBSD: src/MAINTAINERS,v 1.103 2005/03/13 15:30:01 pjd Exp $ subsystem login notes ----------------------------- @@ -98,6 +98,7 @@ geom_mirror pjd Pre-commit review preferred. geom_nop pjd Pre-commit review preferred. geom_raid3 pjd Pre-commit review preferred. +geom_shsec pjd Pre-commit review preferred. geom_stripe pjd Pre-commit review preferred. sbin/geom pjd Pre-commit review preferred. nfs alfred Will be happy to review code, but not mandatory. ==== //depot/projects/hammer/bin/pax/ar_io.c#7 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.25 2004/06/25 05:27:59 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.26 2005/03/12 06:38:01 obrien Exp $"); #include #include @@ -301,6 +301,7 @@ void ar_close(void) { + int status; if (arfd < 0) { did_io = io_ok = flcnt = 0; @@ -336,14 +337,15 @@ * for a quick extract/list, pax frequently exits before the child * process is done */ - if ((act == LIST || act == EXTRACT) && nflag && zpid > 0) { - int status; + if ((act == LIST || act == EXTRACT) && nflag && zpid > 0) kill(zpid, SIGINT); - waitpid(zpid, &status, 0); - } (void)close(arfd); + /* Do not exit before child to ensure data integrity */ + if (zpid > 0) + waitpid(zpid, &status, 0); + if (vflag && (artyp == ISTAPE)) { (void)fputs("done.\n", listf); vfpart = 0; ==== //depot/projects/hammer/contrib/top/top.X#5 (text+ko) ==== @@ -1,6 +1,6 @@ .\" NOTE: changes to the manual page for "top" should be made in the .\" file "top.X" and NOT in the file "top.1". -.\" $FreeBSD: src/contrib/top/top.X,v 1.11 2004/07/12 03:00:50 alfred Exp $ +.\" $FreeBSD: src/contrib/top/top.X,v 1.12 2005/03/13 13:37:02 brueffer Exp $ .nr N %topn% .nr D %delay% .TH TOP 1 Local @@ -262,7 +262,7 @@ .TP .B i (or -.BR I) +.BR I ) Toggle the display of idle processes. .TP .B t ==== //depot/projects/hammer/etc/defaults/rc.conf#50 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.242 2005/03/02 02:46:47 brooks Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.243 2005/03/12 21:09:15 trhodes Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -456,7 +456,6 @@ # a.out shared library search paths kern_securelevel_enable="NO" # kernel security level (see init(8)), kern_securelevel="-1" # range: -1..3 ; `-1' is the most insecure -lomac_enable="NO" # start lomac(4) security module at boot update_motd="YES" # update version info in /etc/motd (or NO) unaligned_print="YES" # print unaligned access warnings on the alpha (or NO). entropy_file="/entropy" # Set to NO to disable caching entropy through reboots. ==== //depot/projects/hammer/etc/rc.d/Makefile#33 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.49 2005/03/02 00:40:55 brooks Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.50 2005/03/13 08:07:11 dougb Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ @@ -18,7 +18,7 @@ ipnat ipsec ipxrouted isdnd \ jail \ kadmind kerberos keyserv kldxref kpasswdd \ - ldconfig local localpkg lomac lpd \ + ldconfig local localpkg lpd \ mixer motd mountcritlocal mountcritremote \ mountd moused mroute6d mrouted msgs \ named natd netif netoptions \ ==== //depot/projects/hammer/etc/syslog.conf#8 (text+ko) ==== @@ -1,12 +1,12 @@ -# $FreeBSD: src/etc/syslog.conf,v 1.27 2005/02/22 08:03:09 glebius Exp $ +# $FreeBSD: src/etc/syslog.conf,v 1.28 2005/03/12 12:31:16 glebius Exp $ # # Spaces ARE valid field separators in this file. However, # other *nix-like systems still insist on using tabs as field # separators. If you are sharing this file between systems, you # may want to use only tabs as field separators here. # Consult the syslog.conf(5) manpage. -*.err;kern.debug;auth.notice;mail.crit /dev/console -*.notice;authpriv.none;kern.warning;lpr.info;mail.crit;news.err /var/log/messages +*.err;kern.warning;auth.notice;mail.crit /dev/console +*.notice;authpriv.none;kern.debug;lpr.info;mail.crit;news.err /var/log/messages security.* /var/log/security auth.info;authpriv.info /var/log/auth.log mail.info /var/log/maillog ==== //depot/projects/hammer/games/fortune/datfiles/fortunes#41 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.170 2005/03/07 06:05:14 yar Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.172 2005/03/14 21:50:25 philip Exp $ % ======================================================================= @@ -6669,8 +6669,6 @@ with two perfectly good legs who has never learned to walk. -- Franklin D. Roosevelt % -A conservative is one who is too cowardly to fight and too fat to run. -% A consultant is a person who borrows your watch, tells you what time it is, pockets the watch, and sends you a bill for it. % @@ -13267,7 +13265,7 @@ discovers something which either abolishes the system or expands it beyond recognition. % -Brooks's Law: +Brooks' Law: Adding manpower to a late software project makes it later % Brucify, v: @@ -14814,8 +14812,6 @@ Conscience is the inner voice that warns us somebody may be looking. -- H. L. Mencken, "A Mencken Chrestomathy" % -Conscience is what hurts when everything else feels so good. -% Conscious is when you are aware of something and conscience is when you wish you weren't. % @@ -15506,7 +15502,7 @@ Only it doesn't leave you much time to think about anything else. % -Death rays don't kill people, people kill people!! +Death rays don't kill people, people kill people! % Death to all fanatics! % @@ -38624,6 +38620,9 @@ Public office is the last refuge of a scoundrel. -- Boies Penrose % +Patience is long forgotten by convenience in this life. + -- Carmen Caicedo Giraudy +% Patriotism is the virtue of the vicious. -- Oscar Wilde % @@ -40079,13 +40078,13 @@ Q: How many tech writers does it take to change a lightbulb? A: None. The user can figure it out. % -Q: How many Harvard MBA's does it take to screw in a lightbulb? +Q: How many Harvard MBAs does it take to screw in a lightbulb? A: Just one. He grasps it firmly and the universe revolves around him. % -Q: How many IBM 370's does it take to execute a job? +Q: How many IBM 370s does it take to execute a job? A: Four, three to hold it down, and one to rip its head off. % -Q: How many IBM CPU's does it take to do a logical right shift? +Q: How many IBM CPUs does it take to do a logical right shift? A: 33. 1 to hold the bits and 32 to push the register. % Q: How many IBM types does it take to change a light bulb? ==== //depot/projects/hammer/lib/libarchive/Makefile#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.30 2005/02/13 23:29:54 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.31 2005/03/13 02:53:42 kientzle Exp $ # # Use "make distfile" to build a conventional tar.gz archive @@ -7,7 +7,7 @@ LIB= archive -VERSION= 1.02.006 +VERSION= 1.02.013 ARCHIVE_API_FEATURE= 2 ARCHIVE_API_VERSION= 1 SHLIB_MAJOR= ${ARCHIVE_API_VERSION} ==== //depot/projects/hammer/lib/libarchive/archive_entry.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.24 2004/12/11 07:11:42 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.25 2005/03/13 02:53:42 kientzle Exp $"); #include #include @@ -598,6 +598,12 @@ } void +archive_entry_copy_pathname(struct archive_entry *entry, const char *name) +{ + aes_copy_mbs(&entry->ae_pathname, name); +} + +void archive_entry_copy_pathname_w(struct archive_entry *entry, const wchar_t *name) { aes_copy_wcs(&entry->ae_pathname, name); ==== //depot/projects/hammer/lib/libarchive/archive_entry.h#11 (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_entry.h,v 1.12 2004/08/08 07:39:19 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.13 2005/03/13 02:53:42 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_H_INCLUDED @@ -112,6 +112,7 @@ void archive_entry_set_mode(struct archive_entry *, mode_t); void archive_entry_set_mtime(struct archive_entry *, time_t, long); void archive_entry_set_pathname(struct archive_entry *, const char *); +void archive_entry_copy_pathname(struct archive_entry *, const char *); void archive_entry_copy_pathname_w(struct archive_entry *, const wchar_t *); void archive_entry_set_rdevmajor(struct archive_entry *, dev_t); void archive_entry_set_rdevminor(struct archive_entry *, dev_t); ==== //depot/projects/hammer/lib/libarchive/archive_read_extract.c#19 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.36 2004/11/05 05:16:40 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.37 2005/03/13 02:53:42 kientzle Exp $"); #include #ifdef HAVE_SYS_ACL_H @@ -125,11 +125,11 @@ static unsigned int hash(const char *); static gid_t lookup_gid(struct archive *, const char *uname, gid_t); static uid_t lookup_uid(struct archive *, const char *uname, uid_t); +static int create_dir(struct archive *, const char *, int flags); +static int create_dir_mutable(struct archive *, char *, int flags); +static int create_dir_recursive(struct archive *, char *, int flags); static int create_parent_dir(struct archive *, const char *, int flags); -static int create_parent_dir_internal(struct archive *, char *, - int flags); -static int create_parent_dir_recursive(struct archive *, char *, - int flags); +static int create_parent_dir_mutable(struct archive *, char *, int flags); static int restore_metadata(struct archive *, struct archive_entry *, int flags); #ifdef HAVE_POSIX_ACL @@ -164,6 +164,7 @@ struct extract *extract; int ret; int restore_pwd; + char *original_filename; if (a->extract == NULL) { a->extract = malloc(sizeof(*a->extract)); @@ -180,16 +181,53 @@ extract->pst = NULL; extract->current_fixup = NULL; restore_pwd = -1; + original_filename = NULL; /* - * TODO: If pathname is longer than PATH_MAX, record starting - * directory and move to a suitable intermediate dir, which - * might require creating them! + * If pathname is longer than PATH_MAX, record starting directory + * and move to a suitable intermediate dir. */ if (strlen(archive_entry_pathname(entry)) > PATH_MAX) { + /* + * Yes, the copy here is necessary because we edit + * the pathname in-place to create intermediate dirnames. + */ + original_filename = strdup(archive_entry_pathname(entry)); + char *intdir, *tail; + restore_pwd = open(".", O_RDONLY); - /* XXX chdir() to a suitable intermediate dir XXX */ - /* XXX Update pathname in 'entry' XXX */ + /* + * "intdir" points to the initial dir section we're going + * to remove, "tail" points to the remainder of the path. + */ + intdir = tail = original_filename; + while (strlen(tail) > PATH_MAX) { + intdir = tail; + tail = intdir + PATH_MAX - 8; + while (tail > intdir && *tail != '/') + tail--; + if (tail <= intdir) { + close(restore_pwd); + archive_set_error(a, EPERM, + "Path element too long"); + return (ARCHIVE_WARN); + } + *tail = '\0'; /* Terminate dir portion */ + if (create_dir(a, intdir, flags) != ARCHIVE_OK) { + fchdir(restore_pwd); + close(restore_pwd); + return (ARCHIVE_WARN); + } + if (chdir(intdir) != 0) { + archive_set_error(a, errno, "Couldn't chdir"); + fchdir(restore_pwd); + close(restore_pwd); + return (ARCHIVE_WARN); + } + *tail = '/'; /* Restore the / we removed. */ + tail++; + } + archive_entry_set_pathname(entry, tail); } if (stat(archive_entry_pathname(entry), &extract->st) == 0) @@ -229,8 +267,11 @@ } /* If we changed directory above, restore it here. */ - if (restore_pwd >= 0) + if (restore_pwd >= 0 && original_filename != NULL) { fchdir(restore_pwd); + archive_entry_copy_pathname(entry, original_filename); + free(original_filename); + } return (ret); } @@ -364,6 +405,9 @@ /* * Returns a new, initialized fixup entry. + * + * TODO: Reduce the memory requirements for this list by using a tree + * structure rather than a simple list of names. */ static struct fixup_entry * new_fixup(struct archive *a, const char *pathname) @@ -496,7 +540,7 @@ unlink(path); } else { /* Doesn't already exist; try building the parent path. */ - if (create_parent_dir_internal(a, path, flags) != ARCHIVE_OK) + if (create_parent_dir_mutable(a, path, flags) != ARCHIVE_OK) return (ARCHIVE_WARN); } @@ -533,27 +577,36 @@ static int create_parent_dir(struct archive *a, const char *path, int flags) { - struct extract *extract; int r; - extract = a->extract; + /* Copy path to mutable storage. */ + archive_strcpy(&(a->extract->create_parent_dir), path); + r = create_parent_dir_mutable(a, a->extract->create_parent_dir.s, flags); + return (r); +} +/* + * Like create_parent_dir, but creates the dir actually requested, not + * the parent. + */ +static int +create_dir(struct archive *a, const char *path, int flags) +{ + int r; /* Copy path to mutable storage. */ - archive_strcpy(&(extract->create_parent_dir), path); - - r = create_parent_dir_internal(a, extract->create_parent_dir.s, flags); + archive_strcpy(&(a->extract->create_parent_dir), path); + r = create_dir_mutable(a, a->extract->create_parent_dir.s, flags); return (r); } /* - * Handle remaining setup for create_parent_dir_recursive(), assuming - * path is already in mutable storage. + * Create the parent directory of the specified path, assuming path + * is already in mutable storage. */ static int -create_parent_dir_internal(struct archive *a, char *path, int flags) +create_parent_dir_mutable(struct archive *a, char *path, int flags) { char *slash; - mode_t old_umask; int r; /* Remove tail element to obtain parent name. */ @@ -561,10 +614,24 @@ if (slash == NULL) return (ARCHIVE_OK); *slash = '\0'; + r = create_dir_mutable(a, path, flags); + *slash = '/'; + return (r); +} + +/* + * Create the specified dir, assuming path is already in + * mutable storage. + */ +static int +create_dir_mutable(struct archive *a, char *path, int flags) +{ + mode_t old_umask; + int r; + old_umask = umask(~SECURE_DIR_MODE); - r = create_parent_dir_recursive(a, path, flags); + r = create_dir_recursive(a, path, flags); umask(old_umask); - *slash = '/'; return (r); } @@ -575,7 +642,7 @@ * Otherwise, returns ARCHIVE_WARN. */ static int -create_parent_dir_recursive(struct archive *a, char *path, int flags) +create_dir_recursive(struct archive *a, char *path, int flags) { struct stat st; struct extract *extract; @@ -600,7 +667,7 @@ /* Don't bother trying to create null path, '.', or '..'. */ if (slash != NULL) { *slash = '\0'; - r = create_parent_dir_recursive(a, path, flags); + r = create_dir_recursive(a, path, flags); *slash = '/'; return (r); } @@ -632,7 +699,7 @@ return (ARCHIVE_WARN); } else if (slash != NULL) { *slash = '\0'; - r = create_parent_dir_recursive(a, path, flags); + r = create_dir_recursive(a, path, flags); *slash = '/'; if (r != ARCHIVE_OK) return (r); @@ -1011,9 +1078,12 @@ le = current_fixup(a, archive_entry_pathname(entry)); le->fixup |= FIXUP_FFLAGS; le->fflags_set = set; + /* Store the mode if it's not already there. */ + if ((le->fixup & FIXUP_MODE) == 0) + le->mode = mode; } else { r = set_fflags(a, archive_entry_pathname(entry), - archive_entry_mode(entry), set, clear); + mode, set, clear); if (r != ARCHIVE_OK) return (r); } ==== //depot/projects/hammer/lib/libarchive/archive_read_open_file.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.7 2005/02/12 22:44:50 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.8 2005/03/13 01:51:16 kientzle Exp $"); #include #include @@ -99,8 +99,11 @@ /* Remember mode so close can decide whether to flush. */ mine->st_mode = st.st_mode; } else { - archive_set_error(a, errno, "Can't stat '%s'", - mine->filename); + if (mine->filename[0] == '\0') + archive_set_error(a, errno, "Can't stat stdin"); + else + archive_set_error(a, errno, "Can't stat '%s'", + mine->filename); return (ARCHIVE_FATAL); } return (0); @@ -110,10 +113,19 @@ file_read(struct archive *a, void *client_data, const void **buff) { struct read_file_data *mine = client_data; + ssize_t bytes_read; (void)a; /* UNUSED */ *buff = mine->buffer; - return (read(mine->fd, mine->buffer, mine->block_size)); + bytes_read = read(mine->fd, mine->buffer, mine->block_size); + if (bytes_read < 0) { + if (mine->filename[0] == '\0') + archive_set_error(a, errno, "Error reading stdin"); + else + archive_set_error(a, errno, "Error reading '%s'", + mine->filename); + } + return (bytes_read); } static int ==== //depot/projects/hammer/lib/libarchive/archive_read_support_compression_gzip.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_gzip.c,v 1.8 2005/03/02 05:34:05 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_gzip.c,v 1.9 2005/03/13 01:48:33 kientzle Exp $"); #include @@ -512,6 +512,9 @@ return (ARCHIVE_OK); default: /* Any other return value is an error. */ + archive_set_error(a, ARCHIVE_ERRNO_MISC, + "gzip decompression failed (%s)", + state->stream.msg); goto fatal; } } ==== //depot/projects/hammer/lib/libarchive/archive_read_support_format_cpio.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.11 2004/08/14 03:45:45 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.12 2005/03/13 01:52:35 kientzle Exp $"); #include @@ -161,8 +161,11 @@ cpio = *(a->pformat_data); bid = 0; bytes_read = (a->compression_read_ahead)(a, &h, 6); + /* Convert error code into error return. */ + if (bytes_read < 0) + return ((int)bytes_read); if (bytes_read < 6) - return (-1); + return (-1); p = h; if (memcmp(p, "070707", 6) == 0) { ==== //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#19 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.30 2004/12/22 06:40:28 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.31 2005/03/13 02:35:52 kientzle Exp $"); #include #include @@ -1020,8 +1020,11 @@ return (-1); line_length *= 10; line_length += *p - '0'; - if (line_length > 999999) - return (-1); + if (line_length > 999999) { + archive_set_error(a, ARCHIVE_ERRNO_MISC, + "Rejecting pax extended attribute > 1MB"); + return (ARCHIVE_WARN); + } p++; l--; } ==== //depot/projects/hammer/lib/libarchive/archive_write_open_file.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_file.c,v 1.10 2005/02/12 23:33:31 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_file.c,v 1.11 2005/03/13 01:47:31 kientzle Exp $"); #include #include @@ -125,8 +125,15 @@ return (ARCHIVE_FATAL); } - a->skip_file_dev = pst->st_dev; - a->skip_file_ino = pst->st_ino; + /* + * If the output file is a regular file, don't add it to + * itself. If it's a device file, it's okay to add the device + * entry to the output archive. + */ + if (S_ISREG(pst->st_mode)) { + a->skip_file_dev = pst->st_dev; + a->skip_file_ino = pst->st_ino; + } return (ARCHIVE_OK); } ==== //depot/projects/hammer/lib/libbsnmp/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/lib/libbsnmp/Makefile,v 1.2 2004/01/19 19:26:01 ru Exp $ +# $FreeBSD: src/lib/libbsnmp/Makefile,v 1.3 2005/03/14 17:32:15 harti Exp $ -SUBDIR= libbsnmp modules +SUBDIR= libbsnmp .include ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#87 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.819 2005/03/11 05:37:18 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.823 2005/03/14 02:13:50 bmah Exp $ 2000 @@ -15,6 +15,15 @@ The &os; Documentation Project + + &tm-attrib.freebsd; + &tm-attrib.ibm; + &tm-attrib.ieee; + &tm-attrib.intel; + &tm-attrib.sparc; + &tm-attrib.general; + + The release notes for &os; &release.current; contain a summary of the changes made to the &os; base system since &release.branch; is created. @@ -133,9 +142,12 @@ and threads currently holding sleep mutexes (and spin mutexes for the current thread). &merged; - A bug, which caused the last line of configuration files such as &man.hosts.5;, - &man.services.5;, and so on to be ignored if it did not end in a newline character, - has been fixed. + The &man.jail.8; feature now supports a new sysctl + security.jail.chflags_allowed, which controls the + behavior of &man.chflags.1; within a jail. + If set to 0 (the default), then a jailed root user is + treated as an unprivileged user; if set to 1, then + a jailed root user is treated the same as an unjailed root user. &merged; The loader tunable debug.mpsafevm has been enabled by default. &merged; @@ -269,16 +281,18 @@ added. It provides methods for various drivers to control CPU power utilization by adjusting the processor speed. More details can be found in the &man.cpufreq.4; manual page. &merged; - Currently supported drivers include acpi_perf (ACPI CPU - performance states), ichss (Intel SpeedStep for ICH), and - acpi_throttle (ACPI CPU throttling). + Currently supported drivers include ichss (Intel SpeedStep for ICH), + acpi_perf (ACPI CPU performance states), and acpi_throttle + (ACPI CPU throttling). The latter two drivers are contained + in the &man.acpi.4; driver. These can individually be disabled by setting device + hints such as hint.ichss.0.disabled="1". Support for the OLDCARD subsystem has been removed. The NEWCARD system is now used for all PCCARD device support. The pcii driver has been added to support GPIB-PCIIA IEEE-488 - cards. + cards. &merged; The &man.atkbd.4; driver now supports a 0x8 (bit 3) flag to disable testing the keyboard port during @@ -303,8 +317,8 @@ The &man.uart.4; driver is now enabled in the GENERIC kernel, and is now the - default driver for serial ports. The ofw_console, - &man.sab.4;, and zs drivers are now disabled in the + default driver for serial ports. The ofw_console and + &man.sab.4; drivers are now disabled in the GENERIC kernel. &merged; The &man.uplcom.4; driver now supports handling of the @@ -312,6 +326,9 @@ The &man.ehci.4; driver has been improved. + The zs driver has been removed + in favor of the &man.uart.4; driver. + Multimedia Support @@ -443,6 +460,10 @@ network protocol stack and improving the locking strategies. + A new &man.ng.ipfw.4; NetGraph node provides + a simple interface between the &man.ipfw.4; and &man.netgraph.4; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 15 00:36:49 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E541616A4D0; Tue, 15 Mar 2005 00:36:48 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BFFAD16A4CE for ; Tue, 15 Mar 2005 00:36:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 91FDB43D1D for ; Tue, 15 Mar 2005 00:36:48 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2F0amJW005583 for ; Tue, 15 Mar 2005 00:36:48 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2F0amhp005580 for perforce@freebsd.org; Tue, 15 Mar 2005 00:36:48 GMT (envelope-from peter@freebsd.org) Date: Tue, 15 Mar 2005 00:36:48 GMT Message-Id: <200503150036.j2F0amhp005580@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 73154 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, 15 Mar 2005 00:36:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=73154 Change 73154 by peter@peter_daintree on 2005/03/15 00:36:26 Integ -b i386_hammer (metadata sync) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#34 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#66 integrate .. //depot/projects/hammer/sys/amd64/include/bus_dma.h#17 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#34 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#66 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/bus_dma.h#17 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Mar 15 13:59:46 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98C7016A4CF; Tue, 15 Mar 2005 13:59:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5417116A4D0 for ; Tue, 15 Mar 2005 13:59:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27F1243D1D for ; Tue, 15 Mar 2005 13:59:45 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2FDxjN8067875 for ; Tue, 15 Mar 2005 13:59:45 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2FDxilS067872 for perforce@freebsd.org; Tue, 15 Mar 2005 13:59:44 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 15 Mar 2005 13:59:44 GMT Message-Id: <200503151359.j2FDxilS067872@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 73214 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, 15 Mar 2005 13:59:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=73214 Change 73214 by davidxu@davidxu_tiger on 2005/03/15 13:58:45 remove 'const'. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_condattr.c#6 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_condattr.c#6 (text+ko) ==== @@ -90,7 +90,7 @@ } int -_pthread_condattr_setclock(const pthread_condattr_t *attr, +_pthread_condattr_setclock(pthread_condattr_t *attr, clockid_t clock_id) { if (attr == NULL || *attr == NULL) From owner-p4-projects@FreeBSD.ORG Tue Mar 15 14:07:58 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C8F816A4D0; Tue, 15 Mar 2005 14:07:58 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AB18016A4CF for ; Tue, 15 Mar 2005 14:07:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A260243D46 for ; Tue, 15 Mar 2005 14:07:56 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2FE7ukN068492 for ; Tue, 15 Mar 2005 14:07:56 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2FE7tXZ068489 for perforce@freebsd.org; Tue, 15 Mar 2005 14:07:55 GMT (envelope-from jmg@freebsd.org) Date: Tue, 15 Mar 2005 14:07:55 GMT Message-Id: <200503151407.j2FE7tXZ068489@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Subject: PERFORCE change 73216 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, 15 Mar 2005 14:07:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=73216 Change 73216 by jmg@jmg_carbon on 2005/03/15 14:07:12 pull in the latest changes... Affected files ... .. //depot/projects/arm/src/sys/alpha/alpha/busdma_machdep.c#3 integrate .. //depot/projects/arm/src/sys/alpha/include/bus.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/bus_dma.h#1 branch .. //depot/projects/arm/src/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/fpu.c#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/arm/src/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/arm/src/sys/amd64/include/_types.h#3 integrate .. //depot/projects/arm/src/sys/amd64/include/bus_amd64.h#3 integrate .. //depot/projects/arm/src/sys/amd64/include/bus_dma.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/cpufunc.h#3 integrate .. //depot/projects/arm/src/sys/amd64/include/critical.h#3 integrate .. //depot/projects/arm/src/sys/amd64/include/endian.h#3 integrate .. //depot/projects/arm/src/sys/amd64/include/in_cksum.h#3 integrate .. //depot/projects/arm/src/sys/amd64/include/pcpu.h#3 integrate .. //depot/projects/arm/src/sys/amd64/include/profile.h#3 integrate .. //depot/projects/arm/src/sys/amd64/include/stdarg.h#3 integrate .. //depot/projects/arm/src/sys/amd64/include/varargs.h#3 integrate .. //depot/projects/arm/src/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/arm/src/sys/arm/arm/busdma_machdep.c#4 integrate .. //depot/projects/arm/src/sys/arm/include/bus.h#2 integrate .. //depot/projects/arm/src/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/arm/src/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/arm/src/sys/coda/cnode.h#2 integrate .. //depot/projects/arm/src/sys/coda/coda_psdev.c#2 integrate .. //depot/projects/arm/src/sys/coda/coda_subr.c#2 integrate .. //depot/projects/arm/src/sys/coda/coda_venus.c#2 integrate .. //depot/projects/arm/src/sys/coda/coda_vnops.c#2 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/arm/src/sys/conf/NOTES#5 integrate .. //depot/projects/arm/src/sys/conf/files#3 integrate .. //depot/projects/arm/src/sys/conf/files.amd64#3 integrate .. //depot/projects/arm/src/sys/conf/files.i386#4 integrate .. //depot/projects/arm/src/sys/conf/options#4 integrate .. //depot/projects/arm/src/sys/contrib/dev/nve/adapter.h#1 branch .. //depot/projects/arm/src/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#1 branch .. //depot/projects/arm/src/sys/contrib/dev/nve/basetype.h#1 branch .. //depot/projects/arm/src/sys/contrib/dev/nve/drvinfo.h#1 branch .. //depot/projects/arm/src/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#1 branch .. //depot/projects/arm/src/sys/contrib/dev/nve/os.h#1 branch .. //depot/projects/arm/src/sys/contrib/dev/nve/phy.h#1 branch .. //depot/projects/arm/src/sys/crypto/cast128/cast128.c#2 delete .. //depot/projects/arm/src/sys/crypto/cast128/cast128.h#2 delete .. //depot/projects/arm/src/sys/crypto/cast128/cast128sb.h#2 delete .. //depot/projects/arm/src/sys/crypto/md5.c#2 delete .. //depot/projects/arm/src/sys/crypto/md5.h#2 delete .. //depot/projects/arm/src/sys/crypto/rijndael/rijndael-alg-fst.c#2 integrate .. //depot/projects/arm/src/sys/crypto/rijndael/rijndael-alg-fst.h#2 delete .. //depot/projects/arm/src/sys/crypto/rijndael/rijndael-api-fst.c#2 integrate .. //depot/projects/arm/src/sys/crypto/rijndael/rijndael-api-fst.h#2 integrate .. //depot/projects/arm/src/sys/crypto/rijndael/rijndael.h#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_pcib.c#2 integrate .. //depot/projects/arm/src/sys/dev/amr/amr.c#3 integrate .. //depot/projects/arm/src/sys/dev/ath/ath_rate/sample/sample.c#1 branch .. //depot/projects/arm/src/sys/dev/ath/ath_rate/sample/sample.h#1 branch .. //depot/projects/arm/src/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/arm/src/sys/dev/awi/awi.c#2 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/arm/src/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/arm/src/sys/dev/fdc/fdc_isa.c#2 integrate .. //depot/projects/arm/src/sys/dev/nve/if_nve.c#1 branch .. //depot/projects/arm/src/sys/dev/nve/if_nvereg.h#1 branch .. //depot/projects/arm/src/sys/dev/ppbus/pps.c#4 integrate .. //depot/projects/arm/src/sys/dev/random/hash.c#2 integrate .. //depot/projects/arm/src/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/arm/src/sys/dev/re/if_re.c#3 integrate .. //depot/projects/arm/src/sys/dev/snp/snp.c#2 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/arm/src/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/arm/src/sys/fs/deadfs/dead_vnops.c#2 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs.h#3 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/arm/src/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/arm/src/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/arm/src/sys/fs/hpfs/hpfs.h#2 integrate .. //depot/projects/arm/src/sys/fs/hpfs/hpfs_hash.c#2 integrate .. //depot/projects/arm/src/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/arm/src/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/denode.h#2 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfsmount.h#2 integrate .. //depot/projects/arm/src/sys/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/arm/src/sys/fs/nullfs/null.h#2 integrate .. //depot/projects/arm/src/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/arm/src/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/arm/src/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/arm/src/sys/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/arm/src/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/arm/src/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/arm/src/sys/fs/pseudofs/pseudofs_fileno.c#2 integrate .. //depot/projects/arm/src/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/arm/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/arm/src/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/arm/src/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/arm/src/sys/fs/smbfs/smbfs_vnops.c#3 integrate .. //depot/projects/arm/src/sys/fs/udf/udf.h#2 integrate .. //depot/projects/arm/src/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/arm/src/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/arm/src/sys/fs/umapfs/umap_vnops.c#2 integrate .. //depot/projects/arm/src/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/arm/src/sys/geom/bde/g_bde.c#2 integrate .. //depot/projects/arm/src/sys/geom/bde/g_bde_crypt.c#2 integrate .. //depot/projects/arm/src/sys/geom/bde/g_bde_lock.c#2 integrate .. //depot/projects/arm/src/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/arm/src/sys/geom/geom_aes.c#2 integrate .. //depot/projects/arm/src/sys/geom/geom_disk.h#2 integrate .. //depot/projects/arm/src/sys/geom/geom_mbr.c#2 integrate .. //depot/projects/arm/src/sys/gnu/ext2fs/ext2_extern.h#2 integrate .. //depot/projects/arm/src/sys/gnu/ext2fs/ext2_ihash.c#2 delete .. //depot/projects/arm/src/sys/gnu/ext2fs/ext2_inode.c#2 integrate .. //depot/projects/arm/src/sys/gnu/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/arm/src/sys/gnu/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/arm/src/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/arm/src/sys/i386/conf/NOTES#3 integrate .. //depot/projects/arm/src/sys/i386/conf/PAE#2 integrate .. //depot/projects/arm/src/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/arm/src/sys/i386/include/bus_dma.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/clock.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/critical.h#3 integrate .. //depot/projects/arm/src/sys/i386/isa/clock.c#2 integrate .. //depot/projects/arm/src/sys/ia64/include/bus.h#2 integrate .. //depot/projects/arm/src/sys/ia64/include/bus_dma.h#1 branch .. //depot/projects/arm/src/sys/isofs/cd9660/cd9660_node.c#2 integrate .. //depot/projects/arm/src/sys/isofs/cd9660/cd9660_node.h#2 integrate .. //depot/projects/arm/src/sys/isofs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/arm/src/sys/isofs/cd9660/cd9660_vnops.c#2 integrate .. //depot/projects/arm/src/sys/isofs/cd9660/iso.h#2 integrate .. //depot/projects/arm/src/sys/kern/kern_conf.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_environment.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_exit.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_lock.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_proc.c#2 integrate .. //depot/projects/arm/src/sys/kern/subr_hints.c#2 integrate .. //depot/projects/arm/src/sys/kern/subr_unit.c#3 integrate .. //depot/projects/arm/src/sys/kern/subr_witness.c#3 integrate .. //depot/projects/arm/src/sys/kern/sys_socket.c#2 integrate .. //depot/projects/arm/src/sys/kern/syscalls.master#3 integrate .. //depot/projects/arm/src/sys/kern/tty.c#3 integrate .. //depot/projects/arm/src/sys/kern/uipc_accf.c#2 integrate .. //depot/projects/arm/src/sys/kern/uipc_mbuf.c#5 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket2.c#4 integrate .. //depot/projects/arm/src/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/arm/src/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/arm/src/sys/kern/vfs_default.c#3 integrate .. //depot/projects/arm/src/sys/kern/vfs_hash.c#1 branch .. //depot/projects/arm/src/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/arm/src/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/arm/src/sys/kern/vnode_if.src#2 integrate .. //depot/projects/arm/src/sys/modules/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/ath_rate_sample/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/crypto/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/ext2fs/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/nve/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/pseudofs/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/ufs/Makefile#2 integrate .. //depot/projects/arm/src/sys/net/if.c#3 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/arm/src/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/arm/src/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/arm/src/sys/netgraph/ng_device.c#2 integrate .. //depot/projects/arm/src/sys/netgraph/ng_eiface.c#3 integrate .. //depot/projects/arm/src/sys/netgraph/ng_etf.c#2 integrate .. //depot/projects/arm/src/sys/netgraph/ng_iface.c#2 integrate .. //depot/projects/arm/src/sys/netgraph/ng_one2many.c#2 integrate .. //depot/projects/arm/src/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/arm/src/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/arm/src/sys/netgraph/ng_source.h#2 integrate .. //depot/projects/arm/src/sys/netinet/if_ether.c#3 integrate .. //depot/projects/arm/src/sys/netinet/in.c#2 integrate .. //depot/projects/arm/src/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/arm/src/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/arm/src/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/arm/src/sys/netinet6/esp_core.c#2 integrate .. //depot/projects/arm/src/sys/netinet6/ipsec.c#3 integrate .. //depot/projects/arm/src/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/arm/src/sys/netipx/README#2 integrate .. //depot/projects/arm/src/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/arm/src/sys/opencrypto/cryptosoft.c#2 integrate .. //depot/projects/arm/src/sys/opencrypto/rijndael.c#2 delete .. //depot/projects/arm/src/sys/opencrypto/rijndael.h#2 delete .. //depot/projects/arm/src/sys/opencrypto/xform.c#2 integrate .. //depot/projects/arm/src/sys/pc98/conf/GENERIC.hints#2 integrate .. //depot/projects/arm/src/sys/pc98/pc98/clock.c#2 integrate .. //depot/projects/arm/src/sys/pci/if_dc.c#3 integrate .. //depot/projects/arm/src/sys/powerpc/include/bus.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/bus_dma.h#1 branch .. //depot/projects/arm/src/sys/powerpc/powerpc/busdma_machdep.c#3 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/trap.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/psim/ata_iobus.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/bus.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/bus_dma.h#1 branch .. //depot/projects/arm/src/sys/sys/bus_dma.h#1 branch .. //depot/projects/arm/src/sys/sys/conf.h#3 integrate .. //depot/projects/arm/src/sys/sys/filio.h#2 integrate .. //depot/projects/arm/src/sys/sys/param.h#3 integrate .. //depot/projects/arm/src/sys/sys/socket.h#2 integrate .. //depot/projects/arm/src/sys/sys/socketvar.h#3 integrate .. //depot/projects/arm/src/sys/sys/systm.h#4 integrate .. //depot/projects/arm/src/sys/sys/vnode.h#3 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_inode.c#3 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/arm/src/sys/ufs/ufs/inode.h#2 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_extern.h#2 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_ihash.c#2 delete .. //depot/projects/arm/src/sys/ufs/ufs/ufs_inode.c#3 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/arm/src/sys/vm/vnode_pager.c#3 integrate Differences ... ==== //depot/projects/arm/src/sys/alpha/alpha/busdma_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.49 2005/03/07 02:18:08 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.50 2005/03/12 02:43:50 mux Exp $"); #include #include @@ -578,7 +578,7 @@ } if (sg->ds_len == 0) { - sg->ds_addr = paddr + alpha_XXX_dmamap_or; + sg->ds_addr = paddr | alpha_XXX_dmamap_or; sg->ds_len = size; } else if (paddr == nextpaddr) { sg->ds_len += size; @@ -588,7 +588,7 @@ seg++; if (seg > dmat->nsegments) break; - sg->ds_addr = paddr + alpha_XXX_dmamap_or; + sg->ds_addr = paddr | alpha_XXX_dmamap_or; sg->ds_len = size; } vaddr += size; @@ -668,7 +668,7 @@ * previous segment if possible. */ if (first) { - segs[seg].ds_addr = curaddr + alpha_XXX_dmamap_or; + segs[seg].ds_addr = curaddr | alpha_XXX_dmamap_or; segs[seg].ds_len = sgsize; first = 0; } else { @@ -680,7 +680,7 @@ else { if (++seg >= dmat->nsegments) break; - segs[seg].ds_addr = curaddr + alpha_XXX_dmamap_or; + segs[seg].ds_addr = curaddr | alpha_XXX_dmamap_or; segs[seg].ds_len = sgsize; } } ==== //depot/projects/arm/src/sys/alpha/include/bus.h#2 (text+ko) ==== @@ -67,7 +67,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/sys/alpha/include/bus.h,v 1.28 2005/01/29 21:43:33 ru Exp $ */ +/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.29 2005/03/14 16:46:27 scottl Exp $ */ #ifndef _ALPHA_BUS_H_ #define _ALPHA_BUS_H_ @@ -481,195 +481,6 @@ #define bus_space_copy_region_stream_4(t, h1, o1, h2, o2, c) \ bus_space_copy_region_4((t), (h1), (o1), (h2), (o2), (c)) -/* - * Flags used in various bus DMA methods. - */ -#define BUS_DMA_WAITOK 0x00 /* safe to sleep (pseudo-flag) */ -#define BUS_DMA_NOWAIT 0x01 /* not safe to sleep */ -#define BUS_DMA_ALLOCNOW 0x02 /* perform resource allocation now */ -#define BUS_DMA_COHERENT 0x04 /* hint: map memory in a coherent way */ -#define BUS_DMA_ZERO 0x08 /* allocate zero'ed memory */ -#define BUS_DMA_ISA 0x10 /* map memory for ISA dma */ -#define BUS_DMA_BUS2 0x20 /* placeholders for bus functions... */ -#define BUS_DMA_BUS3 0x40 -#define BUS_DMA_BUS4 0x80 - -/* Forwards needed by prototypes below. */ -struct mbuf; -struct uio; - -/* - * Operations performed by bus_dmamap_sync(). - */ -typedef int bus_dmasync_op_t; -#define BUS_DMASYNC_PREREAD 1 -#define BUS_DMASYNC_POSTREAD 2 -#define BUS_DMASYNC_PREWRITE 4 -#define BUS_DMASYNC_POSTWRITE 8 - -/* - * bus_dma_tag_t - * - * A machine-dependent opaque type describing the characteristics - * of how to perform DMA mappings. This structure encapsultes - * information concerning address and alignment restrictions, number - * of S/G segments, amount of data per S/G segment, etc. - */ -typedef struct bus_dma_tag *bus_dma_tag_t; - -/* - * bus_dmamap_t - * - * DMA mapping instance information. - */ -typedef struct bus_dmamap *bus_dmamap_t; - -/* - * bus_dma_segment_t - * - * Describes a single contiguous DMA transaction. Values - * are suitable for programming into DMA registers. - */ -typedef struct bus_dma_segment { - bus_addr_t ds_addr; /* DMA address */ - bus_size_t ds_len; /* length of transfer */ -} bus_dma_segment_t; - -/* - * A function that returns 1 if the address cannot be accessed by - * a device and 0 if it can be. - */ -typedef int bus_dma_filter_t(void *, bus_addr_t); - -/* - * A function that performs driver-specific syncronization on behalf of - * busdma. - */ -typedef enum { - BUS_DMA_LOCK = 0x01, - BUS_DMA_UNLOCK = 0x02, -} bus_dma_lock_op_t; - -typedef void bus_dma_lock_t(void *, bus_dma_lock_op_t); - -/* - * Allocate a device specific dma_tag encapsulating the constraints of - * the parent tag in addition to other restrictions specified: - * - * alignment: alignment for segments. - * boundary: Boundary that segments cannot cross. - * lowaddr: Low restricted address that cannot appear in a mapping. - * highaddr: High restricted address that cannot appear in a mapping. - * filtfunc: An optional function to further test if an address - * within the range of lowaddr and highaddr cannot appear - * in a mapping. - * filtfuncarg: An argument that will be passed to filtfunc in addition - * to the address to test. - * maxsize: Maximum mapping size supported by this tag. - * nsegments: Number of discontinuities allowed in maps. - * maxsegsz: Maximum size of a segment in the map. - * flags: Bus DMA flags. - * lockfunc: An optional function to handle driver-defined lock - * operations. - * lockfuncarg: An argument that will be passed to lockfunc in addition - * to the lock operation. - * dmat: A pointer to set to a valid dma tag should the return - * value of this function indicate success. - */ -/* XXX Should probably allow specification of alignment */ -int bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignemnt, - bus_size_t boundary, bus_addr_t lowaddr, - bus_addr_t highaddr, bus_dma_filter_t *filtfunc, - void *filtfuncarg, bus_size_t maxsize, int nsegments, - bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, - void *lockfuncarg, bus_dma_tag_t *dmat); - -int bus_dma_tag_destroy(bus_dma_tag_t dmat); - -/* - * Allocate a handle for mapping from kva/uva/physical - * address space into bus device space. - */ -int bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp); - -/* - * Destroy a handle for mapping from kva/uva/physical - * address space into bus device space. - */ -int bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map); - -/* - * Allocate a piece of memory that can be efficiently mapped into - * bus device space based on the constraints lited in the dma tag. - * A dmamap to for use with dmamap_load is also allocated. - */ -int bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags, - bus_dmamap_t *mapp); - -/* - * Free a piece of memory and it's allociated dmamap, that was allocated - * via bus_dmamem_alloc. - */ -void bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map); - -/* - * A function that processes a successfully loaded dma map or an error - * from a delayed load map. - */ -typedef void bus_dmamap_callback_t(void *, bus_dma_segment_t *, int, int); - -/* - * Map the buffer buf into bus space using the dmamap map. - */ -int bus_dmamap_load(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, - bus_size_t buflen, bus_dmamap_callback_t *callback, - void *callback_arg, int flags); - -/* - * Like bus_dmamap_callback but includes map size in bytes. This is - * defined as a separate interface to maintain compatiiblity for users - * of bus_dmamap_callback_t--at some point these interfaces should be merged. - */ -typedef void bus_dmamap_callback2_t(void *, bus_dma_segment_t *, int, bus_size_t, int); -/* - * Like bus_dmamap_load but for mbufs. Note the use of the - * bus_dmamap_callback2_t interface. - */ -int bus_dmamap_load_mbuf(bus_dma_tag_t dmat, bus_dmamap_t map, - struct mbuf *mbuf, - bus_dmamap_callback2_t *callback, void *callback_arg, - int flags); -int bus_dmamap_load_mbuf_sg(bus_dma_tag_t dmat, bus_dmamap_t map, - struct mbuf *mbuf, bus_dma_segment_t *segs, - int *nsegs, int flags); -/* - * Like bus_dmamap_load but for uios. Note the use of the - * bus_dmamap_callback2_t interface. - */ -int bus_dmamap_load_uio(bus_dma_tag_t dmat, bus_dmamap_t map, - struct uio *ui, - bus_dmamap_callback2_t *callback, void *callback_arg, - int flags); - -/* - * Perform a syncronization operation on the given map. - */ -void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_dmasync_op_t); -#define bus_dmamap_sync(dmat, dmamap, op) \ - if ((dmamap) != NULL) \ - _bus_dmamap_sync(dmat, dmamap, op) - -/* - * Release the mapping held by map. - */ -void _bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map); -#define bus_dmamap_unload(dmat, dmamap) \ - if ((dmamap) != NULL) \ - _bus_dmamap_unload(dmat, dmamap) - -/* - * Generic helper function for manipulating mutexes. - */ -void busdma_lock_mutex(void *arg, bus_dma_lock_op_t op); +#include #endif /* _ALPHA_BUS_H_ */ ==== //depot/projects/arm/src/sys/amd64/amd64/busdma_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.67 2005/03/07 02:16:03 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.70 2005/03/12 07:05:59 scottl Exp $"); #include #include @@ -225,8 +225,8 @@ newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_DEVBUF, M_ZERO | M_NOWAIT); if (newtag == NULL) { - CTR3(KTR_BUSDMA, "bus_dma_tag_create returned tag %p tag " - "flags 0x%x error %d", newtag, 0, error); + CTR4(KTR_BUSDMA, "%s returned tag %p tag flags 0x%x error %d", + __func__, newtag, 0, error); return (ENOMEM); } @@ -307,8 +307,8 @@ } else { *dmat = newtag; } - CTR3(KTR_BUSDMA, "bus_dma_tag_create returned tag %p tag flags 0x%x " - "error %d", newtag, (newtag != NULL ? newtag->flags : 0), error); + CTR4(KTR_BUSDMA, "%s returned tag %p tag flags 0x%x error %d", + __func__, newtag, (newtag != NULL ? newtag->flags : 0), error); return (error); } @@ -348,8 +348,7 @@ } } out: - CTR2(KTR_BUSDMA, "bus_dma_tag_destroy tag %p error %d", dmat_copy, - error); + CTR3(KTR_BUSDMA, "%s tag %p error %d", __func__, dmat_copy, error); return (error); } @@ -369,8 +368,8 @@ sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF, M_NOWAIT); if (dmat->segments == NULL) { - CTR2(KTR_BUSDMA, "bus_dmamap_create: tag %p error %d", - dmat, ENOMEM); + CTR3(KTR_BUSDMA, "%s: tag %p error %d", + __func__, dmat, ENOMEM); return (ENOMEM); } } @@ -383,18 +382,20 @@ if (dmat->flags & BUS_DMA_COULD_BOUNCE) { /* Must bounce */ + struct bounce_zone *bz; int maxpages; if (dmat->bounce_zone == NULL) { if ((error = alloc_bounce_zone(dmat)) != 0) return (error); } + bz = dmat->bounce_zone; *mapp = (bus_dmamap_t)malloc(sizeof(**mapp), M_DEVBUF, M_NOWAIT | M_ZERO); if (*mapp == NULL) { - CTR2(KTR_BUSDMA, "bus_dmamap_create: tag %p error %d", - dmat, ENOMEM); + CTR3(KTR_BUSDMA, "%s: tag %p error %d", + __func__, dmat, ENOMEM); return (ENOMEM); } @@ -405,13 +406,17 @@ * Attempt to add pages to our pool on a per-instance * basis up to a sane limit. */ - maxpages = MIN(MAX_BPAGES, Maxmem - atop(dmat->lowaddr)); + if (dmat->alignment > 1) + maxpages = MAX_BPAGES; + else + maxpages = MIN(MAX_BPAGES, Maxmem -atop(dmat->lowaddr)); if ((dmat->flags & BUS_DMA_MIN_ALLOC_COMP) == 0 - || (dmat->map_count > 0 && total_bpages < maxpages)) { + || (dmat->map_count > 0 && bz->total_bpages < maxpages)) { int pages; pages = MAX(atop(dmat->maxsize), 1); - pages = MIN(maxpages - total_bpages, pages); + pages = MIN(maxpages - bz->total_bpages, pages); + pages = MAX(pages, 1); if (alloc_bounce_pages(dmat, pages) < pages) error = ENOMEM; @@ -427,8 +432,8 @@ } if (error == 0) dmat->map_count++; - CTR3(KTR_BUSDMA, "bus_dmamap_create: tag %p tag flags 0x%x error %d", - dmat, dmat->flags, error); + CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", + __func__, dmat, dmat->flags, error); return (error); } @@ -441,14 +446,14 @@ { if (map != NULL && map != &nobounce_dmamap) { if (STAILQ_FIRST(&map->bpages) != NULL) { - CTR2(KTR_BUSDMA, "bus_dmamap_destroy: tag %p error %d", - dmat, EBUSY); + CTR3(KTR_BUSDMA, "%s: tag %p error %d", + __func__, dmat, EBUSY); return (EBUSY); } free(map, M_DEVBUF); } dmat->map_count--; - CTR1(KTR_BUSDMA, "bus_dmamap_destroy: tag %p error 0", dmat); + CTR2(KTR_BUSDMA, "%s: tag %p error 0", __func__, dmat); return (0); } @@ -479,8 +484,8 @@ sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF, M_NOWAIT); if (dmat->segments == NULL) { - CTR3(KTR_BUSDMA, "bus_dmamem_alloc: tag %p tag " - "flags 0x%x error %d", dmat, dmat->flags, ENOMEM); + CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", + __func__, dmat, dmat->flags, ENOMEM); return (ENOMEM); } } @@ -500,12 +505,12 @@ dmat->boundary); } if (*vaddr == NULL) { - CTR3(KTR_BUSDMA, "bus_dmamem_alloc: tag %p tag flags 0x%x " - "error %d", dmat, dmat->flags, ENOMEM); + CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", + __func__, dmat, dmat->flags, ENOMEM); return (ENOMEM); } - CTR3(KTR_BUSDMA, "bus_dmamem_alloc: tag %p tag flags 0x%x error %d", - dmat, dmat->flags, ENOMEM); + CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", + __func__, dmat, dmat->flags, ENOMEM); return (0); } @@ -528,8 +533,7 @@ else { contigfree(vaddr, dmat->maxsize, M_DEVBUF); } - CTR2(KTR_BUSDMA, "bus_dmamem_free: tag %p flags 0x%x", dmat, - dmat->flags); + CTR3(KTR_BUSDMA, "%s: tag %p flags 0x%x", __func__, dmat, dmat->flags); } /* @@ -698,8 +702,8 @@ &lastaddr, dmat->segments, &nsegs, 1); if (error == EINPROGRESS) { - CTR3(KTR_BUSDMA, "bus_dmamap_load: tag %p tag flags 0x%x " - "error %d", dmat, dmat->flags, error); + CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", + __func__, dmat, dmat->flags, error); return (error); } @@ -708,8 +712,8 @@ else (*callback)(callback_arg, dmat->segments, nsegs + 1, 0); - CTR3(KTR_BUSDMA, "bus_dmamap_load: tag %p tag flags 0x%x error 0 " - "nsegs %d", dmat, dmat->flags, nsegs + 1); + CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error 0 nsegs %d", + __func__, dmat, dmat->flags, nsegs + 1); return (0); } @@ -755,8 +759,8 @@ (*callback)(callback_arg, dmat->segments, nsegs+1, m0->m_pkthdr.len, error); } - CTR4(KTR_BUSDMA, "bus_dmamap_load_mbuf: tag %p tag flags 0x%x " - "error %d nsegs %d", dmat, dmat->flags, error, nsegs + 1); + CTR5(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d nsegs %d", + __func__, dmat, dmat->flags, error, nsegs + 1); return (error); } @@ -792,8 +796,8 @@ /* XXX FIXME: Having to increment nsegs is really annoying */ ++*nsegs; - CTR4(KTR_BUSDMA, "bus_dmamap_load_mbuf: tag %p tag flags 0x%x " - "error %d nsegs %d", dmat, dmat->flags, error, *nsegs); + CTR5(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d nsegs %d", + __func__, dmat, dmat->flags, error, *nsegs); return (error); } @@ -852,8 +856,8 @@ (*callback)(callback_arg, dmat->segments, nsegs+1, uio->uio_resid, error); } - CTR4(KTR_BUSDMA, "bus_dmamap_load_uio: tag %p tag flags 0x%x " - "error %d nsegs %d", dmat, dmat->flags, error, nsegs + 1); + CTR5(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d nsegs %d", + __func__, dmat, dmat->flags, error, nsegs + 1); return (error); } @@ -883,8 +887,8 @@ * the caches on broken hardware */ dmat->bounce_zone->total_bounced++; - CTR3(KTR_BUSDMA, "_bus_dmamap_sync: tag %p tag flags 0x%x " - "op 0x%x performing bounce", op, dmat, dmat->flags); + CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x op 0x%x " + "performing bounce", __func__, op, dmat, dmat->flags); if (op & BUS_DMASYNC_PREWRITE) { while (bpage != NULL) { ==== //depot/projects/arm/src/sys/amd64/amd64/fpu.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.156 2005/03/02 21:33:21 joerg Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.157 2005/03/11 22:16:09 peter Exp $"); #include #include @@ -77,7 +77,7 @@ : : "n" (CR0_TS) : "ax") #define stop_emulating() __asm("clts") -#else /* !__GNUCLIKE_ASM */ +#else /* !(__GNUCLIKE_ASM && !lint) */ void fldcw(caddr_t addr); void fnclex(void); @@ -89,7 +89,7 @@ void start_emulating(void); void stop_emulating(void); -#endif /* __GNUCLIKE_ASM */ +#endif /* __GNUCLIKE_ASM && !lint */ #define GET_FPU_CW(thread) ((thread)->td_pcb->pcb_save.sv_env.en_cw) #define GET_FPU_SW(thread) ((thread)->td_pcb->pcb_save.sv_env.en_sw) ==== //depot/projects/arm/src/sys/amd64/amd64/local_apic.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.12 2005/02/28 23:37:35 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.13 2005/03/11 22:12:38 peter Exp $"); #include #include @@ -67,9 +67,9 @@ CTASSERT(APIC_LOCAL_INTS == 240); CTASSERT(IPI_STOP < APIC_SPURIOUS_INT); -#define LAPIC_TIMER_HZ_DIVIDER 3 -#define LAPIC_TIMER_STATHZ_DIVIDER 23 -#define LAPIC_TIMER_PROFHZ_DIVIDER 2 +#define LAPIC_TIMER_HZ_DIVIDER 2 +#define LAPIC_TIMER_STATHZ_DIVIDER 15 +#define LAPIC_TIMER_PROFHZ_DIVIDER 3 /* * Support for local APICs. Local APICs manage interrupts on each @@ -131,8 +131,6 @@ volatile lapic_t *lapic; static u_long lapic_timer_divisor, lapic_timer_period, lapic_timer_hz; -static u_long *lapic_virtual_hardclock, *lapic_virtual_statclock, - *lapic_virtual_profclock; static void lapic_enable(void); static void lapic_timer_enable_intr(void); @@ -370,9 +368,6 @@ stathz = lapic_timer_hz / LAPIC_TIMER_STATHZ_DIVIDER; profhz = lapic_timer_hz / LAPIC_TIMER_PROFHZ_DIVIDER; lapic_timer_period = value / lapic_timer_hz; - intrcnt_add("lapic: hardclock", &lapic_virtual_hardclock); - intrcnt_add("lapic: statclock", &lapic_virtual_statclock); - intrcnt_add("lapic: profclock", &lapic_virtual_profclock); /* * Start up the timer on the BSP. The APs will kick off their @@ -627,10 +622,9 @@ la->la_hard_ticks += hz; if (la->la_hard_ticks >= lapic_timer_hz) { la->la_hard_ticks -= lapic_timer_hz; - if (PCPU_GET(cpuid) == 0) { - (*lapic_virtual_hardclock)++; + if (PCPU_GET(cpuid) == 0) hardclock(&frame); - } else + else hardclock_process(&frame); } @@ -638,8 +632,6 @@ la->la_stat_ticks += stathz; if (la->la_stat_ticks >= lapic_timer_hz) { la->la_stat_ticks -= lapic_timer_hz; - if (PCPU_GET(cpuid) == 0) - (*lapic_virtual_statclock)++; statclock(&frame); } @@ -647,8 +639,6 @@ la->la_prof_ticks += profhz; if (la->la_prof_ticks >= lapic_timer_hz) { la->la_prof_ticks -= lapic_timer_hz; - if (PCPU_GET(cpuid) == 0) - (*lapic_virtual_profclock)++; if (profprocs != 0) profclock(&frame); } ==== //depot/projects/arm/src/sys/amd64/conf/GENERIC#3 (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.429 2005/02/28 23:39:58 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.430 2005/03/12 00:29:29 obrien Exp $ machine amd64 cpu HAMMER @@ -176,6 +176,7 @@ device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel PRO/1000 adapter Gigabit Ethernet Card device ixgb # Intel PRO/10GbE Ethernet Card +device nve # nVidia nForce MCP on-board Ethernet Networking device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') ==== //depot/projects/arm/src/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.7 2005/03/02 21:33:21 joerg Exp $ + * $FreeBSD: src/sys/amd64/include/_types.h,v 1.8 2005/03/11 22:16:09 peter Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -108,8 +108,8 @@ #endif #if defined(__GNUC_VA_LIST_COMPATIBILITY) && !defined(__GNUC_VA_LIST) \ && !defined(__NO_GNUC_VA_LIST) -#define __GNUC_VA_LIST -typedef __va_list __gnuc_va_list; /* compatibility w/GNU headers*/ +#define __GNUC_VA_LIST +typedef __va_list __gnuc_va_list; /* compatibility w/GNU headers*/ #endif #endif /* !_MACHINE__TYPES_H_ */ ==== //depot/projects/arm/src/sys/amd64/include/bus_amd64.h#3 (text+ko) ==== @@ -67,11 +67,15 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/amd64/include/bus_amd64.h,v 1.28 2005/03/02 21:33:21 joerg Exp $ */ +/* $FreeBSD: src/sys/amd64/include/bus_amd64.h,v 1.29 2005/03/11 22:16:09 peter Exp $ */ #ifndef _AMD64_BUS_AMD64_H_ #define _AMD64_BUS_AMD64_H_ +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + #include #ifndef _SYS_CDEFS_H_ @@ -437,7 +441,7 @@ #endif { int _port_ = bsh + offset; -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ 1: inw %w2,%%ax \n\ @@ -456,7 +460,7 @@ #endif { bus_space_handle_t _port_ = bsh + offset; -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ repne \n\ @@ -479,7 +483,7 @@ #endif { int _port_ = bsh + offset; -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ 1: inl %w2,%%eax \n\ @@ -498,7 +502,7 @@ #endif { bus_space_handle_t _port_ = bsh + offset; -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ repne \n\ @@ -627,7 +631,7 @@ else #endif { -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ 1: lodsb \n\ @@ -656,7 +660,7 @@ else #endif { -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ 1: lodsw \n\ @@ -685,7 +689,7 @@ else #endif { -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ 1: lodsl \n\ @@ -735,7 +739,7 @@ #endif { int _port_ = bsh + offset; -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ 1: lodsb \n\ @@ -754,7 +758,7 @@ #endif { bus_space_handle_t _port_ = bsh + offset; -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ repne \n\ @@ -777,7 +781,7 @@ #endif { int _port_ = bsh + offset; -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ 1: lodsw \n\ @@ -796,7 +800,7 @@ #endif { bus_space_handle_t _port_ = bsh + offset; -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ repne \n\ @@ -819,7 +823,7 @@ #endif { int _port_ = bsh + offset; -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ 1: lodsl \n\ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 15 23:39:59 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E623516A4CF; Tue, 15 Mar 2005 23:39:58 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B93BF16A4D0 for ; Tue, 15 Mar 2005 23:39:58 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9382743D1D for ; Tue, 15 Mar 2005 23:39:58 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2FNdwNN011637 for ; Tue, 15 Mar 2005 23:39:58 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2FNdwld011634 for perforce@freebsd.org; Tue, 15 Mar 2005 23:39:58 GMT (envelope-from peter@freebsd.org) Date: Tue, 15 Mar 2005 23:39:58 GMT Message-Id: <200503152339.j2FNdwld011634@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 73261 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, 15 Mar 2005 23:39:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=73261 Change 73261 by peter@peter_daintree on 2005/03/15 23:39:35 I'm ashamed, but this will do as an interim measure. I feel a req->flags flag coming on. Affected files ... .. //depot/projects/hammer/sys/kern/kern_clock.c#23 edit Differences ... ==== //depot/projects/hammer/sys/kern/kern_clock.c#23 (text+ko) ==== @@ -39,6 +39,7 @@ #include "opt_ntp.h" #include "opt_watchdog.h" +#include "opt_compat.h" #include #include @@ -79,8 +80,36 @@ /* Some of these don't belong here, but it's easiest to concentrate them. */ long cp_time[CPUSTATES]; -SYSCTL_OPAQUE(_kern, OID_AUTO, cp_time, CTLFLAG_RD, &cp_time, sizeof(cp_time), - "LU", "CPU time statistics"); +#ifdef COMPAT_IA32 +extern struct sysentvec ia32_freebsd_sysvec; +#endif + +static int +sysctl_kern_cp_time(SYSCTL_HANDLER_ARGS) +{ + int error; +#ifdef COMPAT_IA32 + int i; + unsigned int cp_time32[CPUSTATES]; + + if (req->td->td_proc->p_sysent == &ia32_freebsd_sysvec) { + if (!req->oldptr) + return SYSCTL_OUT(req, 0, sizeof(cp_time32)); + for (i = 0; i < CPUSTATES; i++) + cp_time32[i] = (unsigned int)cp_time[i]; + error = SYSCTL_OUT(req, cp_time32, sizeof(cp_time32)); + } else +#endif + { + if (!req->oldptr) + return SYSCTL_OUT(req, 0, sizeof(cp_time)); + error = SYSCTL_OUT(req, cp_time, sizeof(cp_time)); + } + return error; +} + +SYSCTL_PROC(_kern, OID_AUTO, cp_time, CTLTYPE_LONG|CTLFLAG_RD, + 0,0, sysctl_kern_cp_time, "LU", "CPU time statistics"); #ifdef SW_WATCHDOG #include From owner-p4-projects@FreeBSD.ORG Wed Mar 16 00:42:16 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D7F516A4D0; Wed, 16 Mar 2005 00:42:16 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AB05E16A4CE for ; Wed, 16 Mar 2005 00:42:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C57F743D55 for ; Wed, 16 Mar 2005 00:42:14 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2G0gEqo013884 for ; Wed, 16 Mar 2005 00:42:14 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2G0gE7F013881 for perforce@freebsd.org; Wed, 16 Mar 2005 00:42:14 GMT (envelope-from peter@freebsd.org) Date: Wed, 16 Mar 2005 00:42:14 GMT Message-Id: <200503160042.j2G0gE7F013881@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 73264 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, 16 Mar 2005 00:42:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=73264 Change 73264 by peter@peter_daintree on 2005/03/16 00:41:55 IFC @73263 Affected files ... .. //depot/projects/hammer/lib/libc/alpha/gen/Makefile.inc#9 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/fpsetsticky.c#3 delete .. //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#17 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/fpsetsticky.c#4 delete .. //depot/projects/hammer/lib/libc/powerpc/gen/Makefile.inc#6 integrate .. //depot/projects/hammer/lib/libc/powerpc/gen/fpsetsticky.c#2 delete .. //depot/projects/hammer/lib/libc/softfloat/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/gen/Makefile.inc#8 integrate .. //depot/projects/hammer/lib/libc/sparc64/gen/fpsetsticky.c#2 delete .. //depot/projects/hammer/lib/libkvm/kvm_proc.c#28 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#10 integrate .. //depot/projects/hammer/sbin/atm/atmconfig/Makefile#7 integrate .. //depot/projects/hammer/share/examples/cvsup/refuse#7 integrate .. //depot/projects/hammer/share/examples/cvsup/refuse.README#7 integrate .. //depot/projects/hammer/share/man/man3/Makefile#10 integrate .. //depot/projects/hammer/share/man/man9/rman.9#4 integrate .. //depot/projects/hammer/sys/amd64/include/ieeefp.h#15 integrate .. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#13 integrate .. //depot/projects/hammer/sys/boot/i386/Makefile.inc#5 integrate .. //depot/projects/hammer/sys/boot/i386/boot2/Makefile#9 integrate .. //depot/projects/hammer/sys/coda/coda_psdev.c#12 integrate .. //depot/projects/hammer/sys/coda/coda_venus.c#10 integrate .. //depot/projects/hammer/sys/compat/linux/linux_stats.c#18 integrate .. //depot/projects/hammer/sys/conf/kern.mk#19 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_isa.c#16 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#35 integrate .. //depot/projects/hammer/sys/dev/snp/snp.c#17 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs.h#7 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#18 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vnops.c#17 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_denode.c#19 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#32 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfsmount.h#11 integrate .. //depot/projects/hammer/sys/fs/nullfs/null.h#6 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_subr.c#12 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#18 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_status.c#13 integrate .. //depot/projects/hammer/sys/fs/udf/udf.h#10 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#19 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#24 integrate .. //depot/projects/hammer/sys/geom/geom_disk.h#3 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vfsops.c#28 integrate .. //depot/projects/hammer/sys/i386/include/ieeefp.h#5 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vfsops.c#28 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#30 integrate .. //depot/projects/hammer/sys/kern/kern_lock.c#16 integrate .. //depot/projects/hammer/sys/kern/kern_lockf.c#12 integrate .. //depot/projects/hammer/sys/kern/subr_rman.c#12 integrate .. //depot/projects/hammer/sys/kern/vfs_hash.c#2 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#77 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/busdma_machdep.c#15 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/trap.c#14 integrate .. //depot/projects/hammer/sys/powerpc/psim/ata_iobus.c#8 integrate .. //depot/projects/hammer/sys/sys/bus_dma.h#2 integrate .. //depot/projects/hammer/sys/sys/conf.h#30 integrate .. //depot/projects/hammer/sys/sys/lockmgr.h#7 integrate .. //depot/projects/hammer/sys/sys/systm.h#32 integrate .. //depot/projects/hammer/sys/sys/vnode.h#49 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#46 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_inode.c#15 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#41 integrate .. //depot/projects/hammer/usr.bin/fstat/fstat.c#14 integrate .. //depot/projects/hammer/usr.bin/make/Makefile#16 integrate .. //depot/projects/hammer/usr.bin/make/arch.c#15 integrate .. //depot/projects/hammer/usr.bin/make/lst.c#2 integrate .. //depot/projects/hammer/usr.bin/make/lst.h#12 integrate .. //depot/projects/hammer/usr.bin/make/parse.c#25 integrate .. //depot/projects/hammer/usr.bin/make/targ.c#13 integrate .. //depot/projects/hammer/usr.bin/make/var.c#24 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#2 integrate Differences ... ==== //depot/projects/hammer/lib/libc/alpha/gen/Makefile.inc#9 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.15 2004/08/15 16:18:02 dfr Exp $ +# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.16 2005/03/15 15:53:38 das Exp $ SRCS+= _setjmp.S _set_tp.c fabs.S infinity.c ldexp.c modf.c setjmp.S SRCS+= flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \ - fpsetround.c fpsetsticky.c + fpsetround.c SRCS+= sigsetjmp.S SRCS+= __divqu.S __divq.S __divlu.S __divl.S ==== //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#17 (text+ko) ==== @@ -1,8 +1,8 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.28 2004/08/15 16:18:02 dfr Exp $ +# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.29 2005/03/15 15:53:38 das Exp $ SRCS+= _setjmp.S _set_tp.c rfork_thread.S setjmp.S sigsetjmp.S \ fabs.S modf.S \ infinity.c ldexp.c makecontext.c signalcontext.c \ flt_rounds.c fpgetmask.c fpsetmask.c fpgetprec.c fpsetprec.c \ - fpgetround.c fpsetround.c fpgetsticky.c fpsetsticky.c + fpgetround.c fpsetround.c fpgetsticky.c ==== //depot/projects/hammer/lib/libc/powerpc/gen/Makefile.inc#6 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/lib/libc/powerpc/gen/Makefile.inc,v 1.7 2004/08/15 16:18:03 dfr Exp $ +# $FreeBSD: src/lib/libc/powerpc/gen/Makefile.inc,v 1.8 2005/03/15 15:53:38 das Exp $ SRCS += _ctx_start.S fabs.S flt_rounds.c fpgetmask.c fpgetround.c \ - fpgetsticky.c fpsetmask.c fpsetround.c fpsetsticky.c \ + fpgetsticky.c fpsetmask.c fpsetround.c \ infinity.c ldexp.c makecontext.c modf.c _setjmp.S \ setjmp.S sigsetjmp.S signalcontext.c syncicache.c \ _set_tp.c ==== //depot/projects/hammer/lib/libc/softfloat/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile.inc,v 1.3 2003/05/06 08:58:20 rearnsha Exp $ -# $FreeBSD: src/lib/libc/softfloat/Makefile.inc,v 1.1 2004/05/14 12:13:04 cognet Exp $ +# $FreeBSD: src/lib/libc/softfloat/Makefile.inc,v 1.2 2005/03/15 15:53:39 das Exp $ SOFTFLOAT_BITS?=64 .PATH: ${MACHINE_ARCH}/softfloat \ @@ -11,7 +11,7 @@ SRCS+= softfloat.c SRCS+= fpgetround.c fpsetround.c fpgetmask.c fpsetmask.c \ - fpgetsticky.c fpsetsticky.c + fpgetsticky.c SRCS+= eqsf2.c nesf2.c gtsf2.c gesf2.c ltsf2.c lesf2.c negsf2.c \ eqdf2.c nedf2.c gtdf2.c gedf2.c ltdf2.c ledf2.c negdf2.c \ ==== //depot/projects/hammer/lib/libc/sparc64/gen/Makefile.inc#8 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/lib/libc/sparc64/gen/Makefile.inc,v 1.11 2004/08/15 16:18:03 dfr Exp $ +# $FreeBSD: src/lib/libc/sparc64/gen/Makefile.inc,v 1.12 2005/03/15 15:53:39 das Exp $ SRCS+= _ctx_start.S _setjmp.S fabs.S fixunsdfsi.S flt_rounds.c fpgetmask.c \ - fpgetround.c fpgetsticky.c fpsetmask.c fpsetround.c fpsetsticky.c \ + fpgetround.c fpgetsticky.c fpsetmask.c fpsetround.c \ infinity.c ldexp.c makecontext.c modf.S \ signalcontext.c setjmp.S sigsetjmp.S _set_tp.c ==== //depot/projects/hammer/lib/libkvm/kvm_proc.c#28 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.84 2004/11/20 02:28:26 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.85 2005/03/15 14:26:14 phk Exp $"); /* * Proc traversal interface for kvm. ps and w are (probably) the exclusive @@ -281,7 +281,11 @@ tty.t_dev); return (-1); } +#if 0 kp->ki_tdev = t_cdev.si_udev; +#else + kp->ki_tdev = NULL; +#endif } if (tty.t_pgrp != NULL) { if (KREAD(kd, (u_long)tty.t_pgrp, &pgrp)) { ==== //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#10 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -11,7 +11,7 @@ ðÒÏÅËÔ &os; - $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml,v 1.13 2005/03/09 14:03:59 den Exp $ + $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml,v 1.14 2005/03/15 08:29:00 den Exp $ 2000 @@ -23,6 +23,15 @@ ðÒÏÅËÔ ÄÏËÕÍÅÎÔÉÒÏ×ÁÎÉÑ &os; + + &tm-attrib.freebsd; + &tm-attrib.ibm; + &tm-attrib.ieee; + &tm-attrib.intel; + &tm-attrib.sparc; + &tm-attrib.general; + + úÁÍÅÔËÉ Ï ÒÅÌÉÚÅ ÄÌÑ &os; &release.current; ÓÏÄÅÒÖÁÔ ÏÂÝÕÀ ÉÎÆÏÒÍÁÃÉÀ ÐÏ ÉÚÍÅÎÅÎÉÑÍ, ×ÎÅÓÅÎÎÙÍ × ÓÉÓÔÅÍÕ Ó ÍÏÍÅÎÔÁ ÓÏÚÄÁÎÉÑ @@ -112,17 +121,129 @@ óÏÏÂÝÅÎÉÑ ÂÅÚÏÐÁÓÎÏÓÔÉ - + + âÙÌÁ ÉÓÐÒÁ×ÌÅÎÁ ÏÛÉÂËÁ × ÕÔÉÌÉÔÅ &man.fetch.1;, ÐÏÚ×ÏÌÑ×ÛÁÑ + ÚÌÏÎÁÍÅÒÅÎÎÏÍÕ HTTP ÓÅÒ×ÅÒÕ ÐÅÒÅÚÁÐÉÓØ ÐÒÏÉÚ×ÏÌØÎÙÈ ÕÞÁÓÔËÏ× ÐÁÍÑÔÉ + ËÌÉÅÎÔÁ. úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ Ë ÓÏÏÂÝÅÎÉÀ ÂÅÚÏÐÁÓÎÏÓÔÉ + FreeBSD-SA-04:16.fetch. + &merged; + + âÙÌÁ ÉÓÐÒÁ×ÌÅÎÁ ÏÛÉÂËÁ × &man.procfs.5; É &man.linprocfs.5;, + ÐÏÚ×ÏÌÑ×ÛÁÑ ÚÌÏÎÁÍÅÒÅÎÎÏÍÕ ÌÏËÁÌØÎÏÍÕ ÐÏÌØÚÏ×ÁÔÅÌÀ ÞÉÔÁÔØ ÞÁÓÔÉ + ÐÁÍÑÔÉ ÑÄÒÁ ÉÌÉ ×ÙÐÏÌÎÑÔØ ÌÏËÁÌØÎÕÀ DoS ÁÔÁËÕ ÐÕÔÅÍ ×ÙÚÏ×Á ÐÁÎÉËÉ + ÓÉÓÔÅÍÙ. úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ Ë ÓÏÏÂÝÅÎÉÀ ÂÅÚÏÐÁÓÎÏÓÔÉ + FreeBSD-SA-04:17.procfs. + &merged; + éÚÍÅÎÅÎÉÑ × ÑÄÒÅ - ðÅÒÅÍÅÎÎÁÑ ÚÁÇÒÕÚÞÉËÁ - debug.mpsafevm ÂÙÌÁ ×ËÌÀÞÅÎÁ ÐÏ ÕÍÏÌÞÁÎÉÀ. + ðÏÄÄÅÒÖËÁ ÐÒÏÃÅÓÓÏÒÏ× 80386 (ÏÐÃÉÑ ÑÄÒÁ + I386_CPU) ÂÙÌÁ ÕÄÁÌÅÎÁ. ðÏÌØÚÏ×ÁÔÅÌÑÍ, + ÚÁÐÕÓËÁÀÝÉÍ ÓÉÓÔÅÍÕ ÎÁ ÜÔÏÍ ËÌÁÓÓÅ CPU, ÐÒÅÄÌÁÇÁÅÔÓÑ ÉÓÐÏÌØÚÏ×ÁÔØ + &os; 5.X ÉÌÉ ÂÏÌÅÅ ÒÁÎÎÀÀ. + + ïÔÌÁÄÞÉË ÑÄÒÁ &man.ddb.4; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ËÏÍÁÎÄÕ + show alllocks, ËÏÔÏÒÁÑ ×Ù×ÏÄÉÔ ÓÐÉÓÏË ÐÒÏÃÅÓÓÏ× É + ÐÏÔÏËÏ×, ÕÄÅÒÖÉ×ÁÀÝÉÈ × ÄÁÎÎÙÊ ÍÏÍÅÎÔ sleep ÍØÀÔÅËÓÙ (É spin ÍØÀÔÅËÓÙ + ÄÌÑ ÔÅËÕÝÅÇÏ ÐÏÔÏËÁ). &merged; + + &man.jail.8; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÎÏ×ÕÀ ÐÅÒÅÍÅÎÎÕÀ sysctl + security.jail.chflags_allowed, ËÏÔÏÒÁÑ ËÏÎÔÒÏÌÉÒÕÅÔ + ÐÏ×ÅÄÅÎÉÅ &man.chflags.1; ×ÎÕÔÒÉ jail. + åÓÌÉ ÐÅÒÅÍÅÎÎÁÑ ÕÓÔÁÎÏ×ÌÅÎÁ × 0 (ÚÎÁÞÅÎÉÅ ÐÏ + ÕÍÏÌÞÁÎÉÀ), ×ÎÕÔÒÉ jail root ÓÞÉÔÁÅÔÓÑ + ÎÅÐÒÉ×ÉÌÅÇÉÒÏ×ÁÎÎÙÍ ÐÏÌØÚÏ×ÁÔÅÌÅÍ; ÅÓÌÉ ÏÎÁ ÕÓÔÁÎÏ×ÌÅÎÁ × + 1, ÒÁÚÌÉÞÉÊ ÍÅÖÄÕ ÐÏÌØÚÏ×ÁÔÅÌÅÍ + root ×ÎÕÔÒÉ jail É ×ÎÅ jail ÎÅ ÄÅÌÁÅÔÓÑ. + &merged; + + ðÅÒÅÍÅÎÎÁÑ ÚÁÇÒÕÚÞÉËÁ + debug.mpsafevm ÂÙÌÁ ×ËÌÀÞÅÎÁ ÐÏ + ÕÍÏÌÞÁÎÉÀ. &merged; + + âÙÌ ÄÏÂÁ×ÌÅÎ &man.memguard.9;, ×ÙÄÅÌÉÔÅÌØ ÐÁÍÑÔÉ ÑÄÒÁ, + ÒÁÚÒÁÂÏÔÁÎÎÙÊ × ËÁÞÅÓÔ×Å ÐÏÍÏÝÉ ÄÌÑ ÏÂÎÁÒÕÖÅÎÉÑ ÓÃÅÎÁÒÉÅ× + tamper-after-free. ïÎ ÄÏÌÖÅÎ ÂÙÔØ Ñ×ÎÏ ÄÏÂÁ×ÌÅÎ + ÞÅÒÅÚ options DEBUG_MEMGUARD, Ó ÎÅÂÏÌØÛÉÍÉ + ÉÚÍÅÎÅÎÉÑÍÉ ÑÄÒÁ. ïÎ ËÁË × ÏÓÎÏ×ÎÏÍ ÐÒÅÄÎÁÚÎÁÞÅÎ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ + ÒÁÚÒÁÂÏÔÞÉËÁÍÉ ÑÄÒÁ. + + íÎÏÖÅÓÔ×Ï ÏÛÉÂÏË ÂÙÌÏ ÉÓÐÒÁ×ÌÅÎÏ × ÐÌÁÎÉÒÏ×ÝÉËÅ ULE. + &merged; + + âÙÌÁ ÄÏÂÁ×ÌÅÎÁ fine-grained ÂÌÏËÉÒÏ×ËÁ, ÞÔÏÂÙ ÐÏÚ×ÏÌÉÔØ ÂÏÌØÛÅÊ + ÞÁÓÔÉ ÓÔÅËÁ VFS ÒÁÂÏÔÁÔØ ÂÅÚ Giant ÂÌÏËÉÒÏ×ËÉ. ïÎÁ ×ËÌÀÞÅÎÁ ÐÏ + ÕÍÏÌÞÁÎÉÀ ÎÁ ÁÒÈÉÔÅËÔÕÒÁÈ alpha, amd64 É i386, É ÍÏÖÅÔ ÂÙÔØ + ×ÙËÌÀÞÅÎÁ ÕÓÔÁÎÏ×ËÏÊ ÐÅÒÅÍÅÎÎÏÊ ÚÁÇÒÕÚÞÉËÁ (É ÐÅÒÅÍÅÎÎÏÊ + sysctl) debug.mpsafevfs × + 0. + + âÙÌÁ ÉÓÐÒÁ×ÌÅÎÁ ÏÛÉÂËÁ × ÏÂÒÁÂÏÔËÅ Inter-Processor + Interrupt (IPI), ËÏÔÏÒÁÑ ÍÏÇÌÁ ×ÙÚ×ÁÔØ ËÒÁÈ SMP ÓÉÓÔÅÍ ÐÏÄ ×ÙÓÏËÏÊ + ÎÁÇÒÕÚËÏÊ. âÏÌÅÅ ÐÏÄÒÏÂÎÁÑ ÉÎÆÏÒÍÁÃÉÑ ÏÐÕÂÌÉËÏ×ÁÎÁ × ÓÏÏÂÝÅÎÉÉ Ï + ÐÒÏÂÌÅÍÅ + FreeBSD-EN-05:03.ipi. + &merged; + + ïÂßÅËÔÙ System V IPC (ÏÞÅÒÅÄÉ ÓÏÏÂÝÅÎÉÊ, ÓÅÍÁÆÏÒÙ, É ÒÁÚÄÅÌÑÅÍÁÑ + ÐÁÍÑÔØ) ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÀÔ ÐÏÌÉÔÉËÉ ÐÒÉÎÕÄÉÔÅÌØÎÏÇÏ ËÏÎÔÒÏÌÑ ÄÏÓÔÕÐÁ + (MAC) &man.mac.biba.4;, &man.mac.mls.4;, &man.mac.stub.4;, É + &man.mac.test.4;. + + ÷ÙÄÅÌÅÎÉÅ ÐÁÍÑÔÉ ÄÌÑ ÓÔÁÒÙÈ PCI ÍÏÓÔÏ× ÂÙÌÏ ÏÇÒÁÎÉÞÅÎÏ + ÄÏ 32MB RAM. íÎÏÇÉÅ ÓÔÁÒÙÅ ÍÏÓÔÙ ÐÏÚ×ÏÌÑÀÔ ×ÙÄÅÌÅÎÉÅ ÐÁÍÑÔÉ ÔÏÌØËÏ + ÉÚ ÜÔÏÇÏ ÄÉÁÐÁÚÏÎÁ. éÚÍÅÎÅÎÉÅ ÐÒÉÍÅÎÑÅÔÓÑ ÔÏÌØËÏ Ë ÕÓÔÒÏÊÓÔ×ÁÍ, + ÐÁÍÑÔØ ËÏÔÏÒÙÈ ÎÅ ×ÙÄÅÌÅÎÁ BIOS. üÔÏ ÉÚÍÅÎÅÎÉÅ ÉÓÐÒÁ×ÌÑÅÔ ÏÛÉÂËÕ + bad Vcc ÍÏÓÔÏ× CardBus (&man.pccbb.4;). &merged; + + &man.sysctl.3; MIB, ÎÁÞÉÎÁÀÝÉÅÓÑ Ó debug, ÔÅÐÅÒØ + ÔÒÅÂÕÀÔ ÐÁÒÁÍÅÔÒ ÑÄÒÁ options SYSCTL_DEBUG. + üÔÏÔ ÐÁÒÁÍÅÔÒ ×ÙËÌÀÞÅÎ ÐÏ ÕÍÏÌÞÁÎÉÀ. + + âÙÌ ÄÏÂÁ×ÌÅÎ ÏÂÝÉÊ ÄÒÁÊ×ÅÒ ÉÎÔÅÒÆÅÊÓÁ &man.tty.4; É ÍÎÏÇÉÅ + ÄÒÁÊ×ÅÒÁ ÕÓÔÒÏÊÓÔ×, ×ËÌÀÞÁÑ + &man.cx.4; ({tty,cua}x), + &man.cy.4; ({tty,cua}c), + &man.digi.4; ({tty,cua}D), + &man.rc.4; ({tty,cua}m), + &man.rp.4; ({tty,cua}R), + &man.sab.4; ({tty,cua}z), + &man.si.4; ({tty,cua}A), + &man.sio.4; ({tty,cua}d), + sx ({tty,cua}G), + &man.uart.4; ({tty,cua}u), + &man.ubser.4; ({tty,cua}y), + &man.ucom.4; ({tty,cua}U) É + &man.ucycom.4; ({tty,cua}y) + ÂÙÌÉ ÐÅÒÅÐÉÓÁÎÙ ÄÌÑ ÅÇÏ ÉÓÐÏÌØÚÏ×ÁÎÉÑ. ïÂÒÁÔÉÔÅ + ×ÎÉÍÁÎÉÅ, ÞÔÏ ÆÁÊÌÙ /etc/remote + É /etc/ttys ÔÁËÖÅ ÂÙÌÉ ÏÂÎÏ×ÌÅÎÙ. + + âÙÌ ÄÏÂÁ×ÌÅÎ ÄÒÁÊ×ÅÒ &man.vkbd.4;. üÔÏÔ ÄÒÁÊ×ÅÒ + ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ÐÒÏÇÒÁÍÍÎÙÊ loopback ÍÅÈÁÎÉÚÍ, ËÏÔÏÒÙÊ ÐÏÚ×ÏÌÑÅÔ + ÒÅÁÌÉÚÏ×ÁÔØ ×ÉÒÔÕÁÌØÎÕÀ ËÌÁ×ÉÁÔÕÒÕ AT ÐÏÄÏÂÎÏ ÔÏÍÕ, ËÁË ÄÒÁÊ×ÅÒ + &man.pty.4; ÄÅÌÁÅÔ ÜÔÏ ÄÌÑ ÔÅÒÍÉÎÁÌÏ×. + ðÁÒÁÍÅÔÒ ÐÏ ÕÍÏÌÞÁÎÉÀ HZ + (ËÏÎÔÒÏÌÉÒÕÀÝÉÊ ÒÁÚÌÉÞÎÙÅ ÔÁÊÍÅÒÙ ÑÄÒÁ) ÂÙÌ Õ×ÅÌÉÞÅÎ Ó + 100 ÄÏ 1000 + ÎÁ i386 É ia64. ïÎ ÂÙÌ ÕÍÅÎØÛÅÎ Ó + 1024 ÄÏ 1000 ÎÁ amd64 + ÄÌÑ ÕÍÅÎØÛÅÎÉÑ ÜÆÆÅËÔÏ× ÓÉÎÈÒÏÎÉÚÁÃÉÉ Ó ÄÒÕÇÉÍÉ ÓÉÓÔÅÍÎÙÍÉ + ÞÁÓÁÍÉ. + + íÁËÓÉÍÁÌØÎÁÑ ÄÌÉÎÁ ËÏÍÁÎÄ shell ÂÙÌÁ ÉÚÍÅÎÅÎÁ Ó 128 ÂÁÊÔ + ÄÏ PAGE_SIZE. ðÏ ÕÍÏÌÞÁÎÉÀ, ÜÔÏ ÚÎÁÞÅÎÉÅ + ÉÌÉ 4KB (i386, pc98, amd64 É powerpc) ÉÌÉ 8KB (sparc64 + É ia64). ÷ ÒÅÚÕÌØÔÁÔÅ, ÍÏÄÕÌÉ ÓÏ×ÍÅÓÔÉÍÏÓÔÉ ÎÅÏÂÈÏÄÉÍÏ + ÐÅÒÅÓÏÂÒÁÔØ ÄÌÑ ÐÏÄÄÅÒÖÁÎÉÑ ÓÉÎÈÒÏÎÉÚÁÃÉÉ Ó + ÑÄÒÏÍ. + éÚÍÅÎÅÎÉÑ × ÚÁÇÒÕÚÞÉËÅ @@ -136,6 +257,16 @@ BIOS, ×ÓÔÒÅÞÁÀÝÕÀÓÑ ÎÁ ÎÅËÏÔÏÒÙÈ ÓÉÓÔÅÍÁÈ ÐÒÉ ÚÁÇÒÕÚËÅ Ó USB CDROM ÐÒÉ×ÏÄÏ×. + ëÏÍÁÎÄÁ ÚÁÇÒÕÚÞÉËÁ autoboot ÔÅÐÅÒØ + ÐÏÄÄÅÒÖÉ×ÁÅÔ ÐÁÒÁÍÅÔÒ prompt. + + âÙÌ ÄÏÂÁ×ÌÅÎ ÐÁÒÁÍÅÔÒ ÍÅÎÀ ÚÁÇÒÕÚÞÉËÁ ÄÌÑ ÕÓÔÁÎÏ×ËÉ + hint.atkbd.0.flags=0x1. üÔÏ ÐÏÚ×ÏÌÑÅÔ + ËÌÁ×ÉÁÔÕÒÅ USB ÒÁÂÏÔÁÔØ ÅÓÌÉ ÎÅÔ ÐÏÄËÌÀÞÅÎÎÏÊ ËÌÁ×ÉÁÔÕÒÙ + PS/2. + + ìÏÇÏÔÉÐ ÂÙÌ ÕÂÒÁÎ ÉÚ ÚÁÇÒÕÚÏÞÎÏÇÏ ÍÅÎÀ. + @@ -143,28 +274,313 @@ ðÏÄÄÅÒÖËÁ ÏÂÏÒÕÄÏ×ÁÎÉÑ + äÒÁÊ×ÅÒ &man.acpi.4; ×ÙËÌÀÞÁÅÔ + ÕÓÔÒÏÊÓÔ×Á ACPI É PCI ÉÌÉ ÐÅÒÅ×ÏÄÉÔ ÉÈ × ÒÅÖÉÍ ÐÏÎÉÖÅÎÎÏÇÏ + ÜÎÅÒÇÏÐÏÔÒÅÂÌÅÎÉÑ × ÒÅÖÉÍÅ suspend, É ×ÏÚ×ÒÁÝÁÅÔ ÏÂÒÁÔÎÏ + ÐÒÉ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÉ. üÔÏ ÐÏ×ÅÄÅÎÉÅ ÍÏÖÅÔ ÂÙÔØ ÚÁÂÌÏËÉÒÏ×ÁÎÏ ÕÓÔÁÎÏ×ËÏÊ + ÐÅÒÅÍÅÎÎÙÈ sysctl debug.acpi.do_powerstate + É hw.pci.do_powerstate × 0. + + âÙÌ ÄÏÂÁ×ÌÅÎ ÄÒÁÊ×ÅÒ acpi_ibm ÄÌÑ + ÌÜÐÔÏÐÏ× IBM. + + âÙÌ ÄÏÂÁ×ÌÅÎ ÄÒÁÊ×ÅÒ acpi_snc, + ÐÏÄÄÅÒÖÉ×ÁÀÝÉÊ Sony Notebook Controller ÎÁ ÒÁÚÌÉÞÎÙÈ ÌÜÐÔÏÐÁÈ + Sony. + + âÙÌ ÄÏÂÁ×ÌÅÎ ÄÒÁÊ×ÅÒ &man.auxio.4; ÄÌÑ ÏÂÒÁÂÏÔËÉ + ÎÅËÏÔÏÒÙÈ ×ÓÐÏÍÏÇÁÔÅÌØÎÙÈ ÆÕÎËÃÉÊ ××ÏÄÁ/×Ù×ÏÄÁ, ÏÂÎÁÒÕÖÅÎÎÙÈ + × ÒÁÚÌÉÞÎÙÈ SBus/EBus &ultrasparc; ÍÏÄÅÌÑÈ. &merged; + + âÙÌÁ ÄÏÂÁ×ÌÅÎÁ ÉÎÆÒÁÓÔÒÕËÔÕÒÁ ÄÌÑ ÇÉÂËÏÇÏ ÕÐÒÁ×ÌÅÎÉÑ + ÓËÏÒÏÓÔØÀ ÐÒÏÃÅÓÓÏÒÁ. ïÎÁ ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ÒÁÚÌÉÞÎÙÍ ÄÒÁÊ×ÅÒÁÍ + ÍÅÔÏÄÙ ÕÐÒÁ×ÌÅÎÉÑ ÜÎÅÒÇÏÐÏÔÒÅÂÌÅÎÉÅÍ CPU ÐÕÔÅÍ ÉÚÍÅÎÅÎÉÑ + ÓËÏÒÏÓÔÉ ÐÒÏÃÅÓÓÏÒÁ. âÏÌÅÅ ÄÅÔÁÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ ÎÁÈÏÄÉÔÓÑ + ÎÁ ÓÔÒÁÎÉÃÅ ÓÐÒÁ×ÏÞÎÉËÁ &man.cpufreq.4;. &merged; + ÷ ÎÁÓÔÏÑÝÅÅ ×ÒÅÍÑ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ ÄÒÁÊ×ÅÒÙ ichss (Intel SpeedStep + for ICH), acpi_perf (ACPI CPU performance states), É + acpi_throttle (ACPI CPU throttling). ðÏÓÌÅÄÎÉÅ Ä×Á ÄÒÁÊ×ÅÒÁ + ×ËÌÀÞÅÎÙ × ÄÒÁÊ×ÅÒ &man.acpi.4;. ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÄÒÁÊ×ÅÒÙ + ÍÏÇÕÔ ÂÙÔØ ÉÎÄÉ×ÉÄÕÁÌØÎÏ ÏÔËÌÀÞÅÎÙ ÐÕÔÅÍ ÕÓÔÁÎÏ×ËÉ ÈÉÎÔÏ×, + ÔÁËÉÈ ËÁË hint.ichss.0.disabled="1". + + ðÏÄÄÅÒÖËÁ ÐÏÄÓÉÓÔÅÍÙ OLDCARD ÂÙÌÁ ÕÄÁÌÅÎÁ. + äÌÑ ÐÏÄÄÅÒÖËÉ ×ÓÅÈ ÕÓÔÒÏÊÓÔ× PCCARD × ÎÁÓÔÏÑÝÅÅ ×ÒÅÍÑ + ÉÓÐÏÌØÚÕÅÔÓÑ NEWCARD. + + âÙÌ ÄÏÂÁ×ÌÅÎ ÄÒÁÊ×ÅÒ pcii ÄÌÑ ÐÏÄÄÅÒÖËÉ ËÁÒÔ GPIB-PCIIA + IEEE-488. &merged; + + äÒÁÊ×ÅÒ &man.atkbd.4; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÆÌÁÇ + 0x8 (bit 3) ÄÌÑ ÏÔÍÅÎÙ ÔÅÓÔÉÒÏ×ÁÎÉÑ ÐÏÒÔÁ + ËÌÁ×ÉÁÔÕÒÙ ×Ï ×ÒÅÍÑ ÔÅÓÔÉÒÏ×ÁÎÉÑ ÕÓÔÒÏÊÓÔ×, ÐÏÓËÏÌØËÕ + ÏÎÏ ×ÙÚÙ×ÁÌÏ ÓÂÏÊ × ÎÅËÏÔÏÒÙÈ ÓÉÓÔÅÍÁÈ, ÎÁÐÒÉÍÅÒ ÎÁ + Compaq R3000Z series ÌÜÐÔÏÐÁÈ amd64. + + âÙÌ ÄÏÂÁ×ÌÅÎ ÄÒÁÊ×ÅÒ &man.pbio.4;, ÐÏÄÄÅÒÖÉ×ÁÀÝÉÊ + ÐÒÑÍÏÊ ÄÏÓÔÕÐ Ë Intel 8255A programmable peripheral interface (PPI) + × ÒÅÖÉÍÅ 0 (ÐÒÏÓÔÏÊ ××ÏÄ/×Ù×ÏÄ). + + äÒÁÊ×ÅÒ &man.psm.4; ÔÅÐÅÒØ ÌÕÞÛÅ ÐÏÄÈÏÄÉÔ ÄÌÑ ÐÏÌØÚÏ×ÁÔÅÌÅÊ + Synaptics Touchpad. ôÅÐÅÒØ ÏÎ ÌÕÞÛÅ ÏÔÓÌÅÖÉ×ÁÅÔ ÎÉÚËÏÓËÏÒÏÓÔÎÙÅ + ÐÅÒÅÍÅÝÅÎÉÑ É ÐÏÄÄÅÒÖÉ×ÁÅÔ ÒÁÚÌÉÞÎÙÅ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ËÎÏÐËÉ. + üÔÉ ×ÏÚÍÏÖÎÏÓÔÉ ÍÏÇÕÔ ÂÙÔØ ÎÁÓÔÒÏÅÎÙ Ó ÐÏÍÏÝØÀ ÉÅÒÁÒÈÉÉ sysctl + hw.psm.synaptics.*. + + âÙÌ ÄÏÂÁ×ÌÅÎ ÄÒÁÊ×ÅÒ rtc ÄÌÑ ÐÏÄÄÅÒÖËÉ + MC146818-ÓÏ×ÍÅÓÔÉÍÙÈ ÞÁÓÏ×, ÏÂÎÁÒÕÖÅÎÎÙÈ ÎÁ ÎÅËÏÔÏÒÙÈ ÍÏÄÅÌÑÈ + &ultrasparc; II É III. &merged; + + äÒÁÊ×ÅÒ &man.uart.4; ÂÙÌ ×ËÌÀÞÅÎ × ÑÄÒÅ + GENERIC, É ÔÅÐÅÒØ ÜÔÏ ÄÒÁÊ×ÅÒ ÐÏ ÕÍÏÌÞÁÎÉÀ + ÄÌÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÙÈ ÐÏÒÔÏ×. äÒÁÊ×ÅÒÙ ofw_console É + &man.sab.4; ÔÅÐÅÒØ ×ÙËÌÀÞÅÎÙ × ÑÄÒÅ + GENERIC. &merged; + + äÒÁÊ×ÅÒ &man.uplcom.4; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÏÂÒÁÂÏÔËÕ ÓÉÇÎÁÌÁ + CTS. + + âÙÌ ÕÌÕÞÛÅÎ ÄÒÁÊ×ÅÒ &man.ehci.4;. + + äÒÁÊ×ÅÒ zs ÂÙÌ ÕÄÁÌÅÎ, ×ÍÅÓÔÏ ÎÅÇÏ ÄÏÌÖÅÎ + ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÄÒÁÊ×ÅÒ &man.uart.4;. + ðÏÄÄÅÒÖËÁ ÍÕÌØÔÉÍÅÄÉÁ - + + âÙÌ ÄÏÂÁ×ÌÅÎ ÄÒÁÊ×ÅÒ &man.snd.audiocs.4; ÄÌÑ + ÐÏÄÄÅÒÖËÉ Crystal Semiconductor CS4231 ÁÕÄÉÏ ËÏÎÔÒÏÌÌÅÒÁ, + ÏÂÎÁÒÕÖÅÎÎÏÇÏ ÎÁ ÒÁÂÏÞÉÈ ÓÔÁÎÃÉÑÈ &ultrasparc;. &merged; + + äÒÁÊ×ÅÒ &man.uaudio.4; ÔÅÐÅÒØ ÓÏÄÅÒÖÉÔ ÎÅËÏÔÏÒÕÀ ÄÏÐÏÌÎÉÔÅÌØÎÕÀ + ÆÕÎËÃÉÏÎÁÌØÎÏÓÔØ, ×ËÌÀÞÁÑ ËÏÎÔÒÏÌØ ÕÒÏ×ÎÑ ÎÁ ÂÏÌØÛÅÍ ÞÉÓÌÅ ×ÈÏÄÏ× + É ×ÏÚÍÏÖÎÏÓÔØ ÚÁÐÉÓÉ ÎÁ ÎÅËÏÔÏÒÙÈ ÕÓÔÒÏÊÓÔ×ÁÈ. + ðÏÄÄÅÒÖËÁ ÓÅÔÅ×ÙÈ ÉÎÔÅÒÆÅÊÓÏ× - + + äÒÁÊ×ÅÒ &man.ath.4; ÂÙÌ ÏÂÎÏ×ÌÅÎ, ÞÔÏÂÙ ×ÙÄÅÌÉÔØ ÁÌÇÏÒÉÔÍ + ËÏÎÔÒÏÌÑ ÓËÏÒÏÓÔÉ ÐÅÒÅÄÁÞÉ ÄÁÎÎÙÈ × ÏÔÄÅÌØÎÙÊ ÍÏÄÕÌØ. + ðÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ ÄÒÁÊ×ÅÒÁ &man.ath.4; × ÆÁÊÌ ËÏÎÆÉÇÕÒÁÃÉÉ + ÑÄÒÁ ÎÅÏÂÈÏÄÉÍÏ ×ËÌÀÞÉÔØ ÌÉÂÏ + device ath_rate_onoe ÌÉÂÏ + device ath_rate_amrr. + + äÒÁÊ×ÅÒ &man.bge.4; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÉÎÆÒÁÓÔÒÕËÔÕÒÕ + &man.altq.4;. + + äÒÁÊ×ÅÒ &man.cp.4; ÔÅÐÅÒØ MPSAFE. &merged; + + äÒÁÊ×ÅÒ &man.ctau.4; ÔÅÐÅÒØ MPSAFE. &merged; + + äÒÁÊ×ÅÒ &man.cx.4; ÔÅÐÅÒØ MPSAFE. &merged; + + äÒÁÊ×ÅÒ &man.dc.4; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÉÎÆÒÁÓÔÒÕËÔÕÒÕ + &man.altq.4;. + + äÒÁÊ×ÅÒ &man.ed.4; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÉÎÆÒÁÓÔÒÕËÔÕÒÕ + &man.altq.4;. &merged; + + ÷ ÄÒÁÊ×ÅÒÅ &man.em.4; ÂÙÌÁ ×ÙËÌÀÞÅÎÁ ÐÏ ÕÍÏÌÞÁÎÉÀ + ÁÐÐÁÒÁÔÎÁÑ ÐÏÄÄÅÒÖËÁ ÔÅÇÏ× VLAN, ÐÏÓËÏÌØËÕ ÜÔÁ ÆÕÎËÃÉÑ + ËÏÎÆÌÉËÔÏ×ÁÌÁ Ó promiscuous ÒÅÖÉÍÏÍ. &merged; + + ëÏÎÔÒÏÌØ ÐÏÔÏËÁ Ethernet ÏÔËÌÀÞÅÎ ÐÏ ÕÍÏÌÞÁÎÉÀ × ÄÒÁÊ×ÅÒÅ + &man.fxp.4; ÄÌÑ ÐÒÅÄÏÔ×ÒÁÝÅÎÉÑ ÐÒÏÂÌÅÍ — ÐÁÎÉËÉ ÑÄÒÁ. + &merged; + + äÒÁÊ×ÅÒ gx(4) ÂÙÌ ÕÄÁÌÅÎ, ÐÏÓËÏÌØËÕ ÏÎ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ + ÄÏÓÔÁÔÏÞÎÏ ÁËÔÉ×ÎÏ, É ÄÒÁÊ×ÅÒ &man.em.4; ÐÏÄÄÅÒÖÉ×ÁÅÔ ×ÓÅ + ÐÏÄÄÅÒÖÉ×ÁÅÍÏÅ ÉÍ ÏÂÏÒÕÄÏ×ÁÎÉÅ. + + äÒÁÊ×ÅÒ &man.hme.4; ÔÅÐÅÒØ MPSAFE. &merged; + + ëÏÎ×ÅÒÔÅÒ ÄÒÁÊ×ÅÒÏ× ÕÓÔÒÏÊÓÔ× &man.ndis.4; + ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÂÉÎÁÒÎÙÅ ÆÁÊÌÙ &windows;/x86-64 ÎÁ ÓÉÓÔÅÍÁÈ + amd64. &merged; + + äÒÁÊ×ÅÒ &man.sf.4; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ device polling É + &man.altq.4;. &merged; + + âÙÌÉ ÉÓÐÒÁ×ÌÅÎÙ ÎÅÓËÏÌØËÏ ÐÒÏÇÒÁÍÍÎÙÈ ÏÛÉÂÏË × ÄÒÁÊ×ÅÒÅ + &man.sk.4;. üÔÉ ÏÛÉÂËÉ ÐÒÏÑ×ÌÑÌÉÓØ ÎÁ SMP ÓÉÓÔÅÍÁÈ, + É ÍÏÇÌÉ ÐÒÉ×ÏÄÉÔØ Ë ÐÁÎÉËÅ, ÏÛÉÂËÁÍ page fault, ÏÂÒÙ×Õ ÓÏÅÄÉÎÅÎÉÊ + SSH ÉÌÉ ÏÛÉÂËÁÍ ÐÒÉ ÐÅÒÅÄÁÞÅ ÆÁÊÌÏ×. âÏÌÅÅ ÐÏÄÒÏÂÎÁÑ + ÉÎÆÏÒÍÁÃÉÑ ÎÁÈÏÄÉÔÓÑ × ÓÏÏÂÝÅÎÉÉ Ï ÐÒÏÂÌÅÍÅ + FreeBSD-EN-05:02.sk. + &merged; + + äÒÁÊ×ÅÒ &man.sk.4; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ &man.altq.4;. + üÔÏÔ ÄÒÁÊ×ÅÒ ÔÁËÖÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ jumbo ÆÒÅÊÍÙ ÎÁ Yukon-based + ÉÎÔÅÒÆÅÊÓÁÈ. &merged; + + äÒÁÊ×ÅÒ &man.vge.4; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ device polling + (&man.polling.4;). + + ðÏÄÄÅÒÖËÁ ÕÓÔÒÏÊÓÔ× 802.11 ÉÎÆÒÁÓÔÒÕËÔÕÒÏÊ &man.wlan.4; + ÔÝÁÔÅÌØÎÏ ÐÅÒÅÓÍÏÔÒÅÎÁ. ÷ ÄÏÐÏÌÎÅÎÉÅ Ë ÁÒÈÉÔÅËÔÕÒÎÙÍ ÉÚÍÅÎÅÎÉÑÍ, + ÒÅÁÌÉÚÏ×ÁÎÁ ÐÏÌÎÁÑ ÐÏÄÄÅÒÖËÁ 802.11g, WPA, 802.11i, 802.1x, + WME/WMM, AP-side power-saving, É ÉÎÆÒÁÓÔÒÕËÔÕÒÁ ÐÌÁÇÉÎÏ× ÄÌÑ + ËÒÉÐÔÏÇÒÁÆÉÞÅÓËÉÈ ÍÏÄÕÌÅÊ, ÁÕÔÅÎÔÉÆÉËÁÔÏÒÏ× É ËÏÎÔÒÏÌÑ ÄÏÓÔÕÐÁ. + ïÂÒÁÔÉÔÅ ×ÎÉÍÁÎÉÅ, ÞÔÏ ÄÌÑ WEP, × ÞÁÓÔÎÏÓÔÉ, ÎÅÏÂÈÏÄÉÍÁ ÚÁÇÒÕÚËÁ + (ÉÌÉ ËÏÍÐÉÌÑÃÉÑ) ÍÏÄÕÌÑ wlan_wep + × ÑÄÒÏ. + óÅÔÅ×ÙÅ ÐÒÏÔÏËÏÌÙ - + MTU feedback × IPv6 ×ÙËÌÀÞÁÅÔÓÑ ÐÒÉ ÏÔÐÒÁ×ËÅ ÄÁÎÎÙÈ, + ËÏÔÏÒÙÅ ÄÏÌÖÎÙ ÂÙÔØ ÆÒÁÇÍÅÎÔÉÒÏ×ÁÎÙ. &merged; + + âÙÌ ÒÅÁÌÉÚÏ×ÁÎ Common Address Redundancy Protocol (CARP). + CARP ÂÙÌ ×ÚÑÔ ÉÚ OpenBSD É ÐÏÚ×ÏÌÑÅÔ ÎÅÓËÏÌØËÉÍ ÈÏÓÔÁÍ + ÓÏ×ÍÅÓÔÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÏÄÉÎ IP ÁÄÒÅÓ, ÞÔÏÂÙ ÏÂÅÓÐÅÞÉ×ÁÔØ + ×ÙÓÏËÕÀ ÄÏÓÔÕÐÎÏÓÔØ É ÒÁÓÐÒÅÄÅÌÅÎÉÅ ÎÁÇÒÕÚËÉ. + úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ Ë ÓÔÒÁÎÉÃÅ ÓÐÒÁ×ÏÞÎÉË + &man.carp.4;. + + ðÁÒÁÍÅÔÒ &man.ipfw.4; IPDIVERT ÔÅÐÅÒØ + ÄÏÓÔÕÐÅÎ × ×ÉÄÅ ÚÁÇÒÕÖÁÅÍÏÇÏ ÍÏÄÕÌÑ ÑÄÒÁ. åÓÌÉ ÜÔÏÔ ÍÏÄÕÌØ + ÎÅ ÚÁÇÒÕÖÅÎ, &man.ipfw.4; ÎÅ ÂÕÄÅÔ ÚÁÇÒÕÖÁÔØ ÐÒÁ×ÉÌÁ + divert É &man.natd.8; ÂÕÄÅÔ ×ÏÚ×ÒÁÝÁÔØ + ÓÏÏÂÝÅÎÉÅ Ï ÏÛÉÂËÅ protocol not supported. + + óÉÓÔÅÍÁ &man.ipfw.4; ÍÏÖÅÔ ÒÁÂÏÔÁÔØ Ó + debug.mpsafenet=1 + (ÜÔÁ ÐÅÒÅÍÅÎÎÁÑ ÒÁ×ÎÁ 1 ÐÏ ÕÍÏÌÞÁÎÉÀ) + ËÏÇÄÁ ÉÓÐÏÌØÚÕÀÔÓÑ ÐÁÒÁÍÅÔÒÙ ÐÒÁ×ÉÌ gid, + jail, É/ÉÌÉ uid. &merged; + + &man.ipfw.8; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ËÌÁÓÓÉÆÉËÁÃÉÀ É ÔÅÇÉ + ÐÁËÅÔÏ× &man.altq.4; ÞÅÒÅÚ divert ÓÏËÅÔ, Á ÔÁËÖÅ + TCP data length. + + ðÒÁ×ÉÌÏ &man.ipfw.8; ipfw fwd ÔÅÐÅÒØ + ÐÏÄÄÅÒÖÉ×ÁÅÔ ÐÏÌÎÏÅ ÕÐÒÁ×ÌÅÎÉÅ ÎÁÚÎÁÞÅÎÉÅÍ ÐÁËÅÔÁ ÐÒÉ + ÕÓÔÁÎÏ×ËÅ ÐÁÒÁÍÅÔÒÁ ÑÄÒÁ + options IPFIREWALL_FORWARD_EXTENDED × ÄÏÐÏÌÎÅÎÉÅ + Ë ÐÁÒÁÍÅÔÒÕ options IPFIRWALL_FORWARD. + üÔÏÔ ÐÁÒÁÍÅÔÒ ÑÄÒÁ ÕÓÔÒÁÎÑÅÔ ×ÓÅ ÏÇÒÁÎÉÞÅÎÉÑ ÄÌÑ ÌÏËÁÌØÎÏ ÓÏÚÄÁÎÎÙÈ + ÐÁËÅÔÏ× É ÐÏÚ×ÏÌÑÅÔ ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ ÐÁËÅÔÏ×, ÐÒÅÄÎÁÚÎÁÞÅÎÎÙÈ ÄÌÑ + ÌÏËÁÌØÎÏ ÓËÏÎÆÉÇÕÒÉÒÏ×ÁÎÎÏÇÏ IP ÁÄÒÅÓÁ. + ïÂÒÁÔÉÔÅ ×ÎÉÍÁÎÉÅ, ÞÔÏ ÐÒÁ×ÉÌÁ &man.ipfw.8; ÄÏÌÖÎÙ ÂÙÔØ ÓÏÓÔÁ×ÌÅÎÙ + ÁËËÕÒÁÔÎÏ, ÞÔÏÂÙ, ÎÁÐÒÉÍÅÒ, ÎÅ ÎÁÒÕÛÉÔØ ÏÐÒÅÄÅÌÅÎÉÅ PMTU. + &merged; + + &man.ipnat.8; ÔÅÐÅÒØ ÐÏÚ×ÏÌÑÅÔ ÏÐÒÅÄÅÌÑÔØ ÐÒÁ×ÉÌÁ + ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÑ ÄÌÑ ÎÅ-TCP/UDP ÐÁËÅÔÏ×. &merged; + + ðÒÏÄÏÌÖÁÅÔÓÑ ÒÁÂÏÔÁ ÐÏ ÕÍÅÎØÛÅÎÉÀ ÉÓÐÏÌØÚÏ×ÁÎÉÑ + Giant ÂÌÏËÉÒÏ×ËÉ ÓÔÅËÏÍ ÓÅÔÅ×ÙÈ ÐÒÏÔÏËÏÌÏ× É ÕÌÕÞÛÅÎÉÀ + ÓÔÒÁÔÅÇÉÉ ÂÌÏËÉÒÏ×ËÉ. + + îÏ×ÙÊ ÕÚÅÌ NetGraph &man.ng.ipfw.4; ÐÒÅÄÏÓÔÁ×ÌÑÅÔ + ÐÒÏÓÔÏÊ ÉÎÔÅÒÆÅÊÓ ÍÅÖÄÕ &man.ipfw.4; É &man.netgraph.4;. + + îÏ×ÙÊ ÕÚÅÌ NetGraph &man.ng.netflow.4; ÐÏÚ×ÏÌÑÅÔ + ÍÁÒÛÒÕÔÉÚÁÔÏÒÕ, ÒÁÂÏÔÁÀÝÅÍÕ ÐÏÄ &os;, ×ÙÐÏÌÎÑÔØ ÜËÓÐÏÒÔ + NetFlow ×ÅÒÓÉÉ 5. &merged; + + äÒÁÊ×ÅÒ &man.sppp.4; ÔÅÐÅÒØ ×ËÌÀÞÁÅÔ ÐÏÄÄÅÒÖËÕ Frame Relay + &merged; + + äÒÁÊ×ÅÒ &man.sppp.4; ÔÅÐÅÒØ MPSAFE. + + âÙÌÁ ÉÓÐÒÁ×ÌÅÎÁ ÏÛÉÂËÁ TCP, ËÏÔÏÒÁÑ ÉÎÏÇÄÁ ÐÒÉ×ÏÄÉÌÁ Ë + ÉÇÎÏÒÉÒÏ×ÁÎÉÀ ÐÁËÅÔÏ× RST ÐÒÉ ÏËÎÅ ÐÒÉÅÍÁ × ÎÏÌØ ÂÁÊÔ. + &merged; + + ïÂÒÁÂÏÔËÁ RST × ÓÔÅËÅ + TCP &os; ÂÙÌÁ ÕÌÕÞÛÅÎÁ, ÞÔÏÂÙ ÍÁËÓÉÍÁÌØÎÏ ÕÓÌÏÖÎÉÔØ + ÐÒÏ×ÅÄÅÎÉÅ reset ÁÔÁË ÐÒÉ ÓÏÈÒÁÎÅÎÉÉ ÓÏ×ÍÅÓÔÉÍÏÓÔÉ Ó + ÛÉÒÏÞÁÊÛÉÍ ÎÁÂÏÒÏÍ TCP ÓÔÅËÏ×. áÌÇÏÒÉÔÍ ÒÁÂÏÔÁÅÔ ÓÌÅÄÕÀÝÉÍ + ÏÂÒÁÚÏÍ: äÌÑ ÓÏÅÄÉÎÅÎÉÊ × ÓÏÓÔÏÑÎÉÉ ESTABLISHED + ÔÏÌØËÏ ÓÂÒÏÓ Ó ÎÏÍÅÒÁÍÉ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÉ, ÔÏÞÎÏ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÍÉ + last_ack_sent ×ÙÚÏ×ÕÔ ÓÂÒÏÓ: ×ÓÅ + ÄÒÕÇÉÅ ÓÅÇÍÅÎÔÙ ÂÕÄÕÔ ÏÔÂÒÏÛÅÎÙ. äÌÑ ÓÏÅÄÉÎÅÎÉÊ × + ÌÀÂÙÈ ÄÒÕÇÉÈ ÓÏÓÔÏÑÎÉÑÈ, ÓÂÒÏÓ × ÌÀÂÏÍ ÍÅÓÔÅ ÏËÎÁ ÐÒÉ×ÅÄÅÔ + Ë ÓÂÒÏÓÕ ÓÏÅÄÉÎÅÎÉÑ. ÷ÓÅ ÄÒÕÇÉÅ ÓÅÇÍÅÎÔÙ ÂÕÄÕÔ ÏÔÂÒÏÛÅÎÙ. + ïÂÒÁÔÉÔÅ ×ÎÉÍÁÎÉÅ, ÞÔÏ ÜÔÏ ÎÁÒÕÛÁÅÔ ÓÐÅÃÉÆÉËÁÃÉÀ + RFC 793: ×Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÏÂÙÞÎÏÅ (ÎÏ ÍÅÎÅÅ ÂÅÚÏÐÁÓÎÏÅ) + ÐÏ×ÅÄÅÎÉÅ, ÕÓÔÁÎÏ×É× ÎÏ×ÕÀ ÐÅÒÅÍÅÎÎÕÀ sysctl + net.inet.tcp.insecure_rst × + 1. &merged; + + âÙÌÉ ÉÓÐÒÁ×ÌÅÎÙ ÎÅÓËÏÌØËÏ ÏÛÉÂÏË × ÒÅÁÌÉÚÁÃÉÉ TCP + SACK. &merged; + + ðÏÄÄÅÒÖËÁ RFC 1644 T/TCP ÂÙÌÁ ÕÄÁÌÅÎÁ. òÅÁÌÉÚÁÃÉÑ ÂÙÌÁ + ÏÓÎÏ×ÁÎÁ ÎÁ ÎÅÐÏÌÎÏÃÅÎÎÏÊ ÍÏÄÅÌÉ ÂÅÚÏÐÁÓÎÏÓÔÉ, ÞÔÏ ÏÂÌÅÇÞÁÌÏ + ÐÒÏ×ÅÄÅÎÉÅ DoS ÁÔÁË. üÔÏ ÒÁÓÛÉÒÅÎÉÅ ÂÙÌÏ ÐÒÉÚÎÁÎÏ + ÄÅÆÅËÔÉ×ÎÙÍ × ÏÄÎÏÍ ÉÚ ÐÏÓÌÅÄÎÉÈ ÄÏËÕÍÅÎÔÏ× + Internet Draft. + + òÅÁÌÉÚÁÃÉÑ KAME IPv4 IPsec, ÉÎÔÅÇÒÉÒÏ×ÁÎÎÁÑ × + &os;, ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ TCP-MD5. &merged; + + áÌÇÏÒÉÔÍ Random ephemeral port number allocation + ÐÒÉ×ÏÄÉÌ Ë ÎÅËÏÔÏÒÙÍ ÐÒÏÂÌÅÍÁÍ Ó ÐÏ×ÔÏÒÎÙÍ ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ + ÐÏÒÔÏ× ÐÒÉ ×ÙÓÏËÏÊ ÞÁÓÔÏÔÅ ÎÏ×ÙÈ ÐÏÄËÌÀÞÅÎÉÊ. ôÅÐÅÒØ + × ÐÅÒÉÏÄÙ, ËÏÇÄÁ ÎÏ×ÙÅ ÓÏÅÄÉÎÅÎÉÑ ÓÏÚÄÁÀÔÓÑ ÂÙÓÔÒÅÅ, ÞÅÍ + net.inet.ip.portrange.randomcps × ÓÅËÕÎÄÕ, + ÒÁÎÄÏÍÉÚÁÃÉÑ ÎÏÍÅÒÏ× ÐÏÒÔÏ× ÏÔËÌÀÞÁÅÔÓÑ ÎÁ ÓÌÅÄÕÀÝÉÅ + net.inet.ip.portrange.randomtime ÓÅËÕÎÄ. + úÎÁÞÅÎÉÑ ÐÏ ÕÍÏÌÞÁÎÉÀ ÜÔÉÈ Ä×ÕÈ ÐÅÒÅÍÅÎÎÙÈ sysctl ÒÁ×ÎÙ + 10 É 45 ÓÏÏÔ×ÅÔÓÔ×ÅÎÎÏ. + &merged; + + Fine-grained ÂÌÏËÉÒÏ×ËÁ ÂÙÌÁ ÐÒÉÍÅÎÅÎÁ ËÏ ÍÎÏÇÉÍ ÓÔÒÕËÔÕÒÁÍ + ÄÁÎÎÙÈ × ÓÔÅËÅ ÐÒÏÔÏËÏÌÏ× IPX/SPX. èÏÔÑ ÐÒÏÔÏËÏÌ É ÎÅ ÐÏÌÎÏÓÔØÀ + MPSAFE ÎÁ ÄÁÎÎÙÊ ÍÏÍÅÎÔ, ËÁË ÐÒÁ×ÉÌÏ ÍÏÖÎÏ ÂÅÚÏÐÁÓÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ + IPX/SPX ÂÅÚ Giant ÂÌÏËÉÒÏ×ËÉ (ÄÒÕÇÉÍÉ ÓÌÏ×ÁÍÉ, ÐÅÒÅÍÅÎÎÁÑ + sysctl debug.mpsafenet ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎÁ + × 1). - äÉÓËÉ É ÈÒÁÎÅÎÉÅ + äÉÓËÉ É ÕÓÔÒÏÊÓÔ×Á ÈÒÁÎÅÎÉÑ + + äÒÁÊ×ÅÒ &man.amr.4; ÔÅÐÅÒØ ÍÏÖÅÔ ÂÅÚÏÐÁÓÎÏ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ + ÎÁ ÓÉÓÔÅÍÁÈ Ó &man.pae.4;. &merged; + + âÙÌ ÄÏÂÁ×ÌÅÎ ËÌÁÓÓ SHSEC GEOM. ïÎ ÐÒÅÄÏÓÔÁ×ÌÅÎ ÄÌÑ + ÒÁÚÄÅÌÅÎÉÑ ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ (secret) + ÍÅÖÄÕ ÎÅÓËÏÌØËÉÍÉ ÐÒÏ×ÁÊÄÅÒÁÍÉ GEOM. ÷ÓÅ ÜÔÉ ÐÒÏ×ÁÊÄÅÒÙ + ÄÏÌÖÎÙ ÐÒÉÓÕÔÓÔ×Ï×ÁÔØ, ÞÔÏÂÙ ÐÏÌÕÞÉÔØ ÓÅËÒÅÔÎÙÊ ËÌÀÞ. + üÔÁ ÆÕÎËÃÉÑ ËÏÎÔÒÏÌÉÒÕÅÔÓÑ ÕÔÉÌÉÔÏÊ &man.gshsec.8;. + &merged; + + âÙÌ ÄÏÂÁ×ÌÅÎ ÄÒÁÊ×ÅÒ &man.hptmv.4;, ÐÏÄÄÅÒÖÉ×ÁÀÝÉÊ + HighPoint RocketRAID 182x series. &merged; + + äÒÁÊ×ÅÒ &man.ips.4; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÄÁÍÐÙ ÑÄÒÁ ÎÁ + ÎÅËÏÔÏÒÙÈ ÓÏ×ÒÅÍÅÎÎÙÈ ÍÏÄÅÌÑÈ ServeRAID. &merged; + + âÙÌ ÕÄÁÌÅÎ ÄÒÁÊ×ÅÒ &man.matcd.4;. &merged; + + ðÒÉ ÚÁÇÒÕÚËÅ ÚÁÄÅÒÖËÁ ÐÏ ÕÍÏÌÞÁÎÉÀ ÄÌÑ SCSI × ÑÄÒÅ + GENERIC ÂÙÌÁ ÕÍÅÎØÛÅÎÁ Ó ÐÑÔÎÁÄÃÁÔÉ + ÓÅËÕÎÄ ÄÏ ÐÑÔÉ ÓÅËÕÎÄ. + + óÔÁÒÁÑ ÐÏÄÓÉÓÔÅÍÁ vinum(4) ÂÙÌÁ ÕÄÁÌÅÎÁ × ÐÏÌØÚÕ ÎÏ×ÏÊ, + ÏÓÎÏ×ÁÎÎÏÊ ÎÁ &man.geom.4; ×ÅÒÓÉÉ. + + äÒÁÊ×ÅÒ &man.wd.4; ÂÙÌ ÕÄÁÌÅÎ. âÙÌÏ ÏÂÎÁÒÕÖÅÎÏ, + ÞÔÏ ÄÒÁÊ×ÅÒ &man.ata.4; ÒÁÂÏÔÁÅÔ ÄÏÓÔÁÔÏÞÎÏ ÈÏÒÏÛÏ ÎÁ ÐÌÁÔÆÏÒÍÅ + pc98 É ÎÅÔ ÎÅÏÂÈÏÄÉÍÏÓÔÉ × ÉÓÐÏÌØÚÏ×ÁÎÉÉ ÓÔÁÒÏÇÏ ÄÒÁÊ×ÅÒÁ + &man.wd.4;. - + éÎÆÏÒÍÁÃÉÑ Ï ×ÎÏ×Ø ÓÍÏÎÔÉÒÏ×ÁÎÎÙÈ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍÁÈ cd9660 + (ÎÁÐÒÉÍÅÒ, ÉÎÆÏÒÍÁÃÉÑ Ï ÎÁÌÉÞÉÉ ÒÁÓÛÉÒÅÎÉÊ Rockridge) ÔÅÐÅÒØ + ÐÅÞÁÔÁÅÔÓÑ ÔÏÌØËÏ ÅÓÌÉ ÑÄÒÏ ÂÙÌÏ ÓÏÂÒÁÎÏ × ÒÅÖÉÍÅ verbose. + üÔÏ ÉÚÍÅÎÅÎÉÅ ÂÙÌÏ ÓÄÅÌÁÎÏ ÄÌÑ ÕÍÅÎØÛÅÎÉÑ ËÏÌÉÞÅÓÔ×Á + (ÚÁÞÁÓÔÕÀ ÎÅÎÕÖÎÙÈ) ÐÒÏÔÏËÏÌÉÒÕÅÍÙÈ ÓÏÏÂÝÅÎÉÊ ÑÄÒÁ. &merged; @@ -173,52 +589,477 @@ âÙÌÁ ÄÏÂÁ×ÌÅÎÁ ÆÁÊÌÏ×ÁÑ ÓÉÓÔÅÍÁ autofs(9) É ÂÉÂÌÉÏÔÅËÁ ÐÏÌØÚÏ×ÁÔÅÌÑ &man.libautofs.3;. + + ÷ÙÞÉÓÌÅÎÉÅ ÓÕÍÍÁÒÎÏÊ ÉÎÆÏÒÍÁÃÉÉ ÄÌÑ ÎÅ ÒÁÚÍÏÎÔÉÒÏ×ÁÎÎÙÈ + ËÏÒÒÅËÔÎÏ (dirty) ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ UFS É UFS2 + ÂÏÌØÛÅ ÎÅ ×ÙÐÏÌÎÑÅÔÓÑ ×Ï ×ÒÅÍÑ ÚÁÇÒÕÚËÉ, Á ÄÅÌÁÅÔÓÑ ÆÏÎÏ×ÙÍ + &man.fsck.8;. üÔÏ ÉÚÍÅÎÅÎÉÅ Õ×ÅÌÉÞÉ×ÁÅÔ ÓËÏÒÏÓÔØ ÚÁÇÒÕÚËÉ ÐÒÉ + ÍÏÎÔÉÒÏ×ÁÎÉÉ ÂÏÌØÛÉÈ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ ÐÏÓÌÅ ÓÂÏÑ. ðÒÅÄÙÄÕÝÅÅ + ÐÏ×ÅÄÅÎÉÅ ÍÏÖÅÔ ÂÙÔØ ×ÏÓÓÔÁÎÏ×ÌÅÎÏ ÕÓÔÁÎÏ×ËÏÊ ÐÅÒÅÍÅÎÎÏÊ sysctl + vfs.ffs.compute_summary_at_mount + × ÎÅÎÕÌÅ×ÏÅ ÚÎÁÞÅÎÉÅ. &merged; + + âÙÌÁ ÉÓÐÒÁ×ÌÅÎÁ ÏÛÉÂËÁ NFS ÓÅÒ×ÅÒÁ, ÐÒÉ×ÏÄÉ×ÛÁÑ Ë ÐÁÎÉËÅ ÑÄÒÁ. + âÏÌÅÅ ÐÏÄÒÏÂÎÁÑ ÉÎÆÏÒÍÁÃÉÑ ÎÁÈÏÄÉÔÓÑ × ÓÏÏÂÝÅÎÉÉ Ï ÐÒÏÂÌÅÍÅ + FreeBSD-EN-05:01.nfs. + &merged; + óÔÏÒÏÎÎÅÅ ÐÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ - + ACPI-CA ÂÙÌ ÏÂÎÏ×ÌÅÎ Ó + 20040527 ÄÏ 20041119. &merged; + éÚÍÅÎÅÎÉÑ × ÐÒÏÇÒÁÍÍÁÈ ÐÏÌØÚÏ×ÁÔÅÌÑ + õÔÉÌÉÔÁ &man.burncd.8; ÔÅÐÅÒØ ÐÏÚ×ÏÌÑÅÔ ÚÁÄÁÎÉÅ ËÏÍÁÎÄ, + (ÔÁËÉÈ ËÁË eject), ×ÙÐÏÌÎÑÅÍÙÈ ÐÏÓÌÅ + ×ÙÐÏÌÎÅÎÉÑ ËÏÍÁÎÄÙ fixate. + + ðÒÏÇÒÁÍÍÁ &man.ftpd.8; ÔÅÐÅÒØ ËÏÒÒÅËÔÎÏ ÉÓÐÏÌØÚÕÅÔ ËÏÄÙ + ÓÔÁÔÕÓÁ 212 É 213 + ÄÌÑ ËÁÔÁÌÏÇÁ É ÆÁÊÌÁ (× ÐÒÅÄÙÄÕÝÅÊ ×ÅÒÓÉÉ ÉÓÐÏÌØÚÏ×ÁÌÓÑ + ËÏÄ 211). üÔÏ ÐÏ×ÅÄÅÎÉÅ ÏÐÉÓÁÎÏ × + RFC 959. &merged; + + ëÏÍÁÎÄÁ create ÕÔÉÌÉÔÙ &man.gpt.8; + ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÐÁÒÁÍÅÔÒ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ + ÄÌÑ ÆÏÒÓÉÒÏ×ÁÎÉÑ ÓÏÚÄÁÎÉÑ GPT ÄÁÖÅ ÅÓÌÉ ÎÁ ÄÉÓËÅ ÐÒÉÓÕÔÓÔ×ÕÅÔ + ÚÁÐÉÓØ MBR. &merged; + + æÕÎËÃÉÑ &man.getaddrinfo.3; ÔÅÐÅÒØ ÚÁÐÒÁÛÉ×ÁÅÔ + ÚÁÐÉÓÉ DNS A ÐÅÒÅÄ ÚÁÐÉÓÑÍÉ AAAA, + ËÏÇÄÁ ÕËÁÚÁÎ AF_UNSPEC. îÅËÏÔÏÒÙÅ + DNS ÓÅÒ×ÅÒÙ ÎÅËÏÒÒÅËÔÎÏ ×ÏÚ×ÒÁÝÁÀÔ NXDOMAIN + × ÏÔ×ÅÔ ÎÁ ÚÁÐÒÏÓ ÎÅÓÕÝÅÓÔ×ÕÀÝÅÊ ÚÁÐÉÓÉ AAAA, + ÈÏÔÑ ÄÏÌÖÎÙ ×ÏÚ×ÒÁÝÁÔØ NOERROR Ó ÐÕÓÔÏÊ + ÚÁÐÉÓØÀ. üÔÏ ÐÒÏÂÌÅÍÁ ÄÌÑ Ä×ÏÊÎÏÇÏ IPv4/IPv6 ÓÔÅËÁ, ÐÏÓËÏÌØËÕ + ÐÏÓÌÅ ×ÏÚ×ÒÁÔÁ NXDOMAIN ÎÁ ÚÁÐÒÏÓ + AAAA ÐÒÉ×ÏÄÉÔ Ë ÔÏÍÕ, ÞÔÏ ÚÁÐÒÁÛÉ×ÁÀÝÉÊ ÓÅÒ×ÅÒ + ÎÅ ÐÙÔÁÅÔÓÑ ÒÁÚÒÅÛÉÔØ ÚÁÐÉÓØ A. ëÒÏÍÅ ÔÏÇÏ, + ÔÁËÏÅ ÐÏ×ÅÄÅÎÉÅ ÐÏÔÅÎÃÉÁÌØÎÏ ÍÏÖÅÔ ÐÒÉ×ÅÓÔÉ Ë DoS ÁÔÁËÅ + (ÓÍ. + Ó ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÅÊ). + ïÂÒÁÔÉÔÅ ×ÎÉÍÁÎÉÅ, ÞÔÏ ÈÏÔÑ ÐÏÒÑÄÏË ÚÁÐÒÏÓÁ ÂÙÌ ÉÚÍÅÎÅÎ, ×ÏÚ×ÒÁÝÁÅÍÙÊ + ÒÅÚÕÌØÔÁÔ ×ÓÅ ÅÝÅ ×ËÌÀÞÁÅÔ ÚÁÐÉÓØ AF_INET6 + ÐÅÒÅÄ ÚÁÐÉÓØÀ AF_INET. &merged; + + õÔÉÌÉÔÁ gvinum(8) ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÓÕÂËÏÍÁÎÄÙ + checkparity, + rebuildparity É + setstate. &merged; + + õÔÉÌÉÔÁ &man.ifconfig.8; ÂÙÌÁ ÒÅËÏÎÓÔÒÕÉÒÏ×ÁÎÁ. ôÅÐÅÒØ ÏÎÁ + ÍÏÄÕÌØÎÁÑ É ÇÉÂËÁÑ, ÕÄÅÌÅÎÏ ×ÎÉÍÁÎÉÅ ÐÏÄÄÅÒÖËÉ ÓÐÅÃÉÆÉÞÎÏÊ + ÄÌÑ ÏÔÄÅÌØÎÙÈ ÉÎÔÅÒÆÅÊÓÏ× ÆÕÎËÃÉÏÎÁÌØÎÏÓÔÉ. ðÏÄÄÅÒÖËÁ 802.11 + ÂÙÌÁ ÏÂÎÏ×ÌÅÎÁ Ó ÕÞÅÔÏÍ ÐÏÓÌÅÄÎÉÈ ÉÚÍÅÎÅÎÉÊ × ÐÏÄÓÉÓÔÅÍÅ É + ÄÒÁÊ×ÅÒÁÈ 802.11. + + ðÏÄÄÅÒÖËÁ ÓÏËÒÁÝÅÎÎÙÈ ÆÏÒÍ ÎÅÓËÏÌØËÉÈ ÐÁÒÁÍÅÔÒÏ× &man.ipfw.8; + ÂÙÌÁ ÉÓËÌÀÞÅÎÁ ÉÚ ÞÉÓÌÅ ÒÅËÏÍÅÎÄÏ×ÁÎÎÙÈ. ðÒÉ ÏÂÎÁÒÕÖÅÎÉÉ ÏÄÎÏÇÏ + ÉÚ ÔÁËÉÈ ÓÏËÒÁÝÅÎÉÊ, ÎÁ stderr ÐÅÞÁÔÁÅÔÓÑ ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ, ÓÏÄÅÒÖÁÝÅÅ + ËÏÒÒÅËÔÎÕÀ ÐÏÌÎÕÀ ÆÏÒÍÕ. + + äÉÓËÏ×ÙÊ ÆÏÒÍÁÔ ÆÁÊÌÏ× LC_CTYPE ÂÙÌ ÉÚÍÅÎÅÎ + Ë ÍÁÛÉÎÏ-ÎÅÚÁ×ÉÓÉÍÏÍÕ ×ÉÄÕ. + + âÉÂÌÉÏÔÅËÁ libarchive (ËÁË É ËÏÍÁÎÄÁ + &man.tar.1;, ÅÅ ÉÓÐÏÌØÚÕÀÝÁÑ) ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÞÔÅÎÉÅ ÏÂÒÁÚÏ× + ISO (Ó ÏÐÃÉÏÎÁÌØÎÙÍ ÒÁÓÛÉÒÅÎÉÅÍ RockRidge) É ÁÒÈÉ×Ï× ZIP + (ÓÏ ÓÖÁÔÉÅÍ deflate É none). + &merged; + + âÙÌÁ ÄÏÂÁ×ÌÅÎÁ ÂÉÂÌÉÏÔÅËÁ libgpib, + ÞÔÏÂÙ ÐÒÅÄÏÓÔÁ×ÉÔØ ÄÏÓÔÕÐ ÕÒÏ×ÎÑ ÐÏÌØÚÏ×ÁÔÅÌÑ Ë ÕÓÔÒÏÊÓÔ×ÁÍ + GPIB (ÉÓÐÏÌØÚÕÑ ÄÒÁÊ×ÅÒ pcii) ÞÅÒÅÚ + ibfoo + API &merged;. + + òÁÚÍÅÒ ÓÔÅËÁ ÐÏ ÕÍÏÌÞÁÎÉÀ × libpthread + É libc_r ÂÙÌ Õ×ÅÌÉÞÅÎ. îÁ 32-ÂÉÔÎÙÈ + ÐÌÁÔÆÏÒÍÁÈ, ÏÓÎÏ×ÎÏÊ ÐÏÔÏË ÐÏÌÕÞÁÅÔ 2MB ÓÔÅË ÐÏ ÕÍÏÌÞÁÎÉÀ, + Á ÏÓÔÁÌØÎÙÅ ÐÏÔÏËÉ ÐÏÌÕÞÁÀÔ 1MB ÓÔÅË ÐÏ ÕÍÏÌÞÁÎÉÀ. îÁ + 64-ÂÉÔÎÙÈ ÐÌÁÔÆÏÒÍÁÈ, ÒÁÚÍÅÒ ÓÔÅËÁ ÐÏ ÕÍÏÌÞÁÎÉÀ 4MB É 2MB + ÓÏÏÔ×ÅÔÓÔ×ÅÎÎÏ. + + âÉÂÌÉÏÔÅËÁ libxpg4 ÂÙÌÁ ÕÄÁÌÅÎÁ, + ÐÏÓËÏÌØËÕ ×ÓÑ ÅÅ ÆÕÎËÃÉÏÎÁÌØÎÏÓÔØ ÂÙÌÁ ÄÁ×ÎÏ ×ÎÅÓÅÎÁ × + libc. + ÷ÓÅ ÂÉÎÁÒÎÙÅ ÆÁÊÌÙ, ÓÌÉÎËÏ×ÁÎÎÙÅ Ó libxpg4, + ÄÏÌÖÎÙ ÂÙÔØ ÐÅÒÅËÏÍÐÉÌÉÒÏ×ÁÎÙ, ÉÌÉ ÎÅÏÂÈÏÄÉÍÏ ÉÓÐÏÌØÚÏ×ÁÔØ + &man.libmap.conf.5;. ÷ ÂÁÚÏ×ÏÊ ÓÉÓÔÅÍÅ &os; ÔÁËÉÈ ÂÉÎÁÒÎÙÈ ÆÁÊÌÏ× + ÎÅÔ. + + ðÒÏÇÒÁÍÍÁ &man.lpd.8; ÔÅÐÅÒØ ÕÂÅÖÄÁÅÔÓÑ, ÞÔÏ ÆÁÊÌ ÄÁÎÎÙÈ ÐÅÒÅÄÁÎ + ÐÏÌÎÏÓÔØÀ ÐÅÒÅÄ ÎÁÞÁÌÏÍ ÐÅÞÁÔÉ, ÅÓÌÉ ÏÎ ÐÅÒÅÄÁÅÔÓÑ Ó ËÁËÏÇÏ-ÌÉÂÏ + ÄÒÕÇÏÇÏ ÈÏÓÔÁ. îÅËÏÔÏÒÙÅ ÒÅÁÌÉÚÁÃÉÉ &man.lpr.1; ÏÔÐÒÁ×ÌÑÀÔ + ËÏÎÔÒÏÌØÎÙÊ ÆÁÊÌ ÄÌÑ ÚÁÄÁÎÉÑ ÐÅÞÁÔÉ ÐÅÒÅÄ ÏÔÐÒÁ×ËÏÊ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÈ + ÆÁÊÌÏ× ÄÁÎÎÙÈ, ÞÔÏ ÍÏÖÅÔ ×ÙÚ×ÁÔØ ÐÒÏÂÌÅÍÙ, ÅÓÌÉ ÐÏÌÕÞÁÀÝÉÊ ÈÏÓÔ + ÜÔÏ ÎÁÇÒÕÖÅÎÎÙÊ ÐÒÉÎÔ ÓÅÒ×ÅÒ. &merged; + + ÷ ÂÉÂÌÉÏÔÅËÅ &man.math.3; ÂÙÌÏ ÒÅÁÌÉÚÏ×ÁÎÏ ÍÎÏÖÅÓÔ×Ï ÎÏ×ÙÈ + ÆÕÎËÃÉÊ. ÷ ÉÈ ÞÉÓÌÏ ×ÈÏÄÑÔ &man.ceill.3;, + &man.floorl.3;, &man.ilogbl.3;, &man.fma.3; É ×ÁÒÉÁÎÔÙ, + &man.lrint.3; É ×ÁÒÉÁÎÔÙ, É &man.lround.3; É + ×ÁÒÉÁÎÔÙ. &merged; + + õÔÉÌÉÔÁ &man.mknod.8; ÂÙÌÁ ÉÓËÌÀÞÅÎÁ ÉÚ ÞÉÓÌÁ ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ. + æÁÊÌÙ ÕÓÔÒÏÊÓÔ× ÕÐÒÁ×ÌÑÀÔÓÑ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÏÊ &man.devfs.5; + ÎÁÞÉÎÁÑ Ó &os; 5.0. + âÙÌÁ ÄÏÂÁ×ÌÅÎÁ ÎÅ-GPL ÕÔÉÌÉÔÁ &man.mkuzip.8;, ÄÌÑ ÓÖÁÔÉÑ ÏÂÒÁÚÏ× ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ ÐÅÒÅÄ ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ - Ó ÍÏÄÕÌÅÍ GEOM_UZIP &man.geom.4;. + Ó ÍÏÄÕÌÅÍ GEOM_UZIP &man.geom.4;. + &merged; + + äÁÅÍÏÎ &man.moused.8; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ×ÉÒÔÕÁÌØÎÕÀ + ÐÒÏËÒÕÔËÕ, ËÏÇÄÁ ÐÅÒÅÍÅÝÅÎÉÑ ÍÙÛÉ ÐÒÉ ÎÁÖÁÔÏÊ ÓÒÅÄÎÅÊ + ËÎÏÐËÅ ÉÎÔÅÒÐÒÅÔÉÒÕÀÔÓÑ ËÁË ÐÒÏËÒÕÔËÁ. üÔÁ ÆÕÎËÃÉÑ ×ËÌÀÞÁÅÔÓÑ + ÆÌÁÇÏÍ . &merged; + + äÌÑ ÄÉÎÁÍÉÞÅÓËÉÈ ÚÏÎ &man.named.8; ÂÙÌ ÄÏÂÁ×ÌÅÎ ÏÔÄÅÌØÎÙÊ + ËÁÔÁÌÏÇ, ×ÌÁÄÅÌØÃÅÍ ËÏÔÏÒÏÇÏ Ñ×ÌÑÅÔÓÑ ÐÏÌØÚÏ×ÁÔÅÌØ + bind (ÄÌÑ ÓÏÚÄÁÎÉÑ ÖÕÒÎÁÌØÎÏÇÏ ÆÁÊÌÁ ÚÏÎÙ). + âÏÌÅÅ ÐÏÄÒÏÂÎÁÑ ÉÎÆÏÒÍÁÃÉÑ ÎÁÈÏÄÉÔÓÑ × ÐÒÉÍÅÒÅ ÄÉÎÁÍÉÞÅÓËÏÊ + ÚÏÎÙ ÆÁÊÌÁ &man.named.conf.5;. &merged; + + õÔÉÌÉÔÁ &man.ncal.1; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÆÌÁÇ + ÄÌÑ ÓÏÚÄÁÎÉÑ ËÁÌÅÎÄÁÒÑ ÏÐÒÅÄÅÌÅÎÎÏÇÏ ÍÅÓÑÃÁ × ÔÅËÕÝÅÍ ÇÏÄÕ. + &merged; + + õÔÉÌÉÔÁ &man.newfs.8; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÆÌÁÇ + ÄÌÑ ÐÏÄÁ×ÌÅÎÉÑ ÓÏÚÄÁÎÉÑ ËÁÔÁÌÏÇÁ .snap + ÎÁ ÎÏ×ÙÈ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍÁÈ. üÔÁ ÆÕÎËÃÉÑ ÐÒÅÄÎÁÚÎÁÞÅÎÁ ÄÌÑ + ÉÓÐÏÌØÚÏ×ÁÎÉÑ Ó ÆÁÊÌÏ×ÙÍÉ ÓÉÓÔÅÍÁÍÉ × ÐÁÍÑÔÉ ÉÌÉ ×ÉÒÔÕÁÌØÎÙÍÉ + ÆÁÊÌÏ×ÙÍÉ ÓÉÓÔÅÍÁÍÉ, ËÏÔÏÒÙÍ ÎÅ ÔÒÅÂÕÅÔÓÑ ÐÏÄÄÅÒÖËÁ ÏÂÒÁÚÏ×. + &merged; + + õÔÉÌÉÔÁ &man.newfs.8; ÔÅÐÅÒØ ×ÙÄÁÅÔ ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ ÐÒÉ ÓÏÚÄÁÎÉÉ + ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ UFS ÉÌÉ UFS2, ËÏÔÏÒÙÅ ÎÅ ÍÏÇÕÔ ÐÏÄÄÅÒÖÉ×ÁÔØ ÏÂÒÁÚÙ. + ôÁËÁÑ ÓÉÔÕÁÃÉÑ ÍÏÖÅÔ ×ÏÚÎÉËÁÔØ × ÓÌÕÞÁÅ ÏÞÅÎØ ÂÏÌØÛÉÈ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ + Ó ÂÌÏËÁÍÉ ÍÁÌÏÇÏ ÒÁÚÍÅÒÁ. &merged; + + õÔÉÌÉÔÁ &man.newsyslog.8; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÐÁÒÁÍÅÔÒ + ÄÌÑ ÉÚÍÅÎÅÎÉÑ ËÏÒÎÅ×ÏÇÏ ËÁÔÁÌÏÇÁ ÌÏÇ ÆÁÊÌÏ× + ÐÏÄÏÂÎÏ ÐÅÒÅÍÅÎÎÏÊ DESTDIR ÄÌÑ + BSD make. üÔÁ ÐÅÒÅÍÅÎÎÁÑ ×ÌÉÑÅÔ ÔÏÌØËÏ ÎÁ ÐÕÔÉ Ë ÌÏÇ ÆÁÊÌÁÍ, + É ÎÅ ×ÌÉÑÅÔ ÎÁ ÆÁÊÌ ËÏÎÆÉÇÕÒÁÃÉÉ () + ÉÌÉ ÁÒÈÉ×ÎÙÊ ËÁÔÁÌÏÇ (). + + õÔÉÌÉÔÁ &man.newsyslog.8; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÐÁÒÁÍÅÔÒ + , ÚÁÐÒÅÝÁÀÝÉÊ ÒÏÔÁÃÉÀ ËÁËÉÈ-ÌÉÂÏ ÆÁÊÌÏ×. + + âÙÌÁ ÄÏÂÁ×ÌÅÎÁ ÐÅÒÅÍÅÎÎÁÑ ËÏÍÐÉÌÑÃÉÉ ÓÉÓÔÅÍÙ + NO_NIS. ëÁË ÓÌÅÄÕÅÔ ÉÚ ÅÅ ÉÍÅÎÉ, ×ËÌÀÞÅÎÉÅ + ÜÔÏÊ ÐÅÒÅÍÅÎÎÏÊ ÐÒÉ×ÅÄÅÔ Ë ÉÓËÌÀÞÅÎÉÀ ÐÏÄÄÅÒÖËÉ NIS ÉÚ ÒÁÚÌÉÞÎÙÈ + ÐÒÏÇÒÁÍÍ, É ÕÔÉÌÉÔÙ NIS ÎÅ ÂÕÄÕÔ ËÏÍÐÉÌÉÒÏ×ÁÔØÓÑ. &merged; + + ÷ ÔÅÞÅÎÉÅ ÍÎÏÇÉÈ ÌÅÔ, × &os; ÉÓÐÏÌØÚÏ×ÁÌÉÓØ + ÐÅÒÅÍÅÎÎÙÅ Makefile × ÆÏÒÍÁÈ + NOFOO É + NO_FOO. + ôÅÐÅÒØ ÉÓÐÏÌØÚÕÀÔÓÑ ÔÏÌØËÏ ÐÅÒÅÍÅÎÎÙÅ × ÆÏÒÍÅ + NO_FOO. + ðÏÌÎÙÊ ÓÐÉÓÏË ÔÁËÉÈ ÐÅÒÅÍÅÎÎÙÈ ÎÁÈÏÄÉÔÓÑ × ÆÁÊÌÅ + /usr/share/mk/bsd.compat.mk; × ÎÅÍ + ÔÁËÖÅ ÒÅÁÌÉÚÏ×ÁÎÁ ×ÒÅÍÅÎÎÁÑ ÏÂÒÁÔÎÁÑ ÓÏ×ÍÅÓÔÉÍÏÓÔØ ÄÌÑ + ÓÔÁÒÙÈ ÉÍÅÎ. + + ðÒÏ×ÅÒËÁ ÂÅÚÏÐÁÓÎÏÓÔÉ × &man.periodic.8; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ + ÏÔÏÂÒÁÖÅÎÉÅ ÓÞÅÔÞÉËÏ× ÐÁËÅÔÏ×, ÚÁÂÌÏËÉÒÏ×ÁÎÎÙÈ + &man.pf.4;. &merged; + + âÙÌÁ ÄÏÂÁ×ÌÅÎÁ ÐÒÏÇÒÁÍÍÁ &man.powerd.8; ÄÌÑ ÕÐÒÁ×ÌÅÎÉÑ + ÜÎÅÒÇÏÐÏÔÒÅÂÌÅÎÉÅÍ. + + ÷ ÐÒÏÇÒÁÍÍÅ &man.ppp.8; ÒÅÁÌÉÚÏ×ÁÎ ÐÁÒÁÍÅÔÒ + , ÐÏÚ×ÏÌÑÀÝÉÊ ×ËÌÀÞÁÔØ LCP ECHO + ÎÅÚÁ×ÉÓÉÍÏ ÏÔ LQR. âÏÌÅÅ ÓÔÁÒÙÅ ×ÅÒÓÉÉ &man.ppp.8; + ÐÅÒÅÈÏÄÑÔ × ÒÅÖÉÍ LCP ECHO ÅÓÌÉ ÓÏÇÌÁÓÏ×ÁÎÉÅ lqr + ÎÅ ÂÕÄÅÔ ÕÓÐÅÛÎÏ ÐÒÏ×ÅÄÅÎÏ. ôÅÐÅÒØ ÄÌÑ ÐÏÌÕÞÅÎÉÑ + ÔÁËÏÇÏ ÐÏ×ÅÄÅÎÉÑ ÎÅÏÂÈÏÄÉÍÏ ÕËÁÚÁÔØ enable + echo. &merged; + + ÷ ÐÒÏÇÒÁÍÍÕ &man.ppp.8; ÂÙÌÉ ÄÏÂÁ×ÌÅÎÙ ÐÁÒÁÍÅÔÒÙ + É + , + ÐÏÄÄÅÒÖÉ×ÁÀÝÉÅ pre-RFC 2865 RADIUS ÓÅÒ×ÅÒÙ. + + âÙÌÉ ÉÓÐÒÁ×ÌÅÎÙ Ä×Å ÏÛÉÂËÉ × ÐÒÏÇÒÁÍÍÅ &man.pppd.8;. + ïÎÉ ÍÏÇÌÉ ÐÒÉ×ÅÓÔÉ Ë ÎÅËÏÒÒÅËÔÎÏÍÕ ÏÔ×ÅÔÕ CBCP, + ÎÁÒÕÛÁÀÝÅÍÕ Microsoft PPP Callback Control Protocol + section 3.2. &merged; + + õÔÉÌÉÔÙ &man.rescue.8; × ËÁÔÁÌÏÇÅ /rescue + ÔÅÐÅÒØ ×ËÌÀÞÁÀÔ &man.bsdtar.1; ×ÍÅÓÔÏ GNU tar. + + õÔÉÌÉÔÁ &man.rm.1; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÐÁÒÁÍÅÔÒ + , Ó ËÏÔÏÒÙÍ (ÏÄÎÏËÒÁÔÎÏ) ÚÁÐÒÁÛÉ×ÁÅÔÓÑ + ÐÏÄÔ×ÅÒÖÄÅÎÉÅ ÐÒÉ ÒÅËÕÒÓÉ×ÎÏÍ ÕÄÁÌÅÎÉÉ ËÁÔÁÌÏÇÏ× ÉÌÉ + ÂÏÌÅÅ 3 ÆÁÊÌÏ×, ÐÅÒÅÞÉÓÌÅÎÎÙÈ × ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÅ. + &merged; + + õÔÉÌÉÔÁ &man.rm.1; ÔÅÐÅÒØ ÐÏÄÁ×ÌÑÅÔ ÄÉÁÇÎÏÓÔÉÞÅÓËÉÅ + ÓÏÏÂÝÅÎÉÑ ÐÒÉ ÐÏÐÙÔËÅ ÕÄÁÌÅÎÉÑ ÎÅÓÕÝÅÓÔ×ÕÀÝÅÇÏ ËÁÔÁÌÏÇÁ, + ËÏÇÄÁ ÕËÁÚÁÎÙ ÐÁÒÁÍÅÔÒÙ É + . üÔÏ ÐÏ×ÅÄÅÎÉÅ ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÄÏËÕÍÅÎÔÕ + Version 3 of the Single UNIX Specification (SUSv3). + + âÙÌÁ ÄÏÂÁ×ÌÅÎÁ ÂÉÂÌÉÏÔÅËÁ &man.rpmatch.3; ÄÌÑ ÐÒÏ×ÅÒËÉ + ÓÔÒÏËÉ, ÓÏÄÅÒÖÁÝÅÊ ÐÏÌÏÖÉÔÅÌØÎÙÊ ÉÌÉ ÏÔÒÉÃÁÔÅÌØÎÙÊ ÏÔ×ÅÔ + × ÔÅËÕÝÅÊ ÌÏËÁÌÉ. + + äÉÎÁÍÉÞÅÓËÉÊ ËÏÍÐÏÎÏ×ÝÉË &man.rtld.1; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ + ÕËÁÚÁÎÉÅ ÚÁÍÅÝÁÀÝÉÈ ÂÉÂÌÉÏÔÅË ÞÅÒÅÚ ÐÅÒÅÍÅÎÎÕÀ ÏËÒÕÖÅÎÉÑ + LD_LIBMAP. üÔÁ ÐÅÒÅÍÅÎÎÁÑ ÐÅÒÅÚÁÐÉÓÙ×ÁÅÔ + ÚÁÐÉÓÉ × &man.libmap.conf.5;. &merged; + + îÅÓÔÁÎÄÁÒÔÎÙÊ ÉÎÔÅÒÆÅÊÓ ÐÏÄÄÅÒÖËÉ ÍÕÌØÔÉÂÁÊÔÏ×ÙÈ É ÒÁÓÛÉÒÅÎÎÙÈ + ÓÉÍ×ÏÌÏ× rune(3) ÂÙÌ ÕÄÁÌÅÎ. + + æÕÎËÃÉÑ &man.strftime.3; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÎÅËÏÔÏÒÙÅ GNU + ÒÁÓÛÉÒÅÎÉÑ, ÔÁËÉÅ ËÁË - (ÂÅÚ ÚÁÐÏÌÎÅÎÉÑ), + _ (ÉÓÐÏÌØÚÏ×ÁÔØ ÐÒÏÂÅÌ ÄÌÑ ÚÁÐÏÌÎÅÎÉÑ), + É 0 (ÚÁÐÏÌÎÅÎÉÅ ÎÕÌÑÍÉ). &merged; + + æÕÎËÃÉÀ &man.syslog.3; ÔÅÐÅÒØ ÍÏÖÎÏ ÂÅÚÏÐÁÓÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ + × ÍÎÏÇÏÐÏÔÏÞÎÙÈ ÐÒÏÇÒÁÍÍÁÈ. &merged; + + õÔÉÌÉÔÁ &man.syslogd.8; ÔÅÐÅÒØ ÏÔËÒÙ×ÁÅÔ ÄÏÐÏÌÎÉÔÅÌØÎÙÊ + ÓÏËÅÔ (/var/run/logpriv ÐÏ ÕÍÏÌÞÁÎÉÀ), + Ó ÐÒÁ×ÁÍÉ 0600 ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ + ÐÒÉ×ÉÌÅÇÉÒÏ×ÁÎÎÙÍÉ ÐÒÏÇÒÁÍÍÁÍÉ. üÔÏ ÐÒÅÄÏÔ×ÒÁÝÁÅÔ ÂÌÏËÉÒÏ×ËÕ + ÐÒÉ×ÉÌÅÇÉÒÏ×ÁÎÎÙÈ ÐÒÏÇÒÁÍÍ, ËÏÇÄÁ ÂÕÆÅÒ ÓÏËÅÔÁ ÐÅÒÅÐÏÌÎÑÅÔÓÑ + ×ÓÌÅÄÓÔ×ÉÅ ÌÏËÁÌØÎÏÊ DoS ÁÔÁËÉ. &merged; + + õÔÉÌÉÔÁ &man.syslogd.8; ÔÅÐÅÒØ ÐÏÚ×ÏÌÑÅÔ ÉÓÐÏÌØÚÏ×ÁÎÉÅ + ÓÉÍ×ÏÌÏ× : É % × + ÉÍÅÎÉ ÈÏÓÔÁ. üÔÉ ÓÉÍ×ÏÌÙ ÉÓÐÏÌØÚÕÀÔÓÑ × ÁÄÒÅÓÁÈ É + scope ID IPv6. + + &man.systat.1; ÔÅÐÅÒØ ÐÒÉÓÐÏÓÏÂÌÅÎ + ÄÌÑ IPv6. &merged; + + ðÁÒÁÍÅÔÒ ÕÔÉÌÉÔÙ &man.tail.1; + ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÂÏÌÅÅ ÏÄÎÏÇÏ ÆÁÊÌÁ ÏÄÎÏ×ÒÅÍÅÎÎÏ. + &merged; + + ðÒÏÇÒÁÍÍÙ &man.telnet.1; É &man.telnetd.8; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÀÔ + ÐÁÒÁÍÅÔÒ ÄÌÑ ÕËÁÚÁÎÉÑ ÞÉÓÌÏ×ÏÇÏ TOS + ÂÁÊÔÁ. + + ðÒÅÄ×ÁÒÅÎÉÅ ÚÎÁËÏÍ + ÎÏÍÅÒÁ ÐÏÒÔÁ, + ÐÅÒÅÄÁ×ÁÅÍÏÇÏ ÐÒÏÇÒÁÍÍÅ &man.telnet.1;, ÏÔËÌÀÞÁÅÔ ÒÁÓÐÏÚÎÁ×ÁÎÉÅ + ÐÁÒÁÍÅÔÒÏ× É ÐÏÚ×ÏÌÑÅÔ ÐÅÒÅÄÁÞÕ ÓÉÍ×ÏÌÏ× Ó ÕÓÔÁÎÏ×ÌÅÎÎÙÍ ×ÅÒÈÎÉÍ + ÂÉÔÏÍ. üÔÁ ×ÏÚÍÏÖÎÏÓÔØ ÐÒÅÄÎÁÚÎÁÞÅÎÁ ÄÌÑ ÐÏÄÄÅÒÖËÉ ÛÉÒÏËÏ + ÐÒÉÍÅÎÑÅÍÏÇÏ ÉÓÐÏÌØÚÏ×ÁÎÉÑ &man.telnet.1; ÄÌÑ ÔÅÓÔÉÒÏ×ÁÎÉÑ + ÐÒÏÔÏËÏÌÁ. + + âÙÌÁ ÄÏÂÁ×ÌÅÎÁ ËÏÍÁÎÄÁ &man.tcpdrop.8;, ÚÁËÒÙ×ÁÀÝÁÑ ×ÙÂÒÁÎÎÏÅ + ÓÏÅÄÉÎÅÎÉÅ TCP. ïÎÁ ÂÙÌÁ ÚÁÉÍÓÔ×Ï×ÁÎÁ ÉÚ OpenBSD. + + &man.whois.1; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÆÌÁÇ + ÄÌÑ ÚÁÐÒÏÓÁ whois.krnic.net + (the National Internet Development Agency of Korea), + ÓÏÄÅÒÖÁÝÅÇÏ ÉÎÆÏÒÍÁÃÉÀ Ï IP ÁÄÒÅÓÁÈ × ëÏÒÅÅ. &merged; + + ðÁÒÁÍÅÔÒ ËÏÍÁÎÄÙ &man.xargs.1; ÂÙÌ ÉÚÍÅÎÅÎ + ÄÌÑ ÓÏÏÔ×ÅÔÓÔ×ÉÑ IEEE Std 1003.1-2004. óÔÁÎÄÁÒÔ ÔÒÅÂÕÅÔ, ÞÔÏÂÙ + ÓËÏÎÓÔÒÕÉÒÏ×ÁÎÎÙÅ ÁÒÇÕÍÅÎÔÙ ÎÅ ÍÏÇÌÉ ÐÒÅ×ÙÛÁÔØ 255 ÂÁÊÔ. + + âÙÌÁ ÉÓÐÒÁ×ÌÅÎÁ ÏÛÉÂËÁ ÞÔÅÎÉÑ ÆÁÊÌÏ× ËÏÎÆÉÇÕÒÁÃÉÉ, + ÔÁËÉÈ ËÁË &man.hosts.5;, &man.services.5; É ÔÁË ÄÁÌÅÅ, ËÏÔÏÒÙÅ + ÎÅ ÚÁËÁÎÞÉ×ÁÌÉÓØ ÓÉÍ×ÏÌÏÍ ÎÏ×ÏÊ ÓÔÒÏËÉ. óËÒÉÐÔÙ <filename>/etc/rc.d</filename> - + &man.rc.conf.5; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÉÚÍÅÎÅÎÉÅ ÉÍÅÎ + ÓÅÔÅ×ÙÈ ÉÎÔÅÒÆÅÊÓÏ× ×Ï ×ÒÅÍÑ ÚÁÇÒÕÚËÉ. &merged; + îÁÐÒÉÍÅÒ: + + ifconfig_fxp0_name="net0" +ifconfig_net0="inet 10.0.0.1/16" + + óËÒÉÐÔ rc.d/moused ÔÅÐÅÒØ ÍÏÖÅÔ + ×ÙÐÏÌÎÑÔØ ËÏÍÁÎÄÙ starts/stops/checks ÄÌÑ ÏÐÒÅÄÅÌÅÎÎÏÇÏ + ÕÓÔÒÏÊÓÔ×Á, ËÏÔÏÒÏÅ ÚÁÄÁÅÔÓÑ ×ÔÏÒÙÍ ÁÒÇÕÍÅÎÔÏÍ Ë + ÓËÒÉÐÔÕ: + + &prompt.root; /etc/rc.d/moused start ums0 + + äÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÒÁÚÌÉÞÎÙÈ ÐÅÒÅÍÅÎÎÙÈ &man.rc.conf.5; + Ó ÒÁÚÌÉÞÎÙÍÉ ÍÙÛÁÍÉ, ÚÁÄÁ×ÁÊÔÅ ÉÍÑ ÕÓÔÒÏÊÓÔ×Á × ËÁÞÅÓÔ×Å + ÞÁÓÔÉ ÐÅÒÅÍÅÎÎÏÊ. îÁÐÒÉÍÅÒ, ÅÓÌÉ ÕÓÔÒÏÊÓÔ×Ï ÍÙÛÉ + /dev/ums0, ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ + ÓÌÅÄÕÀÝÉÅ ÓÔÒÏËÉ: >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 16 00:44:18 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1509C16A4D0; Wed, 16 Mar 2005 00:44:18 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E518816A4CE for ; Wed, 16 Mar 2005 00:44:17 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB1D943D2F for ; Wed, 16 Mar 2005 00:44:17 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2G0iHsT013998 for ; Wed, 16 Mar 2005 00:44:17 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2G0iHZQ013995 for perforce@freebsd.org; Wed, 16 Mar 2005 00:44:17 GMT (envelope-from peter@freebsd.org) Date: Wed, 16 Mar 2005 00:44:17 GMT Message-Id: <200503160044.j2G0iHZQ013995@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 73265 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, 16 Mar 2005 00:44:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=73265 Change 73265 by peter@peter_daintree on 2005/03/16 00:43:42 integ -b i386_hammer (metadata sync) Affected files ... .. //depot/projects/hammer/sys/amd64/include/ieeefp.h#16 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/include/ieeefp.h#16 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Mar 16 07:27:17 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8039F16A4CE; Wed, 16 Mar 2005 07:27:16 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2998A16A4CE for ; Wed, 16 Mar 2005 07:27:16 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59A2D43D48 for ; Wed, 16 Mar 2005 07:27:15 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2G7RFaa045729 for ; Wed, 16 Mar 2005 07:27:15 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2G7RF6B045726 for perforce@freebsd.org; Wed, 16 Mar 2005 07:27:15 GMT (envelope-from jmg@freebsd.org) Date: Wed, 16 Mar 2005 07:27:15 GMT Message-Id: <200503160727.j2G7RF6B045726@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Subject: PERFORCE change 73280 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, 16 Mar 2005 07:27:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=73280 Change 73280 by jmg@jmg_carbon on 2005/03/16 07:26:14 hopefully bring in a fix for my vm panic.. Affected files ... .. //depot/projects/arm/src/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/arm/src/sys/amd64/include/ieeefp.h#3 integrate .. //depot/projects/arm/src/sys/arm/arm/busdma_machdep.c#5 integrate .. //depot/projects/arm/src/sys/boot/i386/Makefile.inc#2 integrate .. //depot/projects/arm/src/sys/boot/i386/boot2/Makefile#2 integrate .. //depot/projects/arm/src/sys/conf/kern.mk#2 integrate .. //depot/projects/arm/src/sys/dev/pci/pci.c#3 integrate .. //depot/projects/arm/src/sys/fs/hpfs/hpfs.h#3 integrate .. //depot/projects/arm/src/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/arm/src/sys/fs/hpfs/hpfs_vnops.c#3 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_denode.c#3 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfsmount.h#3 integrate .. //depot/projects/arm/src/sys/fs/udf/udf.h#3 integrate .. //depot/projects/arm/src/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/arm/src/sys/fs/udf/udf_vnops.c#3 integrate .. //depot/projects/arm/src/sys/gnu/ext2fs/ext2_alloc.c#3 integrate .. //depot/projects/arm/src/sys/gnu/ext2fs/ext2_inode.c#3 integrate .. //depot/projects/arm/src/sys/gnu/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/arm/src/sys/gnu/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/arm/src/sys/gnu/ext2fs/inode.h#2 integrate .. //depot/projects/arm/src/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/arm/src/sys/i386/include/ieeefp.h#3 integrate .. //depot/projects/arm/src/sys/isofs/cd9660/cd9660_node.h#3 integrate .. //depot/projects/arm/src/sys/isofs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/arm/src/sys/isofs/cd9660/cd9660_vnops.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_lockf.c#2 integrate .. //depot/projects/arm/src/sys/kern/subr_rman.c#3 integrate .. //depot/projects/arm/src/sys/kern/vfs_hash.c#2 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/arm/src/sys/netinet/ip_input.c#3 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/arm/src/sys/sys/bus_dma.h#2 integrate .. //depot/projects/arm/src/sys/sys/lockmgr.h#2 integrate .. //depot/projects/arm/src/sys/sys/vnode.h#4 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_inode.c#4 integrate .. //depot/projects/arm/src/sys/vm/vm_page.c#2 integrate Differences ... ==== //depot/projects/arm/src/sys/amd64/conf/GENERIC#4 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.430 2005/03/12 00:29:29 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.431 2005/03/16 02:34:50 iedowse Exp $ machine amd64 cpu HAMMER @@ -244,6 +244,7 @@ # USB support device uhci # UHCI PCI->USB interface device ohci # OHCI PCI->USB interface +device ehci # EHCI PCI->USB interface (USB 2.0) device usb # USB Bus (required) #device udbp # USB Double Bulk Pipe devices device ugen # Generic ==== //depot/projects/arm/src/sys/amd64/include/ieeefp.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#) ieeefp.h 1.0 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/amd64/include/ieeefp.h,v 1.12 2005/03/02 21:33:21 joerg Exp $ + * $FreeBSD: src/sys/amd64/include/ieeefp.h,v 1.13 2005/03/15 15:53:39 das Exp $ */ /* @@ -249,25 +249,6 @@ return (_ex); } -/* Note that this should really be called fpresetsticky() */ -static __inline__ fp_except_t -__fpsetsticky(fp_except_t _m) -{ - unsigned _env[7]; - unsigned int _mxcsr; - fp_except_t _p; - - __fnstenv(_env); - _p = _env[FP_STKY_REG] & _m; - __stmxcsr(&_mxcsr); - _p |= _mxcsr & SSE_STKY_FLD; - _env[FP_STKY_REG] &= ~_m; - __fldenv(_env); - _mxcsr &= ~_m; - __ldmxcsr(&_mxcsr); - return (_p); -} - #endif /* __GNUCLIKE_ASM && __CC_SUPPORTS___INLINE__ && !__cplusplus */ #if !defined(__IEEEFP_NOINLINES__) && !defined(__cplusplus) \ @@ -280,7 +261,6 @@ #define fpgetmask() __fpgetmask() #define fpsetmask(_m) __fpsetmask(_m) #define fpgetsticky() __fpgetsticky() -#define fpsetsticky(_m) __fpsetsticky(_m) /* Suppress prototypes in the MI header. */ #define _IEEEFP_INLINED_ 1 ==== //depot/projects/arm/src/sys/arm/arm/busdma_machdep.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.18 2005/03/08 14:49:05 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.20 2005/03/16 00:35:59 jmg Exp $"); /* * MacPPC bus dma support routines @@ -332,18 +332,16 @@ if (flags & BUS_DMA_ZERO) mflags |= M_ZERO; - if (!*mapp) { - newmap = malloc(sizeof(*newmap), M_DEVBUF, M_NOWAIT | M_ZERO); - if (newmap == NULL) { - CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", - __func__, dmat, dmat->flags, ENOMEM); - return (ENOMEM); - } - dmat->map_count++; - newmap->flags = 0; - *mapp = newmap; - newmap->dmat = dmat; + newmap = malloc(sizeof(*newmap), M_DEVBUF, M_NOWAIT | M_ZERO); + if (newmap == NULL) { + CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", + __func__, dmat, dmat->flags, ENOMEM); + return (ENOMEM); } + dmat->map_count++; + newmap->flags = 0; + *mapp = newmap; + newmap->dmat = dmat; if (dmat->maxsize <= PAGE_SIZE) { *vaddr = malloc(dmat->maxsize, M_DEVBUF, mflags); @@ -536,6 +534,8 @@ bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS]; #endif + KASSERT(dmat != NULL, ("dmatag is NULL")); + KASSERT(map != NULL, ("dmamap is NULL")); map->flags &= ~DMAMAP_TYPE_MASK; map->flags |= DMAMAP_LINEAR|DMAMAP_COHERENT; map->buffer = buf; @@ -709,7 +709,7 @@ * Release the mapping held by map. */ void -bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map) +_bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map) { map->flags &= ~DMAMAP_TYPE_MASK; return; @@ -735,7 +735,7 @@ } void -bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op) +_bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op) { struct mbuf *m; struct uio *uio; ==== //depot/projects/arm/src/sys/boot/i386/Makefile.inc#2 (text+ko) ==== @@ -1,11 +1,12 @@ # Common defines for all of /sys/boot/i386/ # -# $FreeBSD: src/sys/boot/i386/Makefile.inc,v 1.9 2004/02/09 14:11:55 ru Exp $ +# $FreeBSD: src/sys/boot/i386/Makefile.inc,v 1.10 2005/03/15 18:43:36 obrien Exp $ BINDIR?= /boot LOADER_ADDRESS?=0x200000 -CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 +CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 \ + -mno-mmx -mno-3dnow -mno-sse -mno-sse2 LDFLAGS+= -nostdlib .if ${MACHINE_ARCH} == "amd64" ==== //depot/projects/arm/src/sys/boot/i386/boot2/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.57 2004/08/27 15:01:56 yar Exp $ +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.58 2005/03/15 18:43:36 obrien Exp $ FILES= boot boot1 boot2 @@ -26,6 +26,7 @@ -fno-unit-at-a-time \ -mno-align-long-strings \ -mrtd \ + -mno-mmx -mno-3dnow -mno-sse -mno-sse2 \ -D${BOOT2_UFS} \ -DFLAGS=${BOOT_BOOT1_FLAGS} \ -DSIOPRT=${BOOT_COMCONSOLE_PORT} \ ==== //depot/projects/arm/src/sys/conf/kern.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.42 2004/05/14 13:35:46 cognet Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.44 2005/03/15 18:44:51 obrien Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -28,7 +28,8 @@ # cache tag lines) # .if ${MACHINE_ARCH} == "i386" && ${CC} != "icc" -CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 +CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 \ + -mno-mmx -mno-3dnow -mno-sse -mno-sse2 INLINE_LIMIT?= 8000 .endif @@ -65,8 +66,7 @@ .endif # -# For AMD64, use a medium model for now. We'll switch to "kernel" -# once pmap is ready. Be excessively careful to not generate FPU code. +# For AMD64, be excessively careful to not generate FPU code. # .if ${MACHINE_ARCH} == "amd64" CFLAGS+= -mcmodel=kernel -mno-red-zone \ ==== //depot/projects/arm/src/sys/dev/pci/pci.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.280 2005/02/28 01:14:15 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.281 2005/03/15 22:53:31 imp Exp $"); #include "opt_bus.h" @@ -1059,8 +1059,10 @@ /* Suspend devices before potentially powering them down. */ error = bus_generic_suspend(dev); - if (error) + if (error) { + free(devlist, M_TEMP); return (error); + } /* * Always set the device to D3. If ACPI suggests a different ==== //depot/projects/arm/src/sys/fs/hpfs/hpfs.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/hpfs/hpfs.h,v 1.17 2005/03/14 14:41:37 phk Exp $ + * $FreeBSD: src/sys/fs/hpfs/hpfs.h,v 1.18 2005/03/15 20:50:24 phk Exp $ */ /*#define HPFS_DEBUG 10*/ @@ -311,7 +311,7 @@ struct sublock hpm_su; struct spblock hpm_sp; struct mount * hpm_mp; - struct vnode * hpm_devvp; + struct vnode * hpm_devvp; /* XXX: loose this, it's in hpfsmount */ struct g_consumer *hpm_cp; struct bufobj *hpm_bo; struct cdev *hpm_dev; ==== //depot/projects/arm/src/sys/fs/hpfs/hpfs_vfsops.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.49 2005/03/15 10:01:14 phk Exp $ + * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.51 2005/03/15 20:50:24 phk Exp $ */ @@ -514,12 +514,8 @@ hp->h_devvp = hpmp->hpm_devvp; error = vfs_hash_insert(vp, ino, flags, curthread, vpp); - if (error || *vpp != NULL) { - vput(vp); + if (error || *vpp != NULL) return (error); - } - - VREF(hp->h_devvp); error = bread(hpmp->hpm_devvp, ino, FNODESIZE, NOCRED, &bp); if (error) { ==== //depot/projects/arm/src/sys/fs/hpfs/hpfs_vnops.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/hpfs/hpfs_vnops.c,v 1.61 2005/03/14 14:41:37 phk Exp $ + * $FreeBSD: src/sys/fs/hpfs/hpfs_vnops.c,v 1.62 2005/03/15 20:50:24 phk Exp $ */ #include @@ -602,12 +602,6 @@ vfs_hash_remove(vp); - /* Purge old data structures associated with the inode. */ - if (hp->h_devvp) { - vrele(hp->h_devvp); - hp->h_devvp = NULL; - } - mtx_destroy(&hp->h_interlock); vp->v_data = NULL; ==== //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_denode.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_denode.c,v 1.83 2005/03/15 08:07:06 phk Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_denode.c,v 1.85 2005/03/15 20:57:25 phk Exp $ */ /* $NetBSD: msdosfs_denode.c,v 1.28 1998/02/10 14:10:00 mrg Exp $ */ /*- @@ -75,7 +75,7 @@ * If deget() succeeds it returns with the gotten denode locked(). * * pmp - address of msdosfsmount structure of the filesystem containing - * the denode of interest. The pm_dev field and the address of + * the denode of interest. The address of * the msdosfsmount structure are used. * dirclust - which cluster bp contains, if dirclust is 0 (root directory) * diroffset is relative to the beginning of the root directory, @@ -92,7 +92,6 @@ { int error; u_int hash; - struct cdev *dev = pmp->pm_dev; struct mount *mntp = pmp->pm_mountp; struct direntry *direntptr; struct denode *ldep; @@ -155,20 +154,17 @@ nvp->v_data = ldep; ldep->de_vnode = nvp; ldep->de_flag = 0; - ldep->de_dev = dev; ldep->de_dirclust = dirclust; ldep->de_diroffset = diroffset; fc_purge(ldep, 0); /* init the fat cache for this denode */ error = vfs_hash_insert(nvp, hash, 0, curthread, &xvp); if (error) { - vput(nvp); *depp = NULL; return (error); } if (xvp != NULL) { /* XXX: Not sure this is right */ - vput(nvp); nvp = xvp; ldep->de_vnode = nvp; } ==== //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vfsops.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.142 2005/03/14 12:24:35 phk Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.143 2005/03/15 20:57:25 phk Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -676,7 +676,6 @@ /* * fillinusemap() needs pm_devvp. */ - pmp->pm_dev = dev; pmp->pm_devvp = devvp; /* ==== //depot/projects/arm/src/sys/fs/msdosfs/msdosfsmount.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfsmount.h,v 1.36 2005/03/14 12:24:35 phk Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfsmount.h,v 1.37 2005/03/15 20:57:25 phk Exp $ */ /* $NetBSD: msdosfsmount.h,v 1.17 1997/11/17 15:37:07 ws Exp $ */ /*- @@ -66,7 +66,6 @@ */ struct msdosfsmount { struct mount *pm_mountp;/* vfs mount struct for this fs */ - struct cdev *pm_dev; /* block special device mounted */ struct g_consumer *pm_cp; struct bufobj *pm_bo; uid_t pm_uid; /* uid to set as owner of the files */ ==== //depot/projects/arm/src/sys/fs/udf/udf.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/udf/udf.h,v 1.11 2005/03/14 12:29:39 phk Exp $ + * $FreeBSD: src/sys/fs/udf/udf.h,v 1.12 2005/03/15 21:09:52 phk Exp $ */ #define UDF_HASHTBLSIZE 100 @@ -31,9 +31,7 @@ struct udf_node { LIST_ENTRY(udf_node) le; struct vnode *i_vnode; - struct vnode *i_devvp; struct udf_mnt *udfmp; - struct cdev *i_dev; ino_t hash_id; long diroff; struct file_entry *fentry; ==== //depot/projects/arm/src/sys/fs/udf/udf_vfsops.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/udf/udf_vfsops.c,v 1.29 2005/03/15 08:07:06 phk Exp $ + * $FreeBSD: src/sys/fs/udf/udf_vfsops.c,v 1.31 2005/03/15 21:09:52 phk Exp $ */ /* udf_vfsops.c */ @@ -598,16 +598,12 @@ unode->i_vnode = vp; unode->hash_id = ino; - unode->i_devvp = udfmp->im_devvp; - unode->i_dev = udfmp->im_dev; unode->udfmp = udfmp; vp->v_data = unode; error = vfs_hash_insert(vp, ino, flags, curthread, vpp); - if (error || *vpp != NULL) { - vput(vp); + if (error || *vpp != NULL) return (error); - } /* * Copy in the file entry. Per the spec, the size can only be 1 block. @@ -641,7 +637,6 @@ return (ENOMEM); } - VREF(udfmp->im_devvp); bcopy(bp->b_data, unode->fentry, size); brelse(bp); ==== //depot/projects/arm/src/sys/fs/udf/udf_vnops.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/udf/udf_vnops.c,v 1.51 2005/03/14 12:29:39 phk Exp $ + * $FreeBSD: src/sys/fs/udf/udf_vnops.c,v 1.52 2005/03/15 21:09:52 phk Exp $ */ /* udf_vnops.c */ @@ -252,7 +252,6 @@ node = VTON(vp); fentry = node->fentry; - vap->va_fsid = dev2udev(node->i_dev); vap->va_fileid = node->hash_id; vap->va_mode = udf_permtomode(node); vap->va_nlink = le16toh(fentry->link_cnt); @@ -802,7 +801,7 @@ node = VTON(a->a_vp); if (a->a_bop != NULL) - *a->a_bop = &node->i_devvp->v_bufobj; + *a->a_bop = &node->udfmp->im_devvp->v_bufobj; if (a->a_bnp == NULL) return (0); if (a->a_runb) @@ -968,10 +967,6 @@ if (unode != NULL) { vfs_hash_remove(vp); - if (unode->i_devvp) { - vrele(unode->i_devvp); - unode->i_devvp = 0; - } if (unode->fentry != NULL) FREE(unode->fentry, M_UDFFENTRY); ==== //depot/projects/arm/src/sys/gnu/ext2fs/ext2_alloc.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)ffs_alloc.c 8.8 (Berkeley) 2/21/94 - * $FreeBSD: src/sys/gnu/ext2fs/ext2_alloc.c,v 1.40 2005/02/27 21:14:38 phk Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/ext2_alloc.c,v 1.41 2005/03/16 07:13:09 phk Exp $ */ #include @@ -104,8 +104,8 @@ fs = ip->i_e2fs; #if DIAGNOSTIC if ((u_int)size > fs->s_blocksize || blkoff(fs, size) != 0) { - printf("dev = %s, bsize = %lu, size = %d, fs = %s\n", - devtoname(ip->i_dev), fs->s_blocksize, size, fs->fs_fsmnt); + vn_printf(ip->i_devvp, "bsize = %lu, size = %d, fs = %s\n", + fs->s_blocksize, size, fs->fs_fsmnt); panic("ext2_alloc: bad size"); } if (cred == NOCRED) @@ -499,8 +499,8 @@ pip = VTOI(pvp); fs = pip->i_e2fs; if ((u_int)ino > fs->s_inodes_per_group * fs->s_groups_count) - panic("ext2_vfree: range: dev = %s, ino = %d, fs = %s", - devtoname(pip->i_dev), ino, fs->fs_fsmnt); + panic("ext2_vfree: range: devvp = %p, ino = %d, fs = %s", + pip->i_devvp, ino, fs->fs_fsmnt); /* ext2_debug("ext2_vfree (%d, %d) called\n", pip->i_number, mode); */ ==== //depot/projects/arm/src/sys/gnu/ext2fs/ext2_inode.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)ffs_inode.c 8.5 (Berkeley) 12/30/93 - * $FreeBSD: src/sys/gnu/ext2fs/ext2_inode.c,v 1.54 2005/03/14 13:30:05 phk Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/ext2_inode.c,v 1.55 2005/03/16 07:13:09 phk Exp $ */ #include @@ -529,13 +529,6 @@ ext2_update(vp, 0); } vfs_hash_remove(vp); - /* - * Purge old data structures associated with the inode. - */ - if (ip->i_devvp) { - vrele(ip->i_devvp); - ip->i_devvp = 0; - } FREE(vp->v_data, M_EXT2NODE); vp->v_data = 0; vnode_destroy_vobject(vp); ==== //depot/projects/arm/src/sys/gnu/ext2fs/ext2_vfsops.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)ffs_vfsops.c 8.8 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/gnu/ext2fs/ext2_vfsops.c,v 1.145 2005/03/15 08:07:06 phk Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/ext2_vfsops.c,v 1.147 2005/03/16 07:13:09 phk Exp $ */ #include @@ -940,14 +940,11 @@ vp->v_data = ip; ip->i_vnode = vp; ip->i_e2fs = fs = ump->um_e2fs; - ip->i_dev = dev; ip->i_number = ino; error = vfs_hash_insert(vp, ino, flags, curthread, vpp); - if (error || *vpp != NULL) { - vput(vp); + if (error || *vpp != NULL) return (error); - } /* Read in the disk contents for the inode, copy into the inode. */ #if 0 @@ -1001,7 +998,6 @@ * Finish inode initialization now that aliasing has been resolved. */ ip->i_devvp = ump->um_devvp; - VREF(ip->i_devvp); /* * Set up a generation number for this inode if it does not * already have one. This should only happen on old filesystems. ==== //depot/projects/arm/src/sys/gnu/ext2fs/ext2_vnops.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ * * @(#)ufs_vnops.c 8.7 (Berkeley) 2/3/94 * @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95 - * $FreeBSD: src/sys/gnu/ext2fs/ext2_vnops.c,v 1.99 2005/03/13 12:13:55 jeff Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/ext2_vnops.c,v 1.100 2005/03/16 07:13:09 phk Exp $ */ #include "opt_suiddir.h" @@ -346,7 +346,6 @@ /* * Copy from inode table */ - vap->va_fsid = dev2udev(ip->i_dev); vap->va_fileid = ip->i_number; vap->va_mode = ip->i_mode & ~IFMT; vap->va_nlink = ip->i_nlink; @@ -898,7 +897,7 @@ * expunge the original entry's existence. */ if (xp == NULL) { - if (dp->i_dev != ip->i_dev) + if (dp->i_devvp != ip->i_devvp) panic("ext2_rename: EXDEV"); /* * Account for ".." in new directory. @@ -927,7 +926,7 @@ } vput(tdvp); } else { - if (xp->i_dev != dp->i_dev || xp->i_dev != ip->i_dev) + if (xp->i_devvp != dp->i_devvp || xp->i_devvp != ip->i_devvp) panic("ext2_rename: EXDEV"); /* * Short circuit rename(foo, foo). @@ -1428,8 +1427,7 @@ struct vnode *vp = ap->a_vp; struct inode *ip = VTOI(vp); - printf("\tino %lu, on dev %s", (u_long)ip->i_number, - devtoname(ip->i_dev)); + vn_printf(ip->i_devvp, "\tino %lu", (u_long)ip->i_number); if (vp->v_type == VFIFO) fifo_printinfo(vp); printf("\n"); ==== //depot/projects/arm/src/sys/gnu/ext2fs/inode.h#2 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)inode.h 8.9 (Berkeley) 5/14/95 - * $FreeBSD: src/sys/gnu/ext2fs/inode.h,v 1.42 2005/01/06 18:27:30 imp Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/inode.h,v 1.43 2005/03/16 07:13:09 phk Exp $ */ #ifndef _SYS_GNU_EXT2FS_INODE_H_ @@ -65,7 +65,6 @@ struct vnode *i_vnode;/* Vnode associated with this inode. */ struct vnode *i_devvp;/* Vnode for block I/O. */ u_int32_t i_flag; /* flags, see below */ - struct cdev *i_dev; /* Device associated with the inode. */ ino_t i_number; /* The identity of the inode. */ struct ext2_sb_info *i_e2fs; /* EXT2FS */ ==== //depot/projects/arm/src/sys/i386/conf/GENERIC#3 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.423 2005/03/12 00:29:30 obrien Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.424 2005/03/16 02:34:49 iedowse Exp $ machine i386 cpu I486_CPU @@ -266,6 +266,7 @@ # USB support device uhci # UHCI PCI->USB interface device ohci # OHCI PCI->USB interface +device ehci # EHCI PCI->USB interface (USB 2.0) device usb # USB Bus (required) #device udbp # USB Double Bulk Pipe devices device ugen # Generic ==== //depot/projects/arm/src/sys/i386/include/ieeefp.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#) ieeefp.h 1.0 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/i386/include/ieeefp.h,v 1.10 2005/03/02 21:33:26 joerg Exp $ + * $FreeBSD: src/sys/i386/include/ieeefp.h,v 1.11 2005/03/15 15:53:39 das Exp $ */ /* @@ -177,7 +177,6 @@ ((__fpgetreg(FP_STKY_REG) & FP_STKY_FLD) >> FP_STKY_OFF)) #define fpresetsticky(m) ((fp_except_t) \ __fpsetreg(0, FP_STKY_REG, (m), FP_STKY_OFF)) -#define fpsetsticky(m) fpresetsticky(m) /* Suppress prototypes in the MI header. */ #define _IEEEFP_INLINED_ 1 ==== //depot/projects/arm/src/sys/isofs/cd9660/cd9660_node.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)cd9660_node.h 8.6 (Berkeley) 5/14/95 - * $FreeBSD: src/sys/isofs/cd9660/cd9660_node.h,v 1.29 2005/03/14 13:22:41 phk Exp $ + * $FreeBSD: src/sys/isofs/cd9660/cd9660_node.h,v 1.30 2005/03/16 07:17:39 phk Exp $ */ /* @@ -60,7 +60,6 @@ struct iso_node *i_next, **i_prev; /* hash chain */ struct vnode *i_vnode; /* vnode associated with this inode */ u_long i_flag; /* see below */ - struct cdev *i_dev; /* device where inode resides */ ino_t i_number; /* the identity of the inode */ /* we use the actual starting block of the file */ struct iso_mnt *i_mnt; /* filesystem associated with this inode */ ==== //depot/projects/arm/src/sys/isofs/cd9660/cd9660_vfsops.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/isofs/cd9660/cd9660_vfsops.c,v 1.136 2005/03/15 08:07:07 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/isofs/cd9660/cd9660_vfsops.c,v 1.138 2005/03/16 07:17:39 phk Exp $"); #include #include @@ -677,14 +677,11 @@ M_WAITOK | M_ZERO); vp->v_data = ip; ip->i_vnode = vp; - ip->i_dev = dev; ip->i_number = ino; error = vfs_hash_insert(vp, ino, flags, curthread, vpp); - if (error || *vpp != NULL) { - vput(vp); + if (error || *vpp != NULL) return (error); - } if (isodir == 0) { int lbn, off; ==== //depot/projects/arm/src/sys/isofs/cd9660/cd9660_vnops.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/isofs/cd9660/cd9660_vnops.c,v 1.108 2005/03/14 13:22:41 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/isofs/cd9660/cd9660_vnops.c,v 1.109 2005/03/16 07:17:39 phk Exp $"); #include #include @@ -188,7 +188,6 @@ struct vattr *vap = ap->a_vap; struct iso_node *ip = VTOI(vp); - vap->va_fsid = dev2udev(ip->i_dev); /* XXX WRONG! */ vap->va_fileid = ip->i_number; vap->va_mode = ip->inode.iso_mode; ==== //depot/projects/arm/src/sys/kern/kern_lockf.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_lockf.c,v 1.52 2005/01/25 10:15:26 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_lockf.c,v 1.53 2005/03/15 14:08:10 phk Exp $"); #include "opt_debug_lockf.h" @@ -794,10 +794,9 @@ else printf("id %p", (void *)lock->lf_id); if (lock->lf_inode != (struct inode *)0) - printf(" in ino %ju on dev <%d, %d>, %s, start %jd, end %jd", + printf(" in ino %ju on dev <%s>, %s, start %jd, end %jd", (uintmax_t)lock->lf_inode->i_number, - major(lock->lf_inode->i_dev), - minor(lock->lf_inode->i_dev), + devtoname(lock->lf_inode->i_dev), lock->lf_type == F_RDLCK ? "shared" : lock->lf_type == F_WRLCK ? "exclusive" : lock->lf_type == F_UNLCK ? "unlock" : "unknown", ==== //depot/projects/arm/src/sys/kern/subr_rman.c#3 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_rman.c,v 1.38 2005/01/06 23:35:39 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_rman.c,v 1.40 2005/03/15 20:28:51 imp Exp $"); #define __RMAN_RESOURCE_VISIBLE #include @@ -218,8 +218,9 @@ */ for (s = r; s; s = TAILQ_NEXT(s, r_link)) { DPRINTF(("considering [%#lx, %#lx]\n", s->r_start, s->r_end)); - if (s->r_start > end) { - DPRINTF(("s->r_start (%#lx) > end (%#lx)\n", s->r_start, end)); + if (s->r_start + count - 1 > end) { + DPRINTF(("s->r_start (%#lx) + count - 1> end (%#lx)\n", + s->r_start, end)); break; } if (s->r_flags & RF_ALLOCATED) { @@ -248,7 +249,7 @@ if ((rend - rstart + 1) >= count) { DPRINTF(("candidate region: [%#lx, %#lx], size %#lx\n", - rend, rstart, (rend - rstart + 1))); + rstart, rend, (rend - rstart + 1))); if ((s->r_end - s->r_start + 1) == count) { DPRINTF(("candidate region is entire chunk\n")); rv = s; ==== //depot/projects/arm/src/sys/kern/vfs_hash.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_hash.c,v 1.3 2005/03/15 08:07:07 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_hash.c,v 1.4 2005/03/15 20:00:03 phk Exp $"); #include #include @@ -117,10 +117,10 @@ error = vget(vp2, flags | LK_INTERLOCK, td); if (error == ENOENT) break; - if (error) - return (error); - *vpp = vp2; - return (0); + vput(vp); + if (!error) + *vpp = vp2; + return (error); } if (vp2 == NULL) break; ==== //depot/projects/arm/src/sys/kern/vfs_subr.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.595 2005/03/15 13:43:10 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.596 2005/03/15 14:38:16 jeff Exp $"); #include "opt_ddb.h" #include "opt_mac.h" @@ -92,6 +92,7 @@ static void vdropl(struct vnode *vp); static void vinactive(struct vnode *, struct thread *); static void v_incr_usecount(struct vnode *, int); +static void vfree(struct vnode *); /* * Enable Giant pushdown based on whether or not the vm is mpsafe in this @@ -149,8 +150,6 @@ */ static int reassignbufcalls; SYSCTL_INT(_vfs, OID_AUTO, reassignbufcalls, CTLFLAG_RW, &reassignbufcalls, 0, ""); -static int nameileafonly; -SYSCTL_INT(_vfs, OID_AUTO, nameileafonly, CTLFLAG_RW, &nameileafonly, 0, ""); /* * Cache for the mount type id assigned to NFS. This is used for @@ -263,6 +262,15 @@ int (*softdep_process_worklist_hook)(struct mount *); /* + * Macros to control when a vnode is freed and recycled. All require + * the vnode interlock. + */ +#define VCANRECYCLE(vp) (((vp)->v_iflag & VI_FREE) && !(vp)->v_holdcnt) +#define VSHOULDFREE(vp) (!((vp)->v_iflag & VI_FREE) && !(vp)->v_holdcnt) +#define VSHOULDBUSY(vp) (((vp)->v_iflag & VI_FREE) && (vp)->v_holdcnt) + + +/* * Initialize the vnode management data structures. */ #ifndef MAXVNODES_MAX @@ -657,7 +665,6 @@ vtryrecycle(struct vnode *vp) { struct thread *td = curthread; - vm_object_t object; struct mount *vnmp; int error; @@ -676,53 +683,10 @@ VOP_UNLOCK(vp, 0, td); return (EBUSY); } - - /* - * Don't recycle if we still have cached pages. - */ - object = vp->v_object; - if (object != NULL) { - VM_OBJECT_LOCK(object); - if (object->resident_page_count) { - VM_OBJECT_UNLOCK(object); - error = EBUSY; - goto done; - } - VM_OBJECT_UNLOCK(object); - } - if (LIST_FIRST(&vp->v_cache_src)) { - /* - * note: nameileafonly sysctl is temporary, - * for debugging only, and will eventually be - * removed. - */ - if (nameileafonly > 0) { - /* - * Do not reuse namei-cached directory - * vnodes that have cached - * subdirectories. - */ - if (cache_leaf_test(vp) < 0) { - error = EISDIR; - goto done; - } - } else if (nameileafonly < 0 || - vmiodirenable == 0) { - /* - * Do not reuse namei-cached directory - * vnodes if nameileafonly is -1 or - * if VMIO backing for directories is - * turned off (otherwise we reuse them - * too quickly). - */ - error = EBUSY; - goto done; - } - } /* * If we got this far, we need to acquire the interlock and see if * anyone picked up this vnode from another list. If not, we will - * mark it with XLOCK via vgonel() so that anyone who does find it + * mark it with DOOMED via vgonel() so that anyone who does find it * will skip over it. */ VI_LOCK(vp); @@ -2744,7 +2708,7 @@ /* * Mark a vnode as free, putting it up for recycling. */ -void +static void vfree(struct vnode *vp) { ==== //depot/projects/arm/src/sys/netinet/ip_input.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 16 07:45:47 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2188D16A4D0; Wed, 16 Mar 2005 07:45:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED80D16A4CE for ; Wed, 16 Mar 2005 07:45:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C1E2143D41 for ; Wed, 16 Mar 2005 07:45:46 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2G7jki8047667 for ; Wed, 16 Mar 2005 07:45:46 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2G7jkl5047664 for perforce@freebsd.org; Wed, 16 Mar 2005 07:45:46 GMT (envelope-from jmg@freebsd.org) Date: Wed, 16 Mar 2005 07:45:46 GMT Message-Id: <200503160745.j2G7jkl5047664@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Subject: PERFORCE change 73287 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, 16 Mar 2005 07:45:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=73287 Change 73287 by jmg@jmg_carbon-60 on 2005/03/16 07:45:20 kill a debug printf back when I was using projects/arm as my devel tree.. Affected files ... .. //depot/projects/arm/src/sys/arm/arm/cpufunc.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/cpufunc.c#4 (text+ko) ==== @@ -1872,8 +1872,6 @@ /* Clear out the cache */ cpu_idcache_wbinv_all(); - printf("Old value: %x, new value : %x\n", cpu_control(0, 0), cpuctrl); - /* Set the control register */ cpu_control(cpuctrlmask, cpuctrl); ctrl = cpuctrl; From owner-p4-projects@FreeBSD.ORG Wed Mar 16 20:47:45 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2962816A4D0; Wed, 16 Mar 2005 20:47:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C888216A4CE for ; Wed, 16 Mar 2005 20:47:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F4AB43D39 for ; Wed, 16 Mar 2005 20:47:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2GKliBZ008257 for ; Wed, 16 Mar 2005 20:47:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2GKli3l008254 for perforce@freebsd.org; Wed, 16 Mar 2005 20:47:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Mar 2005 20:47:44 GMT Message-Id: <200503162047.j2GKli3l008254@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 73335 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, 16 Mar 2005 20:47:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=73335 Change 73335 by rwatson@rwatson_paprika on 2005/03/16 20:47:42 Add MAC Framework access control check for accept() system call. Pointed out by: sherman@nailabs.com, pleblanc@nailabs.com Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#47 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_socket.c#5 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#29 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#268 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#225 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#47 (text+ko) ==== @@ -315,6 +315,13 @@ error = EINVAL; goto done; } +#ifdef MAC + SOCK_LOCK(head); + error = mac_check_socket_accept(td->td_ucred, head); + SOCK_UNLOCK(head); + if (error != 0) + goto done; +#endif error = falloc(td, &nfp, &fd); if (error) goto done; ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_socket.c#5 (text+ko) ==== @@ -1,7 +1,7 @@ /*- * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001 Ilmar S. Habibulin - * Copyright (c) 2001-2004 Networks Associates Technology, Inc. + * Copyright (c) 2001-2005 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed by Robert Watson and Ilmar Habibulin for the @@ -273,6 +273,21 @@ } int +mac_check_socket_accept(struct ucred *cred, struct socket *socket) +{ + int error; + + SOCK_LOCK_ASSERT(socket); + + if (!mac_enforce_socket) + return (0); + + MAC_CHECK(check_socket_accept, cred, socket, socket->so_label); + + return (error); +} + +int mac_check_socket_bind(struct ucred *ucred, struct socket *socket, struct sockaddr *sockaddr) { ==== //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#29 (text+ko) ==== @@ -982,6 +982,14 @@ } static int +stub_check_socket_accept(struct ucred *cred, struct socket *socket, + struct label *socketlabel) +{ + + return (0); +} + +static int stub_check_socket_bind(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct sockaddr *sockaddr) { @@ -1502,6 +1510,7 @@ .mpo_check_proc_setresgid = stub_check_proc_setresgid, .mpo_check_proc_signal = stub_check_proc_signal, .mpo_check_proc_wait = stub_check_proc_wait, + .mpo_check_socket_accept = stub_check_socket_accept, .mpo_check_socket_bind = stub_check_socket_bind, .mpo_check_socket_connect = stub_check_socket_connect, .mpo_check_socket_deliver = stub_check_socket_deliver, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#268 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 1999-2002 Robert N. M. Watson - * Copyright (c) 2001-2003 Networks Associates Technology, Inc. + * Copyright (c) 2001-2005 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -369,6 +369,7 @@ int mac_check_proc_signal(struct ucred *cred, struct proc *proc, int signum); int mac_check_proc_wait(struct ucred *cred, struct proc *proc); +int mac_check_socket_accept(struct ucred *cred, struct socket *so); int mac_check_socket_bind(struct ucred *cred, struct socket *so, struct sockaddr *sockaddr); int mac_check_socket_connect(struct ucred *cred, struct socket *so, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#225 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 1999-2002 Robert N. M. Watson - * Copyright (c) 2001-2004 Networks Associates Technology, Inc. + * Copyright (c) 2001-2005 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -451,6 +451,8 @@ struct proc *proc, int signum); int (*mpo_check_proc_wait)(struct ucred *cred, struct proc *proc); + int (*mpo_check_socket_accept)(struct ucred *cred, + struct socket *so, struct label *socketlabel); int (*mpo_check_socket_bind)(struct ucred *cred, struct socket *so, struct label *socketlabel, struct sockaddr *sockaddr); From owner-p4-projects@FreeBSD.ORG Wed Mar 16 22:26:45 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B42E916A4D0; Wed, 16 Mar 2005 22:26:44 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7063816A4CE for ; Wed, 16 Mar 2005 22:26:44 +0000 (GMT) Received: from mail22.sea5.speakeasy.net (mail22.sea5.speakeasy.net [69.17.117.24]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2CCC543D39 for ; Wed, 16 Mar 2005 22:26:44 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: (qmail 13351 invoked from network); 16 Mar 2005 22:26:44 -0000 Received: from server.baldwin.cx ([216.27.160.63]) (envelope-sender )AES256-SHA encrypted SMTP for ; 16 Mar 2005 22:26:43 -0000 Received: from [10.50.40.202] (gw1.twc.weather.com [216.133.140.1]) (authenticated bits=0) by server.baldwin.cx (8.13.1/8.13.1) with ESMTP id j2GMQZmd002096; Wed, 16 Mar 2005 17:26:36 -0500 (EST) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: Jake Burkholder Date: Wed, 16 Mar 2005 16:17:34 -0500 User-Agent: KMail/1.6.2 References: <200503032211.j23MBlia013010@repoman.freebsd.org> <4234CA9D.9080108@locore.ca> In-Reply-To: <4234CA9D.9080108@locore.ca> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200503161617.34804.jhb@FreeBSD.org> X-Spam-Status: No, score=-102.8 required=4.2 tests=ALL_TRUSTED, USER_IN_WHITELIST autolearn=failed version=3.0.2 X-Spam-Checker-Version: SpamAssassin 3.0.2 (2004-11-16) on server.baldwin.cx cc: Perforce Change Reviews Subject: Re: PERFORCE change 72454 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Mar 2005 22:26:45 -0000 On Sunday 13 March 2005 06:19 pm, Jake Burkholder wrote: > John Baldwin wrote: > >http://perforce.freebsd.org/chv.cgi?CH=72454 > > > >Change 72454 by jhb@jhb_slimer on 2005/03/03 22:11:16 > > > > Clobber all memory for atomic ops with an acquire barrier. > > > > Suggested by: alc > > > >Affected files ... > > > >.. //depot/projects/smpng/sys/sparc64/include/atomic.h#7 edit > > > >Differences ... > > > >==== //depot/projects/smpng/sys/sparc64/include/atomic.h#7 (text+ko) ==== > > > >@@ -90,6 +90,7 @@ > > itype(sz) v; \ > > v = atomic_cas(p, e, s, sz); \ > > membar(LoadLoad | LoadStore); \ > >+ __asm __volatile("" : : : "memory"); \ > > v; \ > > }) > > > >@@ -115,6 +116,7 @@ > > itype(sz) t; \ > > t = atomic_op(p, op, v, sz); \ > > membar(LoadLoad | LoadStore); \ > >+ __asm __volatile("" : : : "memory"); \ > > t; \ > > }) > > > >@@ -132,6 +134,7 @@ > > itype(sz) v; \ > > v = atomic_load(p, sz); \ > > membar(LoadLoad | LoadStore); \ > >+ __asm __volatile("" : : : "memory"); \ > > v; \ > > }) > > membar already has a memory clobber fwiw. It does on ppc, too, I'm not sure if I should remove them from there. The problem is that "memory" is a notice to gcc to not store values across an instruction, but just because we order writes doesn't mean that gcc needs to throw out values. Only an 'acq' membar really has that requirement. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Thu Mar 17 09:45:44 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D976116A4D0; Thu, 17 Mar 2005 09:45:43 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8BC5616A4CE for ; Thu, 17 Mar 2005 09:45:43 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 469FF43D1D for ; Thu, 17 Mar 2005 09:45:42 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2H9jgPL063234 for ; Thu, 17 Mar 2005 09:45:42 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2H9j6aV063194 for perforce@freebsd.org; Thu, 17 Mar 2005 09:45:06 GMT (envelope-from jmallett@freebsd.org) Date: Thu, 17 Mar 2005 09:45:06 GMT Message-Id: <200503170945.j2H9j6aV063194@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 73359 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, 17 Mar 2005 09:45:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=73359 Change 73359 by jmallett@jmallett_windward on 2005/03/17 09:43:40 IFC Obtained from: Elves. Lots of little freaking elves. Affected files ... .. //depot/projects/mips/COPYRIGHT#3 integrate .. //depot/projects/mips/MAINTAINERS#17 integrate .. //depot/projects/mips/Makefile#13 integrate .. //depot/projects/mips/Makefile.inc1#29 integrate .. //depot/projects/mips/UPDATING#22 integrate .. //depot/projects/mips/UPDATING.64BTT#4 delete .. //depot/projects/mips/bin/Makefile#5 integrate .. //depot/projects/mips/bin/Makefile.inc#5 integrate .. //depot/projects/mips/bin/cat/cat.1#3 integrate .. //depot/projects/mips/bin/cat/cat.c#6 integrate .. //depot/projects/mips/bin/chflags/Makefile#3 integrate .. //depot/projects/mips/bin/chflags/chflags.1#6 integrate .. //depot/projects/mips/bin/chflags/chflags.c#6 integrate .. //depot/projects/mips/bin/chio/Makefile#2 integrate .. //depot/projects/mips/bin/chio/chio.1#5 integrate .. //depot/projects/mips/bin/chio/chio.c#3 integrate .. //depot/projects/mips/bin/chio/defs.h#2 integrate .. //depot/projects/mips/bin/chio/pathnames.h#2 integrate .. //depot/projects/mips/bin/chmod/chmod.1#5 integrate .. //depot/projects/mips/bin/chmod/chmod.c#7 integrate .. //depot/projects/mips/bin/cp/cp.1#6 integrate .. //depot/projects/mips/bin/cp/cp.c#7 integrate .. //depot/projects/mips/bin/cp/utils.c#7 integrate .. //depot/projects/mips/bin/csh/USD.doc/csh.1#4 integrate .. //depot/projects/mips/bin/csh/USD.doc/csh.2#3 integrate .. //depot/projects/mips/bin/csh/USD.doc/csh.3#3 integrate .. //depot/projects/mips/bin/csh/USD.doc/csh.4#3 integrate .. //depot/projects/mips/bin/csh/USD.doc/csh.a#3 integrate .. //depot/projects/mips/bin/csh/USD.doc/csh.g#4 integrate .. //depot/projects/mips/bin/csh/USD.doc/tabs#3 integrate .. //depot/projects/mips/bin/csh/config.h#3 integrate .. //depot/projects/mips/bin/date/date.1#6 integrate .. //depot/projects/mips/bin/date/date.c#7 integrate .. //depot/projects/mips/bin/dd/dd.1#6 integrate .. //depot/projects/mips/bin/dd/gen.c#2 integrate .. //depot/projects/mips/bin/df/df.1#6 integrate .. //depot/projects/mips/bin/df/df.c#12 integrate .. //depot/projects/mips/bin/domainname/domainname.1#4 integrate .. //depot/projects/mips/bin/domainname/domainname.c#4 integrate .. //depot/projects/mips/bin/echo/echo.1#6 integrate .. //depot/projects/mips/bin/echo/echo.c#6 integrate .. //depot/projects/mips/bin/ed/Makefile#5 integrate .. //depot/projects/mips/bin/ed/ed.1#4 integrate .. //depot/projects/mips/bin/ed/ed.h#3 integrate .. //depot/projects/mips/bin/ed/main.c#3 integrate .. //depot/projects/mips/bin/expr/expr.1#5 integrate .. //depot/projects/mips/bin/expr/expr.y#3 integrate .. //depot/projects/mips/bin/getfacl/getfacl.1#6 integrate .. //depot/projects/mips/bin/getfacl/getfacl.c#4 integrate .. //depot/projects/mips/bin/hostname/hostname.1#4 integrate .. //depot/projects/mips/bin/hostname/hostname.c#4 integrate .. //depot/projects/mips/bin/kenv/kenv.1#3 integrate .. //depot/projects/mips/bin/kenv/kenv.c#4 integrate .. //depot/projects/mips/bin/kill/kill.1#4 integrate .. //depot/projects/mips/bin/kill/kill.c#6 integrate .. //depot/projects/mips/bin/ln/ln.1#4 integrate .. //depot/projects/mips/bin/ln/ln.c#4 integrate .. //depot/projects/mips/bin/ln/symlink.7#4 integrate .. //depot/projects/mips/bin/ls/cmp.c#5 integrate .. //depot/projects/mips/bin/ls/ls.1#12 integrate .. //depot/projects/mips/bin/ls/ls.c#12 integrate .. //depot/projects/mips/bin/ls/ls.h#5 integrate .. //depot/projects/mips/bin/ls/print.c#13 integrate .. //depot/projects/mips/bin/ls/util.c#6 integrate .. //depot/projects/mips/bin/mkdir/Makefile#2 integrate .. //depot/projects/mips/bin/mkdir/mkdir.1#4 integrate .. //depot/projects/mips/bin/mkdir/mkdir.c#5 integrate .. //depot/projects/mips/bin/mv/mv.1#3 integrate .. //depot/projects/mips/bin/mv/mv.c#4 integrate .. //depot/projects/mips/bin/pax/ar_io.c#7 integrate .. //depot/projects/mips/bin/pax/ar_subs.c#4 integrate .. //depot/projects/mips/bin/pax/cpio.1#2 integrate .. //depot/projects/mips/bin/pax/extern.h#4 integrate .. //depot/projects/mips/bin/pax/ftree.c#4 integrate .. //depot/projects/mips/bin/pax/getoldopt.c#3 integrate .. //depot/projects/mips/bin/pax/pax.1#6 integrate .. //depot/projects/mips/bin/pax/tar.1#4 integrate .. //depot/projects/mips/bin/pax/tar.c#4 integrate .. //depot/projects/mips/bin/ps/Makefile#6 integrate .. //depot/projects/mips/bin/ps/keyword.c#10 integrate .. //depot/projects/mips/bin/ps/ps.1#10 integrate .. //depot/projects/mips/bin/ps/ps.c#10 integrate .. //depot/projects/mips/bin/pwd/pwd.1#6 integrate .. //depot/projects/mips/bin/pwd/pwd.c#5 integrate .. //depot/projects/mips/bin/rcp/rcp.1#4 integrate .. //depot/projects/mips/bin/rcp/rcp.c#6 integrate .. //depot/projects/mips/bin/realpath/realpath.1#3 integrate .. //depot/projects/mips/bin/rm/Makefile#2 integrate .. //depot/projects/mips/bin/rm/rm.1#5 integrate .. //depot/projects/mips/bin/rm/rm.c#7 integrate .. //depot/projects/mips/bin/rmail/Makefile#5 integrate .. //depot/projects/mips/bin/rmdir/rmdir.1#4 integrate .. //depot/projects/mips/bin/rmdir/rmdir.c#5 integrate .. //depot/projects/mips/bin/setfacl/file.c#2 integrate .. //depot/projects/mips/bin/setfacl/mask.c#2 integrate .. //depot/projects/mips/bin/setfacl/merge.c#2 integrate .. //depot/projects/mips/bin/setfacl/remove.c#2 integrate .. //depot/projects/mips/bin/setfacl/setfacl.1#5 integrate .. //depot/projects/mips/bin/setfacl/setfacl.c#4 integrate .. //depot/projects/mips/bin/setfacl/setfacl.h#3 integrate .. //depot/projects/mips/bin/setfacl/util.c#2 integrate .. //depot/projects/mips/bin/sh/bltin/echo.1#5 integrate .. //depot/projects/mips/bin/sh/builtins.def#4 integrate .. //depot/projects/mips/bin/sh/funcs/cmv#3 integrate .. //depot/projects/mips/bin/sh/funcs/dirs#3 integrate .. //depot/projects/mips/bin/sh/funcs/kill#3 integrate .. //depot/projects/mips/bin/sh/funcs/login#3 integrate .. //depot/projects/mips/bin/sh/funcs/newgrp#3 integrate .. //depot/projects/mips/bin/sh/funcs/popd#3 integrate .. //depot/projects/mips/bin/sh/funcs/pushd#3 integrate .. //depot/projects/mips/bin/sh/funcs/suspend#3 integrate .. //depot/projects/mips/bin/sh/jobs.c#8 integrate .. //depot/projects/mips/bin/sh/mkbuiltins#5 integrate .. //depot/projects/mips/bin/sh/mktokens#3 integrate .. //depot/projects/mips/bin/sh/nodetypes#3 integrate .. //depot/projects/mips/bin/sh/options.c#3 integrate .. //depot/projects/mips/bin/sh/parser.c#6 integrate .. //depot/projects/mips/bin/sh/sh.1#9 integrate .. //depot/projects/mips/bin/sleep/sleep.1#3 integrate .. //depot/projects/mips/bin/sleep/sleep.c#5 integrate .. //depot/projects/mips/bin/stty/stty.1#4 integrate .. //depot/projects/mips/bin/stty/stty.c#4 integrate .. //depot/projects/mips/bin/sync/sync.8#3 integrate .. //depot/projects/mips/bin/sync/sync.c#4 integrate .. //depot/projects/mips/bin/test/TEST.sh#2 integrate .. //depot/projects/mips/bin/test/test.1#5 integrate .. //depot/projects/mips/bin/test/test.c#2 integrate .. //depot/projects/mips/contrib/amd/fixmount/fixmount.8#5 integrate .. //depot/projects/mips/contrib/amd/hlfsd/hlfsd.8#5 integrate .. //depot/projects/mips/contrib/bind9/FREEBSD-Upgrade#2 integrate .. //depot/projects/mips/contrib/bsnmp/FREEBSD-Xlist#4 integrate .. //depot/projects/mips/contrib/bsnmp/NEWS#5 integrate .. //depot/projects/mips/contrib/bsnmp/VERSION#5 integrate .. //depot/projects/mips/contrib/bsnmp/gensnmpdef/gensnmpdef.1#3 integrate .. //depot/projects/mips/contrib/bsnmp/gensnmptree/gensnmptree.1#4 integrate .. //depot/projects/mips/contrib/bsnmp/gensnmptree/gensnmptree.c#5 integrate .. //depot/projects/mips/contrib/bsnmp/lib/asn1.3#5 integrate .. //depot/projects/mips/contrib/bsnmp/lib/bsnmpagent.3#5 integrate .. //depot/projects/mips/contrib/bsnmp/lib/bsnmpclient.3#5 integrate .. //depot/projects/mips/contrib/bsnmp/lib/bsnmplib.3#5 integrate .. //depot/projects/mips/contrib/bsnmp/lib/snmpagent.c#5 integrate .. //depot/projects/mips/contrib/bsnmp/oid-list#1 branch .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII.c#5 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#5 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/snmp_mibII.3#5 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/snmp_mibII.h#4 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/bsnmpd.1#5 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/main.c#5 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/snmpd.config#5 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/snmpmod.3#5 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/trans_lsock.c#4 integrate .. //depot/projects/mips/contrib/file/ChangeLog#2 integrate .. //depot/projects/mips/contrib/file/LEGAL.NOTICE#3 integrate .. //depot/projects/mips/contrib/file/Magdir/animation#3 integrate .. //depot/projects/mips/contrib/file/Magdir/archive#4 integrate .. //depot/projects/mips/contrib/file/Magdir/audio#4 integrate .. //depot/projects/mips/contrib/file/Magdir/console#3 integrate .. //depot/projects/mips/contrib/file/Magdir/elf#4 integrate .. //depot/projects/mips/contrib/file/Magdir/esri#1 branch .. //depot/projects/mips/contrib/file/Magdir/filesystems#5 integrate .. //depot/projects/mips/contrib/file/Magdir/linux#3 integrate .. //depot/projects/mips/contrib/file/Magdir/msdos#4 integrate .. //depot/projects/mips/contrib/file/Magdir/os9#2 integrate .. //depot/projects/mips/contrib/file/Magdir/perl#3 integrate .. //depot/projects/mips/contrib/file/Magdir/plan9#2 integrate .. //depot/projects/mips/contrib/file/Magdir/sinclair#2 integrate .. //depot/projects/mips/contrib/file/Magdir/sniffer#3 integrate .. //depot/projects/mips/contrib/file/Magdir/tex#2 integrate .. //depot/projects/mips/contrib/file/Magdir/virtutech#1 branch .. //depot/projects/mips/contrib/file/Magdir/xo65#1 branch .. //depot/projects/mips/contrib/file/Makefile.am#5 integrate .. //depot/projects/mips/contrib/file/Makefile.in#5 integrate .. //depot/projects/mips/contrib/file/PORTING#1 branch .. //depot/projects/mips/contrib/file/aclocal.m4#4 integrate .. //depot/projects/mips/contrib/file/apprentice.c#4 integrate .. //depot/projects/mips/contrib/file/ascmagic.c#4 integrate .. //depot/projects/mips/contrib/file/compress.c#3 integrate .. //depot/projects/mips/contrib/file/config.h.in#5 integrate .. //depot/projects/mips/contrib/file/configure#5 integrate .. //depot/projects/mips/contrib/file/configure.in#5 integrate .. //depot/projects/mips/contrib/file/file.c#5 integrate .. //depot/projects/mips/contrib/file/file.h#4 integrate .. //depot/projects/mips/contrib/file/fsmagic.c#3 integrate .. //depot/projects/mips/contrib/file/funcs.c#2 integrate .. //depot/projects/mips/contrib/file/install-sh#2 integrate .. //depot/projects/mips/contrib/file/is_tar.c#3 integrate .. //depot/projects/mips/contrib/file/magic.c#2 integrate .. //depot/projects/mips/contrib/file/magic.h#2 integrate .. //depot/projects/mips/contrib/file/magic.mime#4 integrate .. //depot/projects/mips/contrib/file/mkinstalldirs#2 integrate .. //depot/projects/mips/contrib/file/names.h#3 integrate .. //depot/projects/mips/contrib/file/patchlevel.h#5 integrate .. //depot/projects/mips/contrib/file/print.c#4 integrate .. //depot/projects/mips/contrib/file/readelf.c#5 integrate .. //depot/projects/mips/contrib/file/readelf.h#3 integrate .. //depot/projects/mips/contrib/file/softmagic.c#5 integrate .. //depot/projects/mips/contrib/file/tar.h#3 integrate .. //depot/projects/mips/contrib/file/test.c#2 integrate .. //depot/projects/mips/contrib/gcc/gcc.1#5 integrate .. //depot/projects/mips/contrib/gdtoa/gdtoaimp.h#6 integrate .. //depot/projects/mips/contrib/groff/tmac/doc-common#7 integrate .. //depot/projects/mips/contrib/groff/tmac/doc-ditroff#5 integrate .. //depot/projects/mips/contrib/groff/tmac/doc-syms#7 integrate .. //depot/projects/mips/contrib/groff/tmac/doc.tmac#6 integrate .. //depot/projects/mips/contrib/groff/tmac/groff_mdoc.man#6 integrate .. //depot/projects/mips/contrib/lukemftp/src/Makefile#2 integrate .. //depot/projects/mips/contrib/lukemftp/src/cmds.c#3 integrate .. //depot/projects/mips/contrib/lukemftp/src/cmdtab.c#3 integrate .. //depot/projects/mips/contrib/lukemftp/src/extern.h#3 integrate .. //depot/projects/mips/contrib/lukemftp/src/fetch.c#4 integrate .. //depot/projects/mips/contrib/lukemftp/src/ftp.1#4 integrate .. //depot/projects/mips/contrib/lukemftp/src/ftp.c#4 integrate .. //depot/projects/mips/contrib/lukemftp/src/ftp_var.h#3 integrate .. //depot/projects/mips/contrib/lukemftp/src/main.c#3 integrate .. //depot/projects/mips/contrib/lukemftp/src/progressbar.c#3 integrate .. //depot/projects/mips/contrib/lukemftp/src/progressbar.h#3 integrate .. //depot/projects/mips/contrib/lukemftp/src/util.c#4 integrate .. //depot/projects/mips/contrib/lukemftp/src/version.h#4 integrate .. //depot/projects/mips/contrib/netcat/FREEBSD-Xlist#1 branch .. //depot/projects/mips/contrib/netcat/FREEBSD-upgrade#1 branch .. //depot/projects/mips/contrib/netcat/atomicio.c#1 branch .. //depot/projects/mips/contrib/netcat/nc.1#1 branch .. //depot/projects/mips/contrib/netcat/netcat.c#1 branch .. //depot/projects/mips/contrib/netcat/socks.c#1 branch .. //depot/projects/mips/contrib/ntp/ntpdate/ntpdate.c#4 integrate .. //depot/projects/mips/contrib/openpam/HISTORY#6 integrate .. //depot/projects/mips/contrib/openpam/MANIFEST#5 integrate .. //depot/projects/mips/contrib/openpam/Makefile.am#2 integrate .. //depot/projects/mips/contrib/openpam/Makefile.in#3 integrate .. //depot/projects/mips/contrib/openpam/RELNOTES#6 integrate .. //depot/projects/mips/contrib/openpam/aclocal.m4#2 integrate .. //depot/projects/mips/contrib/openpam/bin/Makefile.in#2 integrate .. //depot/projects/mips/contrib/openpam/bin/su/Makefile.in#2 integrate .. //depot/projects/mips/contrib/openpam/config.h.in#2 integrate .. //depot/projects/mips/contrib/openpam/configure#3 integrate .. //depot/projects/mips/contrib/openpam/configure.ac#1 branch .. //depot/projects/mips/contrib/openpam/depcomp#2 integrate .. //depot/projects/mips/contrib/openpam/doc/Makefile.in#2 integrate .. //depot/projects/mips/contrib/openpam/doc/man/Makefile.am#2 integrate .. //depot/projects/mips/contrib/openpam/doc/man/Makefile.in#2 integrate .. //depot/projects/mips/contrib/openpam/doc/man/openpam.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/openpam.man#3 integrate .. //depot/projects/mips/contrib/openpam/doc/man/openpam_borrow_cred.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/openpam_free_data.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/openpam_free_envlist.3#1 branch .. //depot/projects/mips/contrib/openpam/doc/man/openpam_get_option.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/openpam_log.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/openpam_nullconv.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/openpam_readline.3#3 integrate .. //depot/projects/mips/contrib/openpam/doc/man/openpam_restore_cred.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/openpam_set_option.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/openpam_ttyconv.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam.man#4 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_acct_mgmt.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_authenticate.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_chauthtok.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_close_session.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_end.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_error.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_get_authtok.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_get_data.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_get_item.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_get_user.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_getenv.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_getenvlist.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_info.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_open_session.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_prompt.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_putenv.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_set_data.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_set_item.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_setcred.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_setenv.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_sm_authenticate.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_sm_chauthtok.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_sm_close_session.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_sm_open_session.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_sm_setcred.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_start.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_strerror.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_verror.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_vinfo.3#6 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_vprompt.3#6 integrate .. //depot/projects/mips/contrib/openpam/include/Makefile.in#2 integrate .. //depot/projects/mips/contrib/openpam/include/security/Makefile.in#2 integrate .. //depot/projects/mips/contrib/openpam/include/security/openpam.h#5 integrate .. //depot/projects/mips/contrib/openpam/include/security/openpam_version.h#5 integrate .. //depot/projects/mips/contrib/openpam/install-sh#2 integrate .. //depot/projects/mips/contrib/openpam/lib/Makefile.am#2 integrate .. //depot/projects/mips/contrib/openpam/lib/Makefile.in#2 integrate .. //depot/projects/mips/contrib/openpam/lib/openpam_borrow_cred.c#7 integrate .. //depot/projects/mips/contrib/openpam/lib/openpam_free_data.c#5 integrate .. //depot/projects/mips/contrib/openpam/lib/openpam_free_envlist.c#1 branch .. //depot/projects/mips/contrib/openpam/lib/openpam_log.c#6 integrate .. //depot/projects/mips/contrib/openpam/lib/openpam_nullconv.c#5 integrate .. //depot/projects/mips/contrib/openpam/lib/openpam_restore_cred.c#7 integrate .. //depot/projects/mips/contrib/openpam/lib/openpam_ttyconv.c#7 integrate .. //depot/projects/mips/contrib/openpam/lib/pam_get_authtok.c#7 integrate .. //depot/projects/mips/contrib/openpam/lib/pam_get_data.c#7 integrate .. //depot/projects/mips/contrib/openpam/lib/pam_get_user.c#7 integrate .. //depot/projects/mips/contrib/openpam/lib/pam_open_session.c#6 integrate .. //depot/projects/mips/contrib/openpam/lib/pam_strerror.c#5 integrate .. //depot/projects/mips/contrib/openpam/ltmain.sh#3 integrate .. //depot/projects/mips/contrib/openpam/misc/gendoc.pl#5 integrate .. //depot/projects/mips/contrib/openpam/missing#2 integrate .. //depot/projects/mips/contrib/openpam/modules/Makefile.in#2 integrate .. //depot/projects/mips/contrib/openpam/modules/pam_deny/Makefile.in#2 integrate .. //depot/projects/mips/contrib/openpam/modules/pam_permit/Makefile.in#2 integrate .. //depot/projects/mips/contrib/openpam/modules/pam_unix/Makefile.in#2 integrate .. //depot/projects/mips/contrib/pf/man/pf.4#4 integrate .. //depot/projects/mips/contrib/pf/man/pf.conf.5#3 integrate .. //depot/projects/mips/contrib/pf/man/pfsync.4#4 integrate .. //depot/projects/mips/contrib/sendmail/FREEBSD-upgrade#9 integrate .. //depot/projects/mips/contrib/sendmail/KNOWNBUGS#4 integrate .. //depot/projects/mips/contrib/sendmail/PGPKEYS#5 integrate .. //depot/projects/mips/contrib/sendmail/RELEASE_NOTES#8 integrate .. //depot/projects/mips/contrib/sendmail/cf/cf/Makefile#3 integrate .. //depot/projects/mips/contrib/sendmail/cf/cf/submit.cf#8 integrate .. //depot/projects/mips/contrib/sendmail/cf/m4/proto.m4#8 integrate .. //depot/projects/mips/contrib/sendmail/cf/m4/version.m4#8 integrate .. //depot/projects/mips/contrib/sendmail/cf/mailer/local.m4#2 integrate .. //depot/projects/mips/contrib/sendmail/cf/ostype/dragonfly.m4#1 branch .. //depot/projects/mips/contrib/sendmail/editmap/editmap.c#2 integrate .. //depot/projects/mips/contrib/sendmail/include/libmilter/mfapi.h#5 integrate .. //depot/projects/mips/contrib/sendmail/include/sm/clock.h#2 integrate .. //depot/projects/mips/contrib/sendmail/include/sm/conf.h#7 integrate .. //depot/projects/mips/contrib/sendmail/include/sm/config.h#3 integrate .. //depot/projects/mips/contrib/sendmail/include/sm/os/sm_os_dragonfly.h#1 branch .. //depot/projects/mips/contrib/sendmail/libmilter/comm.c#5 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/engine.c#6 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/listener.c#7 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/signal.c#6 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/sm_gethost.c#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/smfi.c#3 integrate .. //depot/projects/mips/contrib/sendmail/libsm/Makefile.m4#3 integrate .. //depot/projects/mips/contrib/sendmail/libsm/b-strcmp.c#2 integrate .. //depot/projects/mips/contrib/sendmail/libsm/clock.c#5 integrate .. //depot/projects/mips/contrib/sendmail/libsm/debug.c#3 integrate .. //depot/projects/mips/contrib/sendmail/libsm/fclose.c#2 integrate .. //depot/projects/mips/contrib/sendmail/libsm/fopen.c#2 integrate .. //depot/projects/mips/contrib/sendmail/libsm/fpos.c#2 integrate .. //depot/projects/mips/contrib/sendmail/libsm/fseek.c#2 integrate .. //depot/projects/mips/contrib/sendmail/libsm/heap.c#2 integrate .. //depot/projects/mips/contrib/sendmail/libsm/ldap.c#5 integrate .. //depot/projects/mips/contrib/sendmail/libsm/rpool.c#3 integrate .. //depot/projects/mips/contrib/sendmail/libsm/smstdio.c#4 integrate .. //depot/projects/mips/contrib/sendmail/libsm/stdio.c#6 integrate .. //depot/projects/mips/contrib/sendmail/libsm/strio.c#2 integrate .. //depot/projects/mips/contrib/sendmail/libsm/t-event.c#2 integrate .. //depot/projects/mips/contrib/sendmail/libsm/t-shm.c#3 integrate .. //depot/projects/mips/contrib/sendmail/libsm/ungetc.c#2 integrate .. //depot/projects/mips/contrib/sendmail/libsm/vfprintf.c#2 integrate .. //depot/projects/mips/contrib/sendmail/libsm/vfscanf.c#2 integrate .. //depot/projects/mips/contrib/sendmail/libsm/vsscanf.c#2 delete .. //depot/projects/mips/contrib/sendmail/libsmdb/smdb.c#2 integrate .. //depot/projects/mips/contrib/sendmail/libsmdb/smdb1.c#2 integrate .. //depot/projects/mips/contrib/sendmail/libsmutil/safefile.c#3 integrate .. //depot/projects/mips/contrib/sendmail/mail.local/Makefile.m4#3 integrate .. //depot/projects/mips/contrib/sendmail/mail.local/mail.local.c#7 integrate .. //depot/projects/mips/contrib/sendmail/makemap/makemap.c#4 integrate .. //depot/projects/mips/contrib/sendmail/smrsh/smrsh.8#5 integrate .. //depot/projects/mips/contrib/sendmail/smrsh/smrsh.c#8 integrate .. //depot/projects/mips/contrib/sendmail/src/README#8 integrate .. //depot/projects/mips/contrib/sendmail/src/bf.c#4 integrate .. //depot/projects/mips/contrib/sendmail/src/collect.c#6 integrate .. //depot/projects/mips/contrib/sendmail/src/conf.c#9 integrate .. //depot/projects/mips/contrib/sendmail/src/control.c#5 integrate .. //depot/projects/mips/contrib/sendmail/src/daemon.c#7 integrate .. //depot/projects/mips/contrib/sendmail/src/deliver.c#8 integrate .. //depot/projects/mips/contrib/sendmail/src/domain.c#5 integrate .. //depot/projects/mips/contrib/sendmail/src/headers.c#9 integrate .. //depot/projects/mips/contrib/sendmail/src/helpfile#2 integrate .. //depot/projects/mips/contrib/sendmail/src/map.c#5 integrate .. //depot/projects/mips/contrib/sendmail/src/mci.c#7 integrate .. //depot/projects/mips/contrib/sendmail/src/milter.c#8 integrate .. //depot/projects/mips/contrib/sendmail/src/mime.c#5 integrate .. //depot/projects/mips/contrib/sendmail/src/parseaddr.c#7 integrate .. //depot/projects/mips/contrib/sendmail/src/queue.c#8 integrate .. //depot/projects/mips/contrib/sendmail/src/readcf.c#7 integrate .. //depot/projects/mips/contrib/sendmail/src/recipient.c#6 integrate .. //depot/projects/mips/contrib/sendmail/src/sasl.c#4 integrate .. //depot/projects/mips/contrib/sendmail/src/savemail.c#5 integrate .. //depot/projects/mips/contrib/sendmail/src/sendmail.h#8 integrate .. //depot/projects/mips/contrib/sendmail/src/sfsasl.c#5 integrate .. //depot/projects/mips/contrib/sendmail/src/sm_resolve.c#4 integrate .. //depot/projects/mips/contrib/sendmail/src/srvrsmtp.c#8 integrate .. //depot/projects/mips/contrib/sendmail/src/tls.c#7 integrate .. //depot/projects/mips/contrib/sendmail/src/usersmtp.c#6 integrate .. //depot/projects/mips/contrib/sendmail/src/util.c#6 integrate .. //depot/projects/mips/contrib/sendmail/src/version.c#8 integrate .. //depot/projects/mips/contrib/sendmail/vacation/vacation.c#4 integrate .. //depot/projects/mips/contrib/tcpdump/print-ppp.c#3 integrate .. //depot/projects/mips/contrib/telnet/telnet/commands.c#2 integrate .. //depot/projects/mips/contrib/telnet/telnet/main.c#2 integrate .. //depot/projects/mips/contrib/telnet/telnet/telnet.1#2 integrate .. //depot/projects/mips/contrib/telnet/telnet/telnet.c#2 integrate .. //depot/projects/mips/contrib/telnet/telnetd/telnetd.8#2 integrate .. //depot/projects/mips/contrib/telnet/telnetd/telnetd.c#2 integrate .. //depot/projects/mips/contrib/top/top.X#4 integrate .. //depot/projects/mips/crypto/heimdal/ChangeLog#5 integrate .. //depot/projects/mips/crypto/heimdal/FREEBSD-Xlist#2 integrate .. //depot/projects/mips/crypto/heimdal/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/NEWS#5 integrate .. //depot/projects/mips/crypto/heimdal/aclocal.m4#5 integrate .. //depot/projects/mips/crypto/heimdal/admin/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/admin/get.c#3 integrate .. //depot/projects/mips/crypto/heimdal/appl/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/appl/afsutil/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/appl/ftp/ChangeLog#5 integrate .. //depot/projects/mips/crypto/heimdal/appl/ftp/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/appl/ftp/common/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/appl/ftp/ftp/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/appl/ftp/ftp/ftp.c#4 integrate .. //depot/projects/mips/crypto/heimdal/appl/ftp/ftpd/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/appl/ftp/ftpd/extern.h#2 integrate .. //depot/projects/mips/crypto/heimdal/appl/ftp/ftpd/ftpcmd.y#2 integrate .. //depot/projects/mips/crypto/heimdal/appl/ftp/ftpd/ftpd.8#4 integrate .. //depot/projects/mips/crypto/heimdal/appl/ftp/ftpd/ftpd.c#4 integrate .. //depot/projects/mips/crypto/heimdal/appl/ftp/ftpd/ftpd_locl.h#3 integrate .. //depot/projects/mips/crypto/heimdal/appl/kf/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/appl/login/ChangeLog#3 integrate .. //depot/projects/mips/crypto/heimdal/appl/login/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/appl/login/login.c#3 integrate .. //depot/projects/mips/crypto/heimdal/appl/push/ChangeLog#3 integrate .. //depot/projects/mips/crypto/heimdal/appl/push/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/appl/push/push.c#3 integrate .. //depot/projects/mips/crypto/heimdal/appl/rcp/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/appl/rsh/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/appl/su/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/appl/telnet/ChangeLog#5 integrate .. //depot/projects/mips/crypto/heimdal/appl/telnet/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/appl/telnet/libtelnet/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c#4 integrate .. //depot/projects/mips/crypto/heimdal/appl/telnet/telnet/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/appl/telnet/telnet/network.c#2 integrate .. //depot/projects/mips/crypto/heimdal/appl/telnet/telnetd/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/appl/telnet/telnetd/state.c#2 integrate .. //depot/projects/mips/crypto/heimdal/appl/test/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/compile#2 integrate .. //depot/projects/mips/crypto/heimdal/config.guess#4 integrate .. //depot/projects/mips/crypto/heimdal/config.sub#4 integrate .. //depot/projects/mips/crypto/heimdal/configure#5 integrate .. //depot/projects/mips/crypto/heimdal/configure.in#5 integrate .. //depot/projects/mips/crypto/heimdal/doc/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/include/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/include/kadm5/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/install-sh#4 integrate .. //depot/projects/mips/crypto/heimdal/kadmin/ChangeLog#4 integrate .. //depot/projects/mips/crypto/heimdal/kadmin/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/kadmin/kadmind.c#4 integrate .. //depot/projects/mips/crypto/heimdal/kadmin/version4.c#5 integrate .. //depot/projects/mips/crypto/heimdal/kdc/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/kdc/connect.c#5 integrate .. //depot/projects/mips/crypto/heimdal/kdc/kerberos5.c#4 integrate .. //depot/projects/mips/crypto/heimdal/kpasswd/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/kuser/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/kuser/kinit.c#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/45/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/lib/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/lib/asn1/Makefile.am#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/asn1/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/lib/asn1/k5.asn1#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/auth/ChangeLog#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/auth/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/lib/auth/afskauthlib/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/lib/auth/afskauthlib/verify.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/auth/pam/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/lib/auth/sia/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/lib/com_err/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/lib/gssapi/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/lib/hdb/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/lib/kadm5/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/lib/kafs/ChangeLog#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/kafs/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/lib/kafs/afssys.c#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/Makefile.am#5 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/changepw.c#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/context.c#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/init_creds_pw.c#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/krb5-protos.h#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/krb5.h#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/krb5_set_password.3#1 branch .. //depot/projects/mips/crypto/heimdal/lib/roken/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/lib/sl/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/lib/vers/Makefile.in#5 integrate .. //depot/projects/mips/crypto/heimdal/missing#4 integrate .. //depot/projects/mips/crypto/heimdal/mkinstalldirs#4 integrate .. //depot/projects/mips/crypto/heimdal/tools/Makefile.in#5 integrate .. //depot/projects/mips/crypto/openssl/CHANGES#6 integrate .. //depot/projects/mips/crypto/openssl/Configure#6 integrate .. //depot/projects/mips/crypto/openssl/FAQ#6 integrate .. //depot/projects/mips/crypto/openssl/FREEBSD-Xlist#3 integrate .. //depot/projects/mips/crypto/openssl/INSTALL#4 integrate .. //depot/projects/mips/crypto/openssl/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/Makefile.org#6 integrate .. //depot/projects/mips/crypto/openssl/Makefile.ssl#6 delete .. //depot/projects/mips/crypto/openssl/NEWS#6 integrate .. //depot/projects/mips/crypto/openssl/PROBLEMS#5 integrate .. //depot/projects/mips/crypto/openssl/README#6 integrate .. //depot/projects/mips/crypto/openssl/apps/CA.pl#5 integrate .. //depot/projects/mips/crypto/openssl/apps/CA.pl.in#3 integrate .. //depot/projects/mips/crypto/openssl/apps/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/apps/Makefile.ssl#6 delete .. //depot/projects/mips/crypto/openssl/apps/apps.c#6 integrate .. //depot/projects/mips/crypto/openssl/apps/apps.h#5 integrate .. //depot/projects/mips/crypto/openssl/apps/asn1pars.c#4 integrate .. //depot/projects/mips/crypto/openssl/apps/ca.c#6 integrate .. //depot/projects/mips/crypto/openssl/apps/der_chop#4 integrate .. //depot/projects/mips/crypto/openssl/apps/dgst.c#5 integrate .. //depot/projects/mips/crypto/openssl/apps/enc.c#5 integrate .. //depot/projects/mips/crypto/openssl/apps/openssl.c#5 integrate .. //depot/projects/mips/crypto/openssl/apps/openssl.cnf#5 integrate .. //depot/projects/mips/crypto/openssl/apps/pkcs8.c#5 integrate .. //depot/projects/mips/crypto/openssl/apps/prime.c#1 branch .. //depot/projects/mips/crypto/openssl/apps/progs.h#4 integrate .. //depot/projects/mips/crypto/openssl/apps/req.c#5 integrate .. //depot/projects/mips/crypto/openssl/apps/speed.c#5 integrate .. //depot/projects/mips/crypto/openssl/apps/x509.c#6 integrate .. //depot/projects/mips/crypto/openssl/certs/eng1.pem#1 branch .. //depot/projects/mips/crypto/openssl/certs/eng2.pem#1 branch .. //depot/projects/mips/crypto/openssl/certs/eng3.pem#1 branch .. //depot/projects/mips/crypto/openssl/certs/eng4.pem#1 branch .. //depot/projects/mips/crypto/openssl/certs/eng5.pem#1 branch .. //depot/projects/mips/crypto/openssl/comm.txt#1 branch .. //depot/projects/mips/crypto/openssl/comms.txt#1 branch .. //depot/projects/mips/crypto/openssl/config#6 integrate .. //depot/projects/mips/crypto/openssl/crypto/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/aes/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/aes/Makefile.ssl#3 delete .. //depot/projects/mips/crypto/openssl/crypto/aes/aes.h#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/aes/aes_cfb.c#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/aes/aes_core.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/aes/aes_ctr.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/aes/aes_locl.h#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/asn1/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/asn1/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/asn1/a_int.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/asn1/a_strex.c#5 integrate .. //depot/projects/mips/crypto/openssl/crypto/asn1/f.c#2 delete .. //depot/projects/mips/crypto/openssl/crypto/asn1/p5_pbev2.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/asn1/x_cinf.c#2 delete .. //depot/projects/mips/crypto/openssl/crypto/asn1/x_crl.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/bf/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/bf/Makefile.ssl#5 delete .. //depot/projects/mips/crypto/openssl/crypto/bio/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/bio/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/bio/b_print.c#5 integrate .. //depot/projects/mips/crypto/openssl/crypto/bio/bio.h#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/bio/bss_file.c#5 integrate .. //depot/projects/mips/crypto/openssl/crypto/bn/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/bn/Makefile.ssl#6 delete .. //depot/projects/mips/crypto/openssl/crypto/bn/asm/ia64.S#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/bn/bntest.c#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/buffer/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/buffer/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/cast/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/cast/Makefile.ssl#5 delete .. //depot/projects/mips/crypto/openssl/crypto/comp/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/comp/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/comp/c_zlib.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/conf/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/conf/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/conf/conf_def.c#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/cryptlib.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/crypto.h#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/des/FILES0#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/des/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/des/Makefile.ssl#5 delete .. //depot/projects/mips/crypto/openssl/crypto/des/cfb64ede.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/des/des.h#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/des/des_enc.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/des/des_old.c#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/des/destest.c#5 integrate .. //depot/projects/mips/crypto/openssl/crypto/des/ecb3_enc.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/des/set_key.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/dh/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/dh/Makefile.ssl#5 delete .. //depot/projects/mips/crypto/openssl/crypto/dh/dh_check.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/dh/dh_err.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/dh/dh_gen.c#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/dh/dh_key.c#5 integrate .. //depot/projects/mips/crypto/openssl/crypto/dsa/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/dsa/Makefile.ssl#5 delete .. //depot/projects/mips/crypto/openssl/crypto/dsa/dsa.h#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/dsa/dsa_gen.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/dsa/dsa_key.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/dsa/dsa_ossl.c#5 integrate .. //depot/projects/mips/crypto/openssl/crypto/dsa/dsa_sign.c#5 integrate .. //depot/projects/mips/crypto/openssl/crypto/dsa/dsa_vrf.c#5 integrate .. //depot/projects/mips/crypto/openssl/crypto/dso/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/dso/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/ec/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/ec/Makefile.ssl#3 delete .. //depot/projects/mips/crypto/openssl/crypto/engine/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/engine/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/engine/hw_cryptodev.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/err/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/err/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/err/err.c#6 integrate .. //depot/projects/mips/crypto/openssl/crypto/err/err.h#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/err/err_all.c#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/err/openssl.ec#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/evp/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/evp/Makefile.ssl#5 delete .. //depot/projects/mips/crypto/openssl/crypto/evp/bio_md.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/evp/c_allc.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/evp/e_aes.c#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/evp/e_des.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/evp/e_des3.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/evp/e_old.c#1 branch .. //depot/projects/mips/crypto/openssl/crypto/evp/evp.h#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/evp/evp_err.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/evp/evp_lib.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/evp/evp_locl.h#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/evp/evp_test.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/evp/evptests.txt#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/hmac/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/hmac/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/idea/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/idea/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/krb5/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/krb5/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/lhash/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/lhash/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/md2/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/md2/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/md32_common.h#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/md4/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/md4/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/md5/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/md5/Makefile.ssl#6 delete .. //depot/projects/mips/crypto/openssl/crypto/mdc2/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/mdc2/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/o_str.c#1 branch .. //depot/projects/mips/crypto/openssl/crypto/o_str.h#1 branch .. //depot/projects/mips/crypto/openssl/crypto/o_time.c#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/objects/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/objects/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/objects/obj_dat.h#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/objects/obj_mac.h#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/objects/obj_mac.num#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/objects/objects.txt#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/ocsp/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/ocsp/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/opensslv.h#6 integrate .. //depot/projects/mips/crypto/openssl/crypto/pem/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/pem/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/pem/pem_all.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/pem/pem_pkey.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/pkcs12/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/pkcs12/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/pkcs7/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/pkcs7/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/pkcs7/pk7_attr.c#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/rand/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/rand/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/rand/md_rand.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/rand/rand.h#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/rand/rand_egd.c#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/rand/rand_err.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/rand/rand_lib.c#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/rand/rand_win.c#5 integrate .. //depot/projects/mips/crypto/openssl/crypto/rand/randfile.c#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/rc2/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/rc2/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/rc4/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/rc4/Makefile.ssl#5 delete .. //depot/projects/mips/crypto/openssl/crypto/rc5/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/rc5/Makefile.ssl#5 delete .. //depot/projects/mips/crypto/openssl/crypto/ripemd/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/ripemd/Makefile.ssl#5 delete .. //depot/projects/mips/crypto/openssl/crypto/rsa/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/rsa/Makefile.ssl#5 delete .. //depot/projects/mips/crypto/openssl/crypto/rsa/rsa.h#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/rsa/rsa_eay.c#6 integrate .. //depot/projects/mips/crypto/openssl/crypto/rsa/rsa_gen.c#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/sha/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/sha/Makefile.ssl#5 delete .. //depot/projects/mips/crypto/openssl/crypto/sha/sha.h#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/sha/sha1dgst.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/stack/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/stack/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/stack/safestack.h#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/stack/stack.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/stack/stack.h#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/txt_db/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/txt_db/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/ui/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/ui/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/x509/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/x509/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/x509/x509.h#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/x509/x509_req.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/x509/x509_vfy.c#5 integrate .. //depot/projects/mips/crypto/openssl/crypto/x509v3/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/crypto/x509v3/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/crypto/x509v3/ext_dat.h#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/x509v3/v3_int.c#3 integrate .. //depot/projects/mips/crypto/openssl/demos/engines/rsaref/Makefile#2 delete .. //depot/projects/mips/crypto/openssl/demos/engines/rsaref/README#2 delete .. //depot/projects/mips/crypto/openssl/demos/engines/rsaref/build.com#2 delete .. //depot/projects/mips/crypto/openssl/demos/engines/rsaref/rsaref.c#2 delete .. //depot/projects/mips/crypto/openssl/demos/engines/rsaref/rsaref.ec#2 delete .. //depot/projects/mips/crypto/openssl/demos/engines/rsaref/rsaref_err.c#2 delete .. //depot/projects/mips/crypto/openssl/demos/engines/rsaref/rsaref_err.h#2 delete .. //depot/projects/mips/crypto/openssl/doc/apps/enc.pod#3 integrate .. //depot/projects/mips/crypto/openssl/doc/crypto/BN_num_bytes.pod#2 integrate .. //depot/projects/mips/crypto/openssl/doc/crypto/RSA_public_encrypt.pod#3 integrate .. //depot/projects/mips/crypto/openssl/doc/crypto/pem.pod#3 integrate .. //depot/projects/mips/crypto/openssl/doc/ssl/SSL_CTX_set_session_id_context.pod#2 integrate .. //depot/projects/mips/crypto/openssl/e_os.h#4 integrate .. //depot/projects/mips/crypto/openssl/e_os2.h#3 integrate .. //depot/projects/mips/crypto/openssl/openssl.spec#6 integrate .. //depot/projects/mips/crypto/openssl/os2/OS2-EMX.cmd#2 delete .. //depot/projects/mips/crypto/openssl/ssl/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/ssl/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/ssl/s23_clnt.c#3 integrate .. //depot/projects/mips/crypto/openssl/ssl/s2_clnt.c#5 integrate .. //depot/projects/mips/crypto/openssl/ssl/s2_srvr.c#4 integrate .. //depot/projects/mips/crypto/openssl/ssl/s3_clnt.c#5 integrate .. //depot/projects/mips/crypto/openssl/ssl/s3_lib.c#4 integrate .. //depot/projects/mips/crypto/openssl/ssl/s3_pkt.c#5 integrate .. //depot/projects/mips/crypto/openssl/ssl/s3_srvr.c#6 integrate .. //depot/projects/mips/crypto/openssl/ssl/ssl.h#5 integrate .. //depot/projects/mips/crypto/openssl/ssl/ssl_cert.c#5 integrate .. //depot/projects/mips/crypto/openssl/ssl/ssl_ciph.c#5 integrate .. //depot/projects/mips/crypto/openssl/ssl/ssl_lib.c#6 integrate .. //depot/projects/mips/crypto/openssl/ssl/ssl_locl.h#3 integrate .. //depot/projects/mips/crypto/openssl/ssl/ssl_sess.c#5 integrate .. //depot/projects/mips/crypto/openssl/ssl/ssltest.c#6 integrate .. //depot/projects/mips/crypto/openssl/ssl/t1_enc.c#3 integrate .. //depot/projects/mips/crypto/openssl/test/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/test/Makefile.ssl#6 delete .. //depot/projects/mips/crypto/openssl/test/bctest#2 integrate .. //depot/projects/mips/crypto/openssl/test/evptests.txt#2 integrate .. //depot/projects/mips/crypto/openssl/test/testenc#2 integrate .. //depot/projects/mips/crypto/openssl/test/testfipsssl#1 branch .. //depot/projects/mips/crypto/openssl/tools/Makefile#1 branch .. //depot/projects/mips/crypto/openssl/tools/Makefile.ssl#4 delete .. //depot/projects/mips/crypto/openssl/tools/c_issuer#2 integrate .. //depot/projects/mips/crypto/openssl/tools/c_rehash#5 integrate .. //depot/projects/mips/crypto/openssl/util/domd#3 integrate .. //depot/projects/mips/crypto/openssl/util/extract-names.pl#4 integrate .. //depot/projects/mips/crypto/openssl/util/fixNT.sh#2 integrate .. //depot/projects/mips/crypto/openssl/util/libeay.num#5 integrate .. //depot/projects/mips/crypto/openssl/util/mk1mf.pl#6 integrate .. //depot/projects/mips/crypto/openssl/util/mkdef.pl#6 integrate .. //depot/projects/mips/crypto/openssl/util/mkerr.pl#4 integrate .. //depot/projects/mips/crypto/openssl/util/mkfiles.pl#3 integrate .. //depot/projects/mips/crypto/openssl/util/mkstack.pl#3 integrate .. //depot/projects/mips/crypto/openssl/util/pl/BC-16.pl#3 integrate .. //depot/projects/mips/crypto/openssl/util/pl/BC-32.pl#3 integrate .. //depot/projects/mips/crypto/openssl/util/pl/Mingw32.pl#4 integrate .. //depot/projects/mips/crypto/openssl/util/pl/OS2-EMX.pl#3 integrate .. //depot/projects/mips/crypto/openssl/util/pl/VC-16.pl#3 integrate .. //depot/projects/mips/crypto/openssl/util/pl/VC-32.pl#3 integrate .. //depot/projects/mips/crypto/openssl/util/pl/VC-CE.pl#2 integrate .. //depot/projects/mips/crypto/openssl/util/pl/linux.pl#2 integrate .. //depot/projects/mips/crypto/openssl/util/pl/ultrix.pl#2 integrate .. //depot/projects/mips/crypto/openssl/util/pl/unix.pl#2 integrate .. //depot/projects/mips/crypto/openssl/util/pod2mantest#3 integrate .. //depot/projects/mips/crypto/openssl/util/selftest.pl#3 integrate .. //depot/projects/mips/etc/Makefile#18 integrate .. //depot/projects/mips/etc/defaults/Makefile#4 integrate .. //depot/projects/mips/etc/defaults/pccard.conf#11 integrate .. //depot/projects/mips/etc/defaults/periodic.conf#9 integrate .. //depot/projects/mips/etc/defaults/rc.conf#21 integrate .. //depot/projects/mips/etc/devd.conf#10 integrate .. //depot/projects/mips/etc/etc.sparc64/ttys#5 integrate .. //depot/projects/mips/etc/isdn/Makefile#4 integrate .. //depot/projects/mips/etc/mtree/BSD.include.dist#15 integrate .. //depot/projects/mips/etc/mtree/BSD.local.dist#11 integrate .. //depot/projects/mips/etc/mtree/BSD.usr.dist#15 integrate .. //depot/projects/mips/etc/mtree/BSD.x11-4.dist#5 integrate .. //depot/projects/mips/etc/mtree/Makefile#3 integrate .. //depot/projects/mips/etc/namedb/Makefile#3 integrate .. //depot/projects/mips/etc/namedb/named.conf#6 integrate .. //depot/projects/mips/etc/network.subr#6 integrate .. //depot/projects/mips/etc/newsyslog.conf#7 integrate .. //depot/projects/mips/etc/pam.d/Makefile#6 integrate .. //depot/projects/mips/etc/pccard_ether#8 integrate .. //depot/projects/mips/etc/periodic/Makefile.inc#2 integrate .. //depot/projects/mips/etc/periodic/daily/460.status-mail-rejects#4 integrate .. //depot/projects/mips/etc/periodic/security/100.chksetuid#3 integrate .. //depot/projects/mips/etc/periodic/security/500.ipfwdenied#4 integrate .. //depot/projects/mips/etc/periodic/security/520.pfdenied#1 branch .. //depot/projects/mips/etc/periodic/security/550.ipfwlimit#4 integrate .. //depot/projects/mips/etc/periodic/security/Makefile#3 integrate .. //depot/projects/mips/etc/ppp/ppp.conf#2 integrate .. //depot/projects/mips/etc/protocols#4 integrate .. //depot/projects/mips/etc/rc.d/Makefile#14 integrate .. //depot/projects/mips/etc/rc.d/amd#7 integrate .. //depot/projects/mips/etc/rc.d/cleartmp#9 integrate .. //depot/projects/mips/etc/rc.d/cron#6 integrate .. //depot/projects/mips/etc/rc.d/dhclient#10 integrate .. //depot/projects/mips/etc/rc.d/dmesg#4 integrate .. //depot/projects/mips/etc/rc.d/gbde#5 integrate .. //depot/projects/mips/etc/rc.d/inetd#4 integrate .. //depot/projects/mips/etc/rc.d/initdiskless#10 integrate .. //depot/projects/mips/etc/rc.d/initrandom#5 integrate .. //depot/projects/mips/etc/rc.d/ipfw#9 integrate .. //depot/projects/mips/etc/rc.d/isdnd#9 integrate .. //depot/projects/mips/etc/rc.d/jail#8 integrate .. //depot/projects/mips/etc/rc.d/ldconfig#7 integrate .. //depot/projects/mips/etc/rc.d/lomac#5 delete .. //depot/projects/mips/etc/rc.d/lpd#4 integrate .. //depot/projects/mips/etc/rc.d/mountcritremote#8 integrate .. //depot/projects/mips/etc/rc.d/moused#5 integrate .. //depot/projects/mips/etc/rc.d/mrouted#8 integrate .. //depot/projects/mips/etc/rc.d/named#7 integrate .. //depot/projects/mips/etc/rc.d/newsyslog#2 integrate .. //depot/projects/mips/etc/rc.d/ntpd#6 integrate .. //depot/projects/mips/etc/rc.d/pflog#3 integrate .. //depot/projects/mips/etc/rc.d/power_profile#5 integrate .. //depot/projects/mips/etc/rc.d/powerd#1 branch .. //depot/projects/mips/etc/rc.d/ppp-user#7 integrate .. //depot/projects/mips/etc/rc.d/ramdisk-own#3 integrate .. //depot/projects/mips/etc/rc.d/rarpd#5 integrate .. //depot/projects/mips/etc/rc.d/resolv#3 integrate .. //depot/projects/mips/etc/rc.d/sendmail#6 integrate .. //depot/projects/mips/etc/rc.d/serial#6 integrate .. //depot/projects/mips/etc/rc.d/sshd#5 integrate .. //depot/projects/mips/etc/rc.d/var#3 integrate .. //depot/projects/mips/etc/rc.d/watchdogd#5 integrate .. //depot/projects/mips/etc/rc.shutdown#5 integrate .. //depot/projects/mips/etc/rc.subr#14 integrate .. //depot/projects/mips/etc/syslog.conf#4 integrate .. //depot/projects/mips/etc/usbd.conf#4 integrate .. //depot/projects/mips/games/factor/Makefile#6 integrate .. //depot/projects/mips/games/fortune/datfiles/Makefile#4 integrate .. //depot/projects/mips/games/fortune/datfiles/fortunes#18 integrate .. //depot/projects/mips/games/fortune/datfiles/fortunes2#11 delete .. //depot/projects/mips/games/fortune/datfiles/fortunes2-o#8 integrate .. //depot/projects/mips/games/fortune/datfiles/freebsd-tips#10 integrate .. //depot/projects/mips/games/fortune/datfiles/limerick#3 integrate .. //depot/projects/mips/games/fortune/datfiles/murphy#6 integrate .. //depot/projects/mips/games/fortune/datfiles/zippy#2 integrate .. //depot/projects/mips/games/fortune/fortune/Makefile#3 integrate .. //depot/projects/mips/games/fortune/fortune/fortune.6#3 integrate .. //depot/projects/mips/games/fortune/fortune/fortune.c#5 integrate .. //depot/projects/mips/games/fortune/strfile/Makefile#4 integrate .. //depot/projects/mips/games/fortune/strfile/strfile.8#3 integrate .. //depot/projects/mips/games/fortune/strfile/strfile.c#6 integrate .. //depot/projects/mips/games/fortune/strfile/strfile.h#2 integrate .. //depot/projects/mips/games/fortune/tools/do_sort#2 integrate .. //depot/projects/mips/games/fortune/tools/do_uniq.py#1 branch .. //depot/projects/mips/games/fortune/unstr/Makefile#3 integrate .. //depot/projects/mips/games/fortune/unstr/unstr.c#3 integrate .. //depot/projects/mips/games/morse/morse.6#5 integrate .. //depot/projects/mips/games/number/number.6#2 integrate .. //depot/projects/mips/games/number/number.c#3 integrate .. //depot/projects/mips/games/ppt/Makefile#3 integrate .. //depot/projects/mips/games/primes/Makefile#3 integrate .. //depot/projects/mips/games/random/random.6#4 integrate .. //depot/projects/mips/games/random/random.c#5 integrate .. //depot/projects/mips/gnu/Makefile.inc#3 integrate .. //depot/projects/mips/gnu/lib/libdialog/Makefile#4 integrate .. //depot/projects/mips/gnu/lib/libdialog/checklist.c#3 integrate .. //depot/projects/mips/gnu/lib/libdialog/dialog.3#4 integrate .. //depot/projects/mips/gnu/lib/libg2c/Makefile#5 integrate .. //depot/projects/mips/gnu/lib/libgcc/Makefile#5 integrate .. //depot/projects/mips/gnu/lib/libgcov/Makefile#2 integrate .. //depot/projects/mips/gnu/lib/libobjc/Makefile#6 integrate .. //depot/projects/mips/gnu/lib/libstdc++/Makefile#9 integrate .. //depot/projects/mips/gnu/lib/libstdc++/config.h#8 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/ar/Makefile#4 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/as/Makefile#3 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/gasp/gasp.1#2 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/gdb/Makefile#11 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/gdbreplay/Makefile#3 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/ld/Makefile#7 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/libiberty/Makefile#8 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/ranlib/Makefile#5 integrate .. //depot/projects/mips/gnu/usr.bin/cc/c++/Makefile#4 integrate .. //depot/projects/mips/gnu/usr.bin/cc/c++filt/Makefile#5 integrate .. //depot/projects/mips/gnu/usr.bin/cc/cc/Makefile#4 integrate .. //depot/projects/mips/gnu/usr.bin/cc/cc1/Makefile#5 integrate .. //depot/projects/mips/gnu/usr.bin/cc/cc1obj/Makefile#4 integrate .. //depot/projects/mips/gnu/usr.bin/cc/cc1plus/Makefile#6 integrate .. //depot/projects/mips/gnu/usr.bin/cc/collect2/Makefile#4 integrate .. //depot/projects/mips/gnu/usr.bin/cc/f771/Makefile#6 integrate .. //depot/projects/mips/gnu/usr.bin/cc/include/Makefile#6 integrate .. //depot/projects/mips/gnu/usr.bin/cc/protoize/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/cvs/cvs/Makefile#8 integrate .. //depot/projects/mips/gnu/usr.bin/cvs/cvsbug/Makefile#5 integrate .. //depot/projects/mips/gnu/usr.bin/dialog/TESTS/Makefile#3 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/Makefile.inc#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/arch/alpha/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/arch/alpha/config.h#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/arch/alpha/init.c#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/arch/amd64/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/arch/amd64/config.h#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/arch/amd64/init.c#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/arch/i386/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/arch/i386/config.h#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/arch/i386/init.c#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/arch/ia64/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/arch/ia64/config.h#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/arch/ia64/init.c#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/arch/sparc64/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/arch/sparc64/config.h#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/arch/sparc64/init.c#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/gdb/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/gdb/gdb.1#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/gdbtui/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/kgdb/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/kgdb/kgdb.1#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/kgdb/kgdb.h#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/kgdb/kthr.c#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/kgdb/main.c#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/kgdb/trgt.c#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/kgdb/trgt_alpha.c#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/libgdb/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 integrate .. //depot/projects/mips/gnu/usr.bin/grep/grep.c#5 integrate .. //depot/projects/mips/gnu/usr.bin/groff/font/devX100-12/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/groff/font/devX100/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/groff/font/devX75-12/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/groff/font/devX75/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/groff/src/devices/grohtml/Makefile#5 integrate .. //depot/projects/mips/gnu/usr.bin/groff/src/preproc/html/Makefile#5 integrate .. //depot/projects/mips/gnu/usr.bin/groff/tmac/mdoc.local#10 integrate .. //depot/projects/mips/gnu/usr.bin/man/apropos/apropos.man#3 integrate .. //depot/projects/mips/gnu/usr.bin/man/man/man.man#3 integrate .. //depot/projects/mips/gnu/usr.bin/man/manpath/manpath.man#2 integrate .. //depot/projects/mips/gnu/usr.bin/send-pr/categories#4 integrate .. //depot/projects/mips/gnu/usr.bin/send-pr/send-pr.1#4 integrate .. //depot/projects/mips/gnu/usr.bin/tar/tar.1#4 integrate .. //depot/projects/mips/gnu/usr.bin/texinfo/infokey/Makefile#3 integrate .. //depot/projects/mips/include/Makefile#23 integrate .. //depot/projects/mips/include/arpa/Makefile#3 integrate .. //depot/projects/mips/include/fts.h#3 integrate .. //depot/projects/mips/include/netdb.h#5 integrate .. //depot/projects/mips/include/nl_types.h#2 integrate .. //depot/projects/mips/include/protocols/Makefile#3 integrate .. //depot/projects/mips/include/pthread.h#6 integrate .. //depot/projects/mips/include/pwd.h#3 integrate .. //depot/projects/mips/include/runefile.h#1 branch .. //depot/projects/mips/include/stdbool.h#2 integrate .. //depot/projects/mips/include/stdlib.h#8 integrate .. //depot/projects/mips/include/string.h#6 integrate .. //depot/projects/mips/include/unistd.h#9 integrate .. //depot/projects/mips/include/uuid.h#2 integrate .. //depot/projects/mips/installworld_newk#2 delete .. //depot/projects/mips/installworld_oldk#2 delete .. //depot/projects/mips/kerberos5/Makefile.inc#8 integrate .. //depot/projects/mips/kerberos5/include/config.h#6 integrate .. //depot/projects/mips/kerberos5/include/version.h#7 integrate .. //depot/projects/mips/kerberos5/lib/libasn1/Makefile#6 integrate .. //depot/projects/mips/kerberos5/libexec/ipropd-master/Makefile#5 integrate .. //depot/projects/mips/kerberos5/libexec/ipropd-slave/Makefile#5 integrate .. //depot/projects/mips/kerberos5/tools/asn1_compile/Makefile#2 integrate .. //depot/projects/mips/kerberos5/tools/make-print-version/Makefile#2 integrate .. //depot/projects/mips/kerberos5/tools/make-roken/Makefile#2 integrate .. //depot/projects/mips/kerberos5/usr.bin/krb5-config/Makefile#7 integrate .. //depot/projects/mips/kerberos5/usr.bin/ksu/Makefile#5 integrate .. //depot/projects/mips/lib/Makefile#16 integrate .. //depot/projects/mips/lib/bind/config.mk#2 integrate .. //depot/projects/mips/lib/csu/i386/Makefile#2 delete .. //depot/projects/mips/lib/csu/i386/c++rt0.c#2 delete .. //depot/projects/mips/lib/csu/i386/crt0.c#2 delete .. //depot/projects/mips/lib/libalias/alias_old.c#4 integrate .. //depot/projects/mips/lib/libalias/alias_skinny.c#5 integrate .. //depot/projects/mips/lib/libalias/libalias.3#5 integrate .. //depot/projects/mips/lib/libarchive/Makefile#6 integrate .. //depot/projects/mips/lib/libarchive/Makefile.am#2 integrate .. //depot/projects/mips/lib/libarchive/README#3 integrate .. //depot/projects/mips/lib/libarchive/archive.h.in#2 integrate .. //depot/projects/mips/lib/libarchive/archive_entry.c#6 integrate .. //depot/projects/mips/lib/libarchive/archive_entry.h#5 integrate .. //depot/projects/mips/lib/libarchive/archive_platform.h#5 integrate .. //depot/projects/mips/lib/libarchive/archive_read.3#6 integrate .. //depot/projects/mips/lib/libarchive/archive_read.c#6 integrate .. //depot/projects/mips/lib/libarchive/archive_read_extract.c#6 integrate .. //depot/projects/mips/lib/libarchive/archive_read_open_file.c#5 integrate .. //depot/projects/mips/lib/libarchive/archive_read_support_compression_bzip2.c#5 integrate .. //depot/projects/mips/lib/libarchive/archive_read_support_compression_gzip.c#6 integrate .. //depot/projects/mips/lib/libarchive/archive_read_support_compression_none.c#4 integrate .. //depot/projects/mips/lib/libarchive/archive_read_support_format_all.c#4 integrate .. //depot/projects/mips/lib/libarchive/archive_read_support_format_cpio.c#7 integrate .. //depot/projects/mips/lib/libarchive/archive_read_support_format_iso9660.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_read_support_format_tar.c#8 integrate .. //depot/projects/mips/lib/libarchive/archive_read_support_format_zip.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_string.c#6 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 17 23:12:17 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6542716A4DB; Thu, 17 Mar 2005 23:12:17 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3EF3216A4D8 for ; Thu, 17 Mar 2005 23:12:17 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1144443D39 for ; Thu, 17 Mar 2005 23:12:17 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2HNCGMx023771 for ; Thu, 17 Mar 2005 23:12:16 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2HNCGLW023767 for perforce@freebsd.org; Thu, 17 Mar 2005 23:12:16 GMT (envelope-from jmallett@freebsd.org) Date: Thu, 17 Mar 2005 23:12:16 GMT Message-Id: <200503172312.j2HNCGLW023767@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 73405 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, 17 Mar 2005 23:12:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=73405 Change 73405 by jmallett@jmallett_windward on 2005/03/17 23:12:04 4 big 3 big 2 big endian. Affected files ... .. //depot/projects/mips/share/mk/bsd.endian.mk#2 edit Differences ... ==== //depot/projects/mips/share/mk/bsd.endian.mk#2 (text+ko) ==== @@ -8,6 +8,7 @@ TARGET_ENDIANNESS= 1234 .elif ${MACHINE_ARCH} == "powerpc" || \ ${MACHINE_ARCH} == "sparc64" || \ - ${MACHINE_ARCH} == "arm" + ${MACHINE_ARCH} == "arm" || \ + ${MACHINE_ARCH} == "mips" TARGET_ENDIANNESS= 4321 .endif From owner-p4-projects@FreeBSD.ORG Thu Mar 17 23:25:36 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF0C016A4D0; Thu, 17 Mar 2005 23:25:35 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B8E8116A4CE for ; Thu, 17 Mar 2005 23:25:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9B66543D48 for ; Thu, 17 Mar 2005 23:25:35 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2HNPZUu025273 for ; Thu, 17 Mar 2005 23:25:35 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2HNPZew025270 for perforce@freebsd.org; Thu, 17 Mar 2005 23:25:35 GMT (envelope-from jmg@freebsd.org) Date: Thu, 17 Mar 2005 23:25:35 GMT Message-Id: <200503172325.j2HNPZew025270@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Subject: PERFORCE change 73407 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, 17 Mar 2005 23:25:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=73407 Change 73407 by jmg@jmg_carbon on 2005/03/17 23:24:35 pull in pmap.c v1.26.. Affected files ... .. //depot/projects/arm/src/sys/arm/arm/pmap.c#6 integrate Differences ... ==== //depot/projects/arm/src/sys/arm/arm/pmap.c#6 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.25 2005/03/06 21:10:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.26 2005/03/16 23:56:29 cognet Exp $"); #include #include #include @@ -2896,7 +2896,16 @@ return (sva); } +static void +pmap_wb_page(vm_page_t m) +{ + struct pv_entry *pv; + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) + pmap_dcache_wb_range(pv->pv_pmap, pv->pv_va, PAGE_SIZE, FALSE, + (pv->pv_flags & PVF_WRITE) == 0); +} + /* * Add a list of wired pages to the kva * this routine is only used for temporary @@ -2911,11 +2920,11 @@ int i; for (i = 0; i < count; i++) { + pmap_wb_page(m[i]); pmap_kenter_internal(va, VM_PAGE_TO_PHYS(m[i]), KENTER_CACHE); va += PAGE_SIZE; } - cpu_dcache_wbinv_all(); /* XXX: shouldn't be needed */ } From owner-p4-projects@FreeBSD.ORG Thu Mar 17 23:39:57 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B5EA16A4D0; Thu, 17 Mar 2005 23:39:57 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 33CA316A4CE for ; Thu, 17 Mar 2005 23:39:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A96343D31 for ; Thu, 17 Mar 2005 23:39:56 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2HNdugJ025720 for ; Thu, 17 Mar 2005 23:39:56 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2HNdr2A025717 for perforce@freebsd.org; Thu, 17 Mar 2005 23:39:53 GMT (envelope-from jmallett@freebsd.org) Date: Thu, 17 Mar 2005 23:39:53 GMT Message-Id: <200503172339.j2HNdr2A025717@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 73409 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, 17 Mar 2005 23:39:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=73409 Change 73409 by jmallett@jmallett_windward on 2005/03/17 23:39:38 Merge. Obtained from: GCC-3.4.2 Tarball Affected files ... .. //depot/projects/mips/contrib/gcc/config/mips/5400.md#2 edit .. //depot/projects/mips/contrib/gcc/config/mips/5500.md#2 edit .. //depot/projects/mips/contrib/gcc/config/mips/_tilib.c#2 edit .. //depot/projects/mips/contrib/gcc/config/mips/cross64.h#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/crti.asm#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/crtn.asm#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/dbxmdebug.h#2 edit .. //depot/projects/mips/contrib/gcc/config/mips/elf.h#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/elf64.h#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/elforion.h#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/freebsd.h#14 edit .. //depot/projects/mips/contrib/gcc/config/mips/iris3.h#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/iris4.h#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/iris5.h#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/iris5gas.h#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/iris6-o32-as.h#2 edit .. //depot/projects/mips/contrib/gcc/config/mips/iris6-o32-gas.h#2 edit .. //depot/projects/mips/contrib/gcc/config/mips/iris6-o32.h#2 edit .. //depot/projects/mips/contrib/gcc/config/mips/iris6.h#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/iris6gld.h#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/irix6-libc-compat.c#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/linux.h#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/mips-protos.h#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/mips.c#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/mips.h#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/mips.md#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/mips16.S#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/netbsd.h#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/openbsd-be.h#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/openbsd.h#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/r3900.h#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/rtems.h#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/rtems64.h#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/sni-gas.h#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/sni-svr4.h#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/sr71k.md#2 edit .. //depot/projects/mips/contrib/gcc/config/mips/t-cross64#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/t-ecoff#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/t-elf#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/t-gofast#2 edit .. //depot/projects/mips/contrib/gcc/config/mips/t-iris#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/t-iris5-6#2 edit .. //depot/projects/mips/contrib/gcc/config/mips/t-iris5-as#2 edit .. //depot/projects/mips/contrib/gcc/config/mips/t-iris5-gas#2 edit .. //depot/projects/mips/contrib/gcc/config/mips/t-iris6#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/t-isa3264#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/t-mips#2 edit .. //depot/projects/mips/contrib/gcc/config/mips/t-r3900#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/t-rtems#2 edit .. //depot/projects/mips/contrib/gcc/config/mips/t-sr71k#2 edit .. //depot/projects/mips/contrib/gcc/config/mips/t-vr#2 edit .. //depot/projects/mips/contrib/gcc/config/mips/vr.h#2 edit .. //depot/projects/mips/contrib/gcc/config/mips/vxworks.h#4 edit .. //depot/projects/mips/contrib/gcc/config/mips/xm-iris5.h#3 edit Differences ... ==== //depot/projects/mips/contrib/gcc/config/mips/5400.md#2 (text+ko) ==== @@ -44,11 +44,10 @@ ;; This reservation is for conditional move based on integer -;; or floating point CC. This could probably use some refinement -;; as "move" type attr seems to be overloaded in rtl. -(define_insn_reservation "ir_vr54_move" 4 +;; or floating point CC. +(define_insn_reservation "ir_vr54_condmove" 4 (and (eq_attr "cpu" "r5400") - (eq_attr "type" "move")) + (eq_attr "type" "condmove")) "vr54_dp0|vr54_dp1") ;; Move to/from FPU registers @@ -64,7 +63,7 @@ (define_insn_reservation "ir_vr54_arith" 1 (and (eq_attr "cpu" "r5400") - (eq_attr "type" "arith,darith,icmp,nop")) + (eq_attr "type" "move,arith,darith,const,icmp,nop")) "vr54_dp0|vr54_dp1") (define_insn_reservation "ir_vr54_imul_si" 3 ==== //depot/projects/mips/contrib/gcc/config/mips/5500.md#2 (text+ko) ==== @@ -37,11 +37,10 @@ "vr55_mem") ;; This reservation is for conditional move based on integer -;; or floating point CC. This could probably use some refinement -;; as "move" type attr seems to be overloaded in rtl. -(define_insn_reservation "ir_vr55_move" 2 +;; or floating point CC. +(define_insn_reservation "ir_vr55_condmove" 2 (and (eq_attr "cpu" "r5500") - (eq_attr "type" "move")) + (eq_attr "type" "condmove")) "vr55_dp0|vr55_dp1") ;; Move to/from FPU registers @@ -57,7 +56,7 @@ (define_insn_reservation "ir_vr55_arith" 1 (and (eq_attr "cpu" "r5500") - (eq_attr "type" "arith,darith,icmp,nop")) + (eq_attr "type" "move,arith,darith,const,icmp,nop")) "vr55_dp0|vr55_dp1") (define_insn_reservation "ir_vr55_imul_si" 3 ==== //depot/projects/mips/contrib/gcc/config/mips/_tilib.c#2 (text+ko) ==== @@ -21,8 +21,10 @@ #include "tconfig.h" +#include "coretypes.h" +#include "tm.h" -#if _MIPS_SIM == 2 /* N32 */ || _MIPS_SIM == 3 /* 64 */ +#if _MIPS_SIM == _ABIN32 || _MIPS_SIM == _ABI64 typedef int TItype __attribute__ ((mode (TI))); typedef int DItype __attribute__ ((mode (DI))); ==== //depot/projects/mips/contrib/gcc/config/mips/cross64.h#3 (text+ko) ==== ==== //depot/projects/mips/contrib/gcc/config/mips/crti.asm#3 (text+ko) ==== ==== //depot/projects/mips/contrib/gcc/config/mips/crtn.asm#4 (text+ko) ==== ==== //depot/projects/mips/contrib/gcc/config/mips/dbxmdebug.h#2 (text+ko) ==== ==== //depot/projects/mips/contrib/gcc/config/mips/elf.h#4 (text+ko) ==== @@ -1,40 +1,25 @@ /* Definitions of target machine for GNU compiler. MIPS R3000 version with GOFAST floating point library. - Copyright (C) 1994, 1997, 1999, 2000, 2002 Free Software Foundation, Inc. + Copyright (C) 1994, 1997, 1999, 2000, 2002, 2003, 2004 + Free Software Foundation, Inc. -This file is part of GNU CC. +This file is part of GCC. -GNU CC is free software; you can redistribute it and/or modify +GCC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. -GNU CC is distributed in the hope that it will be useful, +GCC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to +along with GCC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* Use ELF. */ -#undef OBJECT_FORMAT_COFF -#undef EXTENDED_COFF - -/* ??? Move all SDB stuff into separate header file. */ -#undef SDB_DEBUGGING_INFO - -#define DBX_DEBUGGING_INFO 1 -#define DWARF2_DEBUGGING_INFO 1 - -#undef PREFERRED_DEBUGGING_TYPE -#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG - -#undef SUBTARGET_ASM_DEBUGGING_SPEC -#define SUBTARGET_ASM_DEBUGGING_SPEC "-g0" - /* Biggest alignment supported by the object file format of this machine. Use this macro to limit the alignment which can be specified using the `__attribute__ ((aligned (N)))' construct. If @@ -47,19 +32,6 @@ #undef TARGET_ASM_NAMED_SECTION #define TARGET_ASM_NAMED_SECTION default_elf_asm_named_section -/* Given that Irix has it's own headers, not having TARGET_GAS here - seems a mistake. If we actually need to be prepared for file - switching, then we need a custom TARGET_ASM_NAMED_SECTION too. */ - -#undef TEXT_SECTION -#define TEXT_SECTION() \ -do { \ - if (TARGET_FILE_SWITCHING) \ - abort (); \ - fputs (TEXT_SECTION_ASM_OP, asm_out_file); \ - fputc ('\n', asm_out_file); \ -} while (0) - /* The following macro defines the format used to output the second operand of the .type assembler directive. Different svr4 assemblers expect various different forms for this operand. The one given here @@ -91,77 +63,16 @@ #define BSS_SECTION_ASM_OP "\t.section\t.bss" #endif -#undef SBSS_SECTION_ASM_OP -#define SBSS_SECTION_ASM_OP "\t.section .sbss" - -/* Like `ASM_OUTPUT_BSS' except takes the required alignment as a - separate, explicit argument. If you define this macro, it is used - in place of `ASM_OUTPUT_BSS', and gives you more flexibility in - handling the required alignment of the variable. The alignment is - specified as the number of bits. - - Try to use function `asm_output_aligned_bss' defined in file - `varasm.c' when defining this macro. */ #ifndef ASM_OUTPUT_ALIGNED_BSS -#define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \ -do { \ - (*targetm.asm_out.globalize_label) (FILE, NAME); \ - if (SIZE > 0 && SIZE <= mips_section_threshold) \ - sbss_section (); \ - else \ - bss_section (); \ - ASM_OUTPUT_ALIGN (FILE, floor_log2 (ALIGN / BITS_PER_UNIT)); \ - last_assemble_variable_decl = DECL; \ - ASM_DECLARE_OBJECT_NAME (FILE, NAME, DECL); \ - ASM_OUTPUT_SKIP (FILE, SIZE ? SIZE : 1); \ -} while (0) +#define ASM_OUTPUT_ALIGNED_BSS mips_output_aligned_bss #endif -/* These macros generate the special .type and .size directives which - are used to set the corresponding fields of the linker symbol table - entries in an ELF object file under SVR4. These macros also output - the starting labels for the relevant functions/objects. */ +#undef ASM_DECLARE_OBJECT_NAME +#define ASM_DECLARE_OBJECT_NAME mips_declare_object_name -/* Write the extra assembler code needed to declare an object properly. */ +#undef ASM_FINISH_DECLARE_OBJECT +#define ASM_FINISH_DECLARE_OBJECT mips_finish_declare_object -#undef ASM_DECLARE_OBJECT_NAME -#define ASM_DECLARE_OBJECT_NAME(FILE, NAME, DECL) \ - do { \ - HOST_WIDE_INT size; \ - ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "object"); \ - size_directive_output = 0; \ - if (!flag_inhibit_size_directive && DECL_SIZE (DECL)) \ - { \ - size_directive_output = 1; \ - size = int_size_in_bytes (TREE_TYPE (DECL)); \ - ASM_OUTPUT_SIZE_DIRECTIVE (FILE, NAME, size); \ - } \ - mips_declare_object (FILE, NAME, "", ":\n", 0); \ - } while (0) - -/* Output the size directive for a decl in rest_of_decl_compilation - in the case where we did not do so before the initializer. - Once we find the error_mark_node, we know that the value of - size_directive_output was set - by ASM_DECLARE_OBJECT_NAME when it was run for the same decl. */ - -#undef ASM_FINISH_DECLARE_OBJECT -#define ASM_FINISH_DECLARE_OBJECT(FILE, DECL, TOP_LEVEL, AT_END) \ -do { \ - const char *name = XSTR (XEXP (DECL_RTL (DECL), 0), 0); \ - HOST_WIDE_INT size; \ - \ - if (!flag_inhibit_size_directive && DECL_SIZE (DECL) \ - && ! AT_END && TOP_LEVEL \ - && DECL_INITIAL (DECL) == error_mark_node \ - && !size_directive_output) \ - { \ - size_directive_output = 1; \ - size = int_size_in_bytes (TREE_TYPE (DECL)); \ - ASM_OUTPUT_SIZE_DIRECTIVE (FILE, name, size); \ - } \ - } while (0) - #define ASM_OUTPUT_DEF(FILE,LABEL1,LABEL2) \ do { fputc ( '\t', FILE); \ assemble_name (FILE, LABEL1); \ @@ -196,28 +107,6 @@ #define MAKE_DECL_ONE_ONLY(DECL) (DECL_WEAK (DECL) = 1) -#define TARGET_ASM_UNIQUE_SECTION mips_unique_section - -/* A list of other sections which the compiler might be "in" at any - given time. */ -#undef EXTRA_SECTIONS -#define EXTRA_SECTIONS in_sdata, in_sbss - -#undef EXTRA_SECTION_FUNCTIONS -#define EXTRA_SECTION_FUNCTIONS \ - SECTION_FUNCTION_TEMPLATE(sdata_section, in_sdata, SDATA_SECTION_ASM_OP) \ - SECTION_FUNCTION_TEMPLATE(sbss_section, in_sbss, SBSS_SECTION_ASM_OP) - -#define SECTION_FUNCTION_TEMPLATE(FN, ENUM, OP) \ -void FN () \ -{ \ - if (in_section != ENUM) \ - { \ - fprintf (asm_out_file, "%s\n", OP); \ - in_section = ENUM; \ - } \ -} - /* On elf, we *do* have support for the .init and .fini sections, and we can put stuff in there to be executed before and after `main'. We let crtstuff.c and other files know this by defining the following symbols. @@ -234,12 +123,7 @@ #define LIB_SPEC "" #undef STARTFILE_SPEC -#if defined(HAVE_MIPS_LIBGLOSS_STARTUP_DIRECTIVES) \ - || (MIPS_ABI_DEFAULT == ABI_MEABI) #define STARTFILE_SPEC "crti%O%s crtbegin%O%s" -#else -#define STARTFILE_SPEC "crti%O%s crtbegin%O%s %{!mno-crt0:crt0%O%s}" -#endif #undef ENDFILE_SPEC #define ENDFILE_SPEC "crtend%O%s crtn%O%s" ==== //depot/projects/mips/contrib/gcc/config/mips/elf64.h#4 (text+ko) ==== @@ -1,38 +1,25 @@ /* Definitions of target machine for GNU compiler. MIPS R4000 version with GOFAST floating point library. - Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2002 + Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2002, 2004 Free Software Foundation, Inc. -This file is part of GNU CC. +This file is part of GCC. -GNU CC is free software; you can redistribute it and/or modify +GCC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. -GNU CC is distributed in the hope that it will be useful, +GCC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to +along with GCC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#undef OBJECT_FORMAT_COFF -#undef EXTENDED_COFF - -#undef SDB_DEBUGGING_INFO -#define DBX_DEBUGGING_INFO 1 -#define DWARF2_DEBUGGING_INFO 1 - -#undef PREFERRED_DEBUGGING_TYPE -#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG - -#undef SUBTARGET_ASM_DEBUGGING_SPEC -#define SUBTARGET_ASM_DEBUGGING_SPEC "-g0" - /* Biggest alignment supported by the object file format of this machine. Use this macro to limit the alignment which can be specified using the `__attribute__ ((aligned (N)))' construct. If @@ -45,19 +32,6 @@ #undef TARGET_ASM_NAMED_SECTION #define TARGET_ASM_NAMED_SECTION default_elf_asm_named_section -/* Given that Irix has it's own headers, not having TARGET_GAS here - seems a mistake. If we actually need to be prepared for file - switching, then we need a custom TARGET_ASM_NAMED_SECTION too. */ - -#undef TEXT_SECTION -#define TEXT_SECTION() \ -do { \ - if (TARGET_FILE_SWITCHING) \ - abort (); \ - fputs (TEXT_SECTION_ASM_OP, asm_out_file); \ - fputc ('\n', asm_out_file); \ -} while (0) - /* The following macro defines the format used to output the second operand of the .type assembler directive. Different svr4 assemblers expect various different forms for this operand. The one given here @@ -77,49 +51,11 @@ #define TYPE_ASM_OP "\t.type\t" #define SIZE_ASM_OP "\t.size\t" -/* These macros generate the special .type and .size directives which - are used to set the corresponding fields of the linker symbol table - entries in an ELF object file under SVR4. These macros also output - the starting labels for the relevant functions/objects. */ - -/* Write the extra assembler code needed to declare an object properly. */ - #undef ASM_DECLARE_OBJECT_NAME -#define ASM_DECLARE_OBJECT_NAME(FILE, NAME, DECL) \ - do { \ - HOST_WIDE_INT size; \ - ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "object"); \ - size_directive_output = 0; \ - if (!flag_inhibit_size_directive && DECL_SIZE (DECL)) \ - { \ - size_directive_output = 1; \ - size = int_size_in_bytes (TREE_TYPE (DECL)); \ - ASM_OUTPUT_SIZE_DIRECTIVE (FILE, NAME, size); \ - } \ - mips_declare_object (FILE, NAME, "", ":\n", 0); \ - } while (0) +#define ASM_DECLARE_OBJECT_NAME mips_declare_object_name -/* Output the size directive for a decl in rest_of_decl_compilation - in the case where we did not do so before the initializer. - Once we find the error_mark_node, we know that the value of - size_directive_output was set - by ASM_DECLARE_OBJECT_NAME when it was run for the same decl. */ - #undef ASM_FINISH_DECLARE_OBJECT -#define ASM_FINISH_DECLARE_OBJECT(FILE, DECL, TOP_LEVEL, AT_END) \ -do { \ - const char *name = XSTR (XEXP (DECL_RTL (DECL), 0), 0); \ - HOST_WIDE_INT size; \ - if (!flag_inhibit_size_directive && DECL_SIZE (DECL) \ - && ! AT_END && TOP_LEVEL \ - && DECL_INITIAL (DECL) == error_mark_node \ - && !size_directive_output) \ - { \ - size_directive_output = 1; \ - size = int_size_in_bytes (TREE_TYPE (DECL)); \ - ASM_OUTPUT_SIZE_DIRECTIVE (FILE, name, size); \ - } \ - } while (0) +#define ASM_FINISH_DECLARE_OBJECT mips_finish_declare_object #define ASM_OUTPUT_DEF(FILE,LABEL1,LABEL2) \ do { fputc ( '\t', FILE); \ @@ -155,27 +91,6 @@ #define MAKE_DECL_ONE_ONLY(DECL) (DECL_WEAK (DECL) = 1) -#define TARGET_ASM_UNIQUE_SECTION mips_unique_section - -/* A list of other sections which the compiler might be "in" at any - given time. */ -#undef EXTRA_SECTIONS -#define EXTRA_SECTIONS in_sdata - -#undef EXTRA_SECTION_FUNCTIONS -#define EXTRA_SECTION_FUNCTIONS \ - SECTION_FUNCTION_TEMPLATE(sdata_section, in_sdata, SDATA_SECTION_ASM_OP) - -#define SECTION_FUNCTION_TEMPLATE(FN, ENUM, OP) \ -void FN () \ -{ \ - if (in_section != ENUM) \ - { \ - fprintf (asm_out_file, "%s\n", OP); \ - in_section = ENUM; \ - } \ -} - /* On elf, we *do* have support for the .init and .fini sections, and we can put stuff in there to be executed before and after `main'. We let crtstuff.c and other files know this by defining the following symbols. @@ -192,12 +107,7 @@ #define LIB_SPEC "" #undef STARTFILE_SPEC -#if defined(HAVE_MIPS_LIBGLOSS_STARTUP_DIRECTIVES) \ - || (MIPS_ABI_DEFAULT == ABI_MEABI) #define STARTFILE_SPEC "crti%O%s crtbegin%O%s" -#else -#define STARTFILE_SPEC "crti%O%s crtbegin%O%s %{!mno-crt0:crt0%O%s}" -#endif #undef ENDFILE_SPEC #define ENDFILE_SPEC "crtend%O%s crtn%O%s" ==== //depot/projects/mips/contrib/gcc/config/mips/elforion.h#3 (text+ko) ==== @@ -2,20 +2,20 @@ GOFAST floating point library. Copyright (C) 1994, 1998 Free Software Foundation, Inc. -This file is part of GNU CC. +This file is part of GCC. -GNU CC is free software; you can redistribute it and/or modify +GCC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. -GNU CC is distributed in the hope that it will be useful, +GCC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to +along with GCC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ==== //depot/projects/mips/contrib/gcc/config/mips/freebsd.h#14 (text+ko) ==== ==== //depot/projects/mips/contrib/gcc/config/mips/iris3.h#4 (text+ko) ==== ==== //depot/projects/mips/contrib/gcc/config/mips/iris4.h#3 (text+ko) ==== ==== //depot/projects/mips/contrib/gcc/config/mips/iris5.h#4 (text+ko) ==== @@ -1,43 +1,43 @@ -/* Definitions of target machine for GNU compiler. Iris version 5. +/* Definitions of target machine for GNU compiler. IRIX version 5. Copyright (C) 1993, 1995, 1996, 1998, 2000, - 2001, 2002 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -This file is part of GNU CC. +This file is part of GCC. -GNU CC is free software; you can redistribute it and/or modify +GCC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. -GNU CC is distributed in the hope that it will be useful, +GCC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to +along with GCC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* We are compiling for IRIX now. */ +#undef TARGET_IRIX +#define TARGET_IRIX 1 + +/* Allow some special handling for IRIX 5. */ +#undef TARGET_IRIX5 #define TARGET_IRIX5 1 -#ifndef TARGET_DEFAULT -#define TARGET_DEFAULT MASK_ABICALLS -#endif #define ABICALLS_ASM_OP "\t.option pic2" -#include "mips/iris3.h" -#include "mips/mips.h" -#include "mips/iris4.h" +/* Dummy definition which allows EXTRA_SECTION_FUNCTIONS to be the same + for IRIX 5 and 6. */ +#define BSS_SECTION_ASM_OP "\t.data" -/* Irix 5 doesn't use COFF, so disable special COFF handling in collect2.c. */ -#undef OBJECT_FORMAT_COFF - /* ??? This is correct, but not very useful, because there is no file that uses this macro. */ /* ??? The best way to handle global constructors under ELF is to use .init and .fini sections. Unfortunately, there is apparently no way to get - the Irix 5.x (x <= 2) assembler to create these sections. So we instead + the IRIX 5.x (x <= 2) assembler to create these sections. So we instead use collect. The linker can create these sections via -init and -fini options, but using this would require modifying how crtstuff works, and I will leave that for another time (or someone else). */ @@ -58,20 +58,31 @@ #define WCHAR_TYPE_SIZE INT_TYPE_SIZE #define MAX_WCHAR_TYPE_SIZE 64 +/* Plain char is unsigned in the SGI compiler. */ +#undef DEFAULT_SIGNED_CHAR +#define DEFAULT_SIGNED_CHAR 0 + #define WORD_SWITCH_TAKES_ARG(STR) \ (DEFAULT_WORD_SWITCH_TAKES_ARG (STR) \ || !strcmp (STR, "rpath")) +/* We must pass -D_LONGLONG always, even when -ansi is used, because IRIX 5 + system header files require it. This is OK, because gcc never warns + when long long is used in system header files. Alternatively, we can + add support for the SGI builtin type __long_long. */ + #define TARGET_OS_CPP_BUILTINS() \ do { \ builtin_define_std ("host_mips"); \ builtin_define_std ("sgi"); \ builtin_define_std ("unix"); \ builtin_define_std ("SYSTYPE_SVR4"); \ + builtin_define ("_LONGLONG"); \ builtin_define ("_MODERN_C"); \ builtin_define ("_SVR4_SOURCE"); \ builtin_define ("__DSO__"); \ - builtin_define ("_MIPS_SIM=_MIPS_SIM_ABI32"); \ + builtin_define ("_ABIO32=1"); \ + builtin_define ("_MIPS_SIM=_ABIO32"); \ builtin_define ("_MIPS_SZPTR=32"); \ builtin_assert ("system=unix"); \ builtin_assert ("system=svr4"); \ @@ -102,6 +113,18 @@ #undef SUBTARGET_CC1_SPEC #define SUBTARGET_CC1_SPEC "%{static: -mno-abicalls}" +/* Override mips.h default: the IRIX 5 assembler warns about -O3: + + as1: Warning: .s, line 1: Binasm file dictates -pic: 2 + uld: + No ucode object file linked -- please use -O2 or lower. + + So avoid passing it in the first place. */ +#undef SUBTARGET_ASM_OPTIMIZING_SPEC +#define SUBTARGET_ASM_OPTIMIZING_SPEC "\ +%{noasmopt:-O0} \ +%{!noasmopt:%{O|O1|O2|O3:-O2}}" + #undef LINK_SPEC #define LINK_SPEC "\ %{G*} %{EB} %{EL} %{mips1} %{mips2} %{mips3} \ @@ -114,8 +137,7 @@ -_SYSTYPE_SVR4" /* We now support shared libraries. */ -#undef STARTFILE_SPEC -#define STARTFILE_SPEC "\ +#define IRIX_STARTFILE_SPEC "\ %{!static: \ %{!shared:%{pg:gcrt1.o%s}%{!pg:%{p:mcrt1.o%s libprof1.a%s}%{!p:crt1.o%s}}}} \ %{static: \ @@ -123,11 +145,16 @@ %{!pg:%{p:/usr/lib/nonshared/mcrt1.o%s libprof1.a%s} \ %{!p:/usr/lib/nonshared/crt1.o%s}}}" +#undef STARTFILE_SPEC +#define STARTFILE_SPEC "%(irix_startfile_spec)" + #undef LIB_SPEC #define LIB_SPEC "%{!shared:%{p:-lprof1} %{pg:-lprof1} -lc}" +#define IRIX_ENDFILE_SPEC "%{!shared:crtn.o%s}" + #undef ENDFILE_SPEC -#define ENDFILE_SPEC "%{!shared:crtn.o%s}" +#define ENDFILE_SPEC "%(irix_endfile_spec)" /* We do not want to run mips-tfile! */ #undef ASM_FINAL_SPEC @@ -143,7 +170,6 @@ /* We don't support debugging info for now. */ #undef DBX_DEBUGGING_INFO -#undef SDB_DEBUGGING_INFO #undef MIPS_DEBUGGING_INFO #undef PREFERRED_DEBUGGING_TYPE @@ -153,7 +179,19 @@ #undef MACHINE_TYPE #define MACHINE_TYPE "SGI running IRIX 5.x" - /* Dollar signs are OK in Irix5 but not in Irix3. */ +/* Always use 1 for .file number. I [meissner@osf.org] wonder why + IRIX needs this. */ + +#undef SET_FILE_NUMBER +#define SET_FILE_NUMBER() num_source_filenames = 1 + +/* Put out a label after a .loc. I [meissner@osf.org] wonder why + IRIX needs this. */ + +#undef LABEL_AFTER_LOC +#define LABEL_AFTER_LOC(STREAM) fprintf (STREAM, "LM%d:\n", ++sym_lineno) + + /* Dollar signs are OK in IRIX 5 but not in IRIX 3. */ #undef DOLLARS_IN_IDENTIFIERS #undef NO_DOLLAR_IN_LABEL @@ -162,20 +200,73 @@ #undef MIPS_DEFAULT_GVALUE #define MIPS_DEFAULT_GVALUE 0 -/* In Irix 5, we must output a `.global name .text' directive for every used - but undefined function. If we don't, the linker may perform an optimization - (skipping over the insns that set $gp) when it is unsafe. This is used - indirectly by ASM_OUTPUT_EXTERNAL. */ -#define ASM_OUTPUT_UNDEF_FUNCTION(FILE, NAME) \ -do { \ - fputs ("\t.globl ", FILE); \ - assemble_name (FILE, NAME); \ - fputs (" .text\n", FILE); \ +/* Switch into a generic section. */ +#undef TARGET_ASM_NAMED_SECTION +#define TARGET_ASM_NAMED_SECTION irix_asm_named_section + +/* Define functions to read the name and flags of the current section. + They are used by irix_asm_output_align. */ + +#undef EXTRA_SECTION_FUNCTIONS +#define EXTRA_SECTION_FUNCTIONS \ +const char * \ +current_section_name (void) \ +{ \ + switch (in_section) \ + { \ + case no_section: return NULL; \ + case in_text: return ".text"; \ + case in_data: return ".data"; \ + case in_bss: return ".bss"; \ + case in_readonly_data: \ + if (mips_abi != ABI_32 && mips_abi != ABI_O64) \ + return ".rodata"; \ + else \ + return ".rdata"; \ + case in_named: \ + return in_named_name; \ + } \ + abort (); \ +} \ + \ +unsigned int \ +current_section_flags (void) \ +{ \ + switch (in_section) \ + { \ + case no_section: return 0; \ + case in_text: return SECTION_CODE; \ + case in_data: return SECTION_WRITE; \ + case in_bss: return SECTION_WRITE | SECTION_BSS; \ + case in_readonly_data: return 0; \ + case in_named: return get_named_section_flags (in_named_name); \ + } \ + abort (); \ +} + +/* Some assemblers have a bug that causes backslash escaped chars in .ascii + to be misassembled, so avoid it by using .byte instead. Write the original + string in a comment, partly to improve readability and partly for the sake + of scan-assembler-type tests. */ +#undef ASM_OUTPUT_ASCII +#define ASM_OUTPUT_ASCII(FILE,PTR,LEN) \ +do { \ + const unsigned char *s_ = (const unsigned char *)(PTR); \ + unsigned len_ = (LEN); \ + unsigned i_; \ + mips_output_ascii (FILE, (const char *) s_, len_, "\t# "); \ + for (i_ = 0; i_ < len_; s_++, i_++) \ + { \ + if ((i_ % 8) == 0) \ + fputs ("\n\t.byte\t", (FILE)); \ + fprintf ((FILE), "%s0x%x", (i_%8?",":""), *s_); \ + } \ + fputs ("\n", (FILE)); \ } while (0) /* Also do this for libcalls. */ -#define ASM_OUTPUT_EXTERNAL_LIBCALL(FILE, FUN) \ - mips_output_external_libcall (FILE, XSTR (FUN, 0)) +#undef TARGET_ASM_EXTERNAL_LIBCALL +#define TARGET_ASM_EXTERNAL_LIBCALL irix_output_external_libcall /* This does for functions what ASM_DECLARE_OBJECT_NAME does for variables. This is used indirectly by ASM_OUTPUT_EXTERNAL. */ @@ -206,3 +297,8 @@ /* Handle #pragma weak and #pragma pack. */ #define HANDLE_SYSV_PRAGMA 1 + +#undef SUBTARGET_EXTRA_SPECS +#define SUBTARGET_EXTRA_SPECS \ + { "irix_startfile_spec", IRIX_STARTFILE_SPEC }, \ + { "irix_endfile_spec", IRIX_ENDFILE_SPEC }, ==== //depot/projects/mips/contrib/gcc/config/mips/iris5gas.h#4 (text+ko) ==== @@ -1,21 +1,31 @@ -/* Definitions of target machine for GNU compiler. Irix version 5 with gas. */ +/* Definitions of target machine for GNU compiler. IRIX version 5 with gas. + Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 + Free Software Foundation, Inc. + + This file is part of GCC. + + GCC is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + GCC is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GCC; see the file COPYING. If not, write to + the Free Software Foundation, 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ -/* Enable debugging. */ -#define DBX_DEBUGGING_INFO 1 -#define DWARF2_DEBUGGING_INFO 1 -#define SDB_DEBUGGING_INFO 1 -#define MIPS_DEBUGGING_INFO 1 +/* Reenable debugging. */ #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG /* GNU as does handle DWARF2 directives. */ #undef DWARF2_UNWIND_INFO #define DWARF2_UNWIND_INFO 1 -/* Override mips.h version to match DWARF 2 default. */ -#undef MDEBUG_ASM_SPEC -#define MDEBUG_ASM_SPEC "%{gstabs*|gcoff*:-mdebug} \ -%{!gstabs*:%{!gcoff*:-no-mdebug}}" - /* Override iris5.h version to invoke [cd]tors and register eh frame information. */ #undef LINK_SPEC @@ -33,17 +43,10 @@ /* Override iris5.h versions to include crtbegin.o and crtend.o. */ #undef STARTFILE_SPEC -#define STARTFILE_SPEC "\ -%{!static: \ - %{!shared:%{pg:gcrt1.o%s}%{!pg:%{p:mcrt1.o%s libprof1.a%s}%{!p:crt1.o%s}}}} \ -%{static: \ - %{pg:gcrt1.o%s} \ - %{!pg:%{p:/usr/lib/nonshared/mcrt1.o%s libprof1.a%s} \ - %{!p:/usr/lib/nonshared/crt1.o%s}}} \ -crtbegin.o%s" +#define STARTFILE_SPEC "%(irix_startfile_spec) crtbegin.o%s" #undef ENDFILE_SPEC -#define ENDFILE_SPEC "crtend.o%s %{!shared:crtn.o%s}" +#define ENDFILE_SPEC "crtend.o%s %(irix_endfile_spec)" /* Irix 5 does not have some strange restrictions that Irix 3 had. */ #undef SET_FILE_NUMBER @@ -55,30 +58,26 @@ avoid conflicting with ELF directives. These are only recognized by gas, anyhow, not the native assembler. */ #undef PUT_SDB_SIZE -#define PUT_SDB_SIZE(a) \ -do { \ - extern FILE *asm_out_text_file; \ - fprintf (asm_out_text_file, "\t.esize\t"); \ - fprintf (asm_out_text_file, HOST_WIDE_INT_PRINT_DEC, (HOST_WIDE_INT) (a)); \ - fprintf (asm_out_text_file, ";"); \ +#define PUT_SDB_SIZE(a) \ +do { \ + fprintf (asm_out_file, "\t.esize\t" HOST_WIDE_INT_PRINT_DEC ";", \ + (HOST_WIDE_INT) (a)); \ } while (0) #undef PUT_SDB_TYPE -#define PUT_SDB_TYPE(a) \ -do { \ - extern FILE *asm_out_text_file; \ - fprintf (asm_out_text_file, "\t.etype\t0x%x;", (a)); \ +#define PUT_SDB_TYPE(a) \ +do { \ + fprintf (asm_out_file, "\t.etype\t0x%x;", (a)); \ } while (0) -/* Switch into a generic section. */ -#undef TARGET_ASM_NAMED_SECTION -#define TARGET_ASM_NAMED_SECTION default_elf_asm_named_section - /* Add -g to mips.h default to avoid confusing gas with local symbols generated from stabs info. */ #undef NM_FLAGS #define NM_FLAGS "-Bng" /* Disable SHF_MERGE support. Even if gas supports it, the IRIX ld does not - without a special elspec(5) file. */ + without a special elspec(5) file. + + FIXME: Only do this if not using GNU ld. */ #undef HAVE_GAS_SHF_MERGE +#define HAVE_GAS_SHF_MERGE 0 ==== //depot/projects/mips/contrib/gcc/config/mips/iris6-o32-as.h#2 (text+ko) ==== ==== //depot/projects/mips/contrib/gcc/config/mips/iris6-o32-gas.h#2 (text+ko) ==== ==== //depot/projects/mips/contrib/gcc/config/mips/iris6-o32.h#2 (text+ko) ==== ==== //depot/projects/mips/contrib/gcc/config/mips/iris6.h#4 (text+ko) ==== @@ -1,43 +1,38 @@ -/* Definitions of target machine for GNU compiler. Iris version 6. - Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003 +/* Definitions of target machine for GNU compiler. IRIX version 6. + Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -This file is part of GNU CC. +This file is part of GCC. -GNU CC is free software; you can redistribute it and/or modify +GCC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. -GNU CC is distributed in the hope that it will be useful, +GCC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to +along with GCC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* Let mips.c know we need the Irix6 functions. */ -#define TARGET_IRIX6 1 +/* No more special IRIX 5 handling. */ +#undef TARGET_IRIX5 +#define TARGET_IRIX5 0 /* Default to -mabi=n32 and -mips3. */ -#define MIPS_ISA_DEFAULT 3 -#define MIPS_ABI_DEFAULT ABI_N32 +#undef MULTILIB_DEFAULTS #define MULTILIB_DEFAULTS { "mabi=n32" } -#ifndef TARGET_DEFAULT -#define TARGET_DEFAULT (MASK_ABICALLS|MASK_FLOAT64|MASK_64BIT) -#endif - -#include "mips/iris5.h" - -/* Irix6 assembler does handle DWARF2 directives. Override setting in - irix5.h file. */ +/* The IRIX 6 O32 assembler cannot calculate label differences, while both + the N32/N64 assembler and gas can. Override setting in iris5.h file. */ #undef DWARF2_UNWIND_INFO +#define DWARF2_UNWIND_INFO !TARGET_SGI_O32_AS -/* The Irix6 assembler will sometimes assign labels to the wrong +/* The IRIX 6 assembler will sometimes assign labels to the wrong section unless the labels are within .ent/.end blocks. Therefore, we avoid creating such labels. */ #define DWARF2_GENERATE_TEXT_SECTION_LABEL 0 @@ -58,19 +53,25 @@ #undef WINT_TYPE_SIZE #define WINT_TYPE_SIZE 32 -/* For Irix 6, -mabi=64 implies TARGET_LONG64. */ +/* For IRIX 6, -mabi=64 implies TARGET_LONG64. */ /* This is handled in override_options. */ +/* Default to the mips2 ISA for the O32 ABI. */ #undef SUBTARGET_CC1_SPEC -#define SUBTARGET_CC1_SPEC "" +#define SUBTARGET_CC1_SPEC "%{mabi=32: %{!mips*: -mips2}}" + +/* #line directives let the O32 assembler create object files that cause the + O32 linker to crash. */ +#undef SUBTARGET_CPP_SPEC +#define SUBTARGET_CPP_SPEC "%{mabi=32: %{.S:-P}}" -/* We must pass -D_LONGLONG always, even when -ansi is used, because irix6 +/* We must pass -D_LONGLONG always, even when -ansi is used, because IRIX 6 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 17 23:44:02 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19AB116A4D0; Thu, 17 Mar 2005 23:44:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EA72616A4CE for ; Thu, 17 Mar 2005 23:44:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BFE5F43D46 for ; Thu, 17 Mar 2005 23:44:01 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2HNi1HT025931 for ; Thu, 17 Mar 2005 23:44:01 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2HNi1Fm025928 for perforce@freebsd.org; Thu, 17 Mar 2005 23:44:01 GMT (envelope-from jmallett@freebsd.org) Date: Thu, 17 Mar 2005 23:44:01 GMT Message-Id: <200503172344.j2HNi1Fm025928@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 73410 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, 17 Mar 2005 23:44:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=73410 Change 73410 by jmallett@jmallett_windward on 2005/03/17 23:43:15 Add. Obtained from: GCC-3.4.2 Tarball Affected files ... .. //depot/projects/mips/contrib/gcc/config/mips/7000.md#1 add .. //depot/projects/mips/contrib/gcc/config/mips/9000.md#1 add .. //depot/projects/mips/contrib/gcc/config/mips/iris5gld.h#1 add .. //depot/projects/mips/contrib/gcc/config/mips/iris6gas.h#1 add .. //depot/projects/mips/contrib/gcc/config/mips/irix-crti.asm#1 add .. //depot/projects/mips/contrib/gcc/config/mips/irix-crtn.asm#1 add .. //depot/projects/mips/contrib/gcc/config/mips/linux64.h#1 add .. //depot/projects/mips/contrib/gcc/config/mips/mips-modes.def#1 add .. //depot/projects/mips/contrib/gcc/config/mips/sdb.h#1 add .. //depot/projects/mips/contrib/gcc/config/mips/t-irix-gld#1 add .. //depot/projects/mips/contrib/gcc/config/mips/t-linux64#1 add .. //depot/projects/mips/contrib/gcc/config/mips/t-vxworks#1 add .. //depot/projects/mips/contrib/gcc/config/mips/windiss.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Mar 18 02:25:22 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADA8716A4D0; Fri, 18 Mar 2005 02:25:20 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5EEE916A4CE for ; Fri, 18 Mar 2005 02:25:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1080C43D2D for ; Fri, 18 Mar 2005 02:25:20 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2I2PJmD044853 for ; Fri, 18 Mar 2005 02:25:19 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2I2PJtX044850 for perforce@freebsd.org; Fri, 18 Mar 2005 02:25:19 GMT (envelope-from jmallett@freebsd.org) Date: Fri, 18 Mar 2005 02:25:19 GMT Message-Id: <200503180225.j2I2PJtX044850@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 73419 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, 18 Mar 2005 02:25:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=73419 Change 73419 by jmallett@jmallett_windward on 2005/03/18 02:24:42 Hack hack hack. It's like giving a haircut using a lawnmower. Affected files ... .. //depot/projects/mips/contrib/gcc/config/mips/freebsd.h#15 edit .. //depot/projects/mips/gnu/usr.bin/binutils/Makefile.inc0#8 edit .. //depot/projects/mips/gnu/usr.bin/binutils/as/Makefile#4 edit .. //depot/projects/mips/gnu/usr.bin/binutils/as/config.h#2 edit .. //depot/projects/mips/gnu/usr.bin/binutils/as/mips-freebsd/Makefile#2 delete .. //depot/projects/mips/gnu/usr.bin/binutils/as/mips-freebsd/config.h#8 delete .. //depot/projects/mips/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h#3 edit .. //depot/projects/mips/gnu/usr.bin/binutils/ld/Makefile.mips#11 edit .. //depot/projects/mips/gnu/usr.bin/cc/cc_tools/Makefile#13 edit Differences ... ==== //depot/projects/mips/contrib/gcc/config/mips/freebsd.h#15 (text+ko) ==== @@ -41,9 +41,6 @@ /* mips.h gets this wrong for FreeBSD. We use the GCC defaults instead. */ #undef WCHAR_TYPE -#undef WCHAR_UNSIGNED -#define WCHAR_UNSIGNED 0 - #undef WCHAR_TYPE_SIZE #define WCHAR_TYPE_SIZE 32 ==== //depot/projects/mips/gnu/usr.bin/binutils/Makefile.inc0#8 (text+ko) ==== @@ -7,12 +7,17 @@ VERSION= "2.15 [FreeBSD] 2004-05-23" TARGET_ARCH?= ${MACHINE_ARCH} +.if ${TARGET_ARCH} == "mips" +BINUTILS_ARCH=mips64 +TARGET_TUPLE?= ${BINUTILS_ARCH}-juli-freebsd +.else .if ${TARGET_ARCH} == "amd64" BINUTILS_ARCH=x86_64 .else BINUTILS_ARCH=${TARGET_ARCH} .endif TARGET_TUPLE?= ${BINUTILS_ARCH}-obrien-freebsd +.endif # RELTOP is the relative path to this point in the source or object # tree, from any subdirectory of same. It gets extra "../" prefixes ==== //depot/projects/mips/gnu/usr.bin/binutils/as/Makefile#4 (text+ko) ==== @@ -17,8 +17,10 @@ input-scrub.c listing.c literal.c macro.c messages.c \ obj-elf.c output-file.c read.c sb.c stabs.c \ subsegs.c symbols.c write.c depend.c ehopt.c dw2gencfi.c -# DEO: why not used? -#SRCS+= itbl-ops.c + +.if ${TARGET_ARCH} == "mips" +SRCS+= itbl-ops.c +.endif .if ${TARGET_ARCH} == "amd64" SRCS+= tc-i386.c ==== //depot/projects/mips/gnu/usr.bin/binutils/as/config.h#2 (text+ko) ==== @@ -164,16 +164,16 @@ /* #undef TARGET_BYTES_BIG_ENDIAN */ /* Default CPU for MIPS targets. */ -/* #undef MIPS_CPU_STRING_DEFAULT */ +#define MIPS_CPU_STRING_DEFAULT "r4000" /* Allow use of E_MIPS_ABI_O32 on MIPS targets. */ -/* #undef USE_E_MIPS_ABI_O32 */ +#define USE_E_MIPS_ABI_O32 0 /* Generate 64-bit code by default on MIPS targets. */ -/* #undef MIPS_DEFAULT_64BIT */ +#define MIPS_DEFAULT_64BIT 1 /* Choose a default ABI for MIPS targets. */ -/* #undef MIPS_DEFAULT_ABI */ +#define MIPS_DEFAULT_ABI N64_ABI /* Default architecture. */ /* #define DEFAULT_ARCH "i386" */ ==== //depot/projects/mips/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h#3 (text+ko) ==== @@ -1,6 +1,3 @@ /* $FreeBSD: src/gnu/usr.bin/binutils/as/powerpc-freebsd/itbl-cpu.h,v 1.2 2002/05/18 04:50:32 obrien Exp $ */ -/* Values for processors will be from 0 to NUMBER_OF_PROCESSORS-1 */ -#define NUMBER_OF_PROCESSORS 1 - #include "itbl-mips.h" ==== //depot/projects/mips/gnu/usr.bin/binutils/ld/Makefile.mips#11 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD$ -TARGET_TUPLE= mips-jmallett-freebsd +TARGET_TUPLE= mips-juli-freebsd .if ${TARGET_ARCH} == "mips" DEFAULT_EMULATION?= elf32btsmipn32 ==== //depot/projects/mips/gnu/usr.bin/cc/cc_tools/Makefile#13 (text+ko) ==== @@ -214,9 +214,6 @@ .if ${TARGET_ARCH} == "amd64" TARGET_INC= i386/biarch64.h .endif -.if ${TARGET_ARCH} == "mips" -TARGET_INC+= ${GCC_CPU}/freebsd.h -.endif TARGET_INC+= ${GCC_CPU}/${GCC_CPU}.h .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/unix.h @@ -240,9 +237,7 @@ TARGET_INC+= ${GCC_CPU}/sysv4.h .endif .endif -.if ${TARGET_ARCH} != "mips" TARGET_INC+= ${GCC_CPU}/freebsd.h -.endif .if ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/x86-64.h TARGET_INC+= ${GCC_CPU}/freebsd64.h From owner-p4-projects@FreeBSD.ORG Fri Mar 18 02:49:51 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED63716A520; Fri, 18 Mar 2005 02:49:50 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C23FB16A4E6 for ; Fri, 18 Mar 2005 02:49:50 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E52143D49 for ; Fri, 18 Mar 2005 02:49:50 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2I2noUt045885 for ; Fri, 18 Mar 2005 02:49:50 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2I2noVR045882 for perforce@freebsd.org; Fri, 18 Mar 2005 02:49:50 GMT (envelope-from jmallett@freebsd.org) Date: Fri, 18 Mar 2005 02:49:50 GMT Message-Id: <200503180249.j2I2noVR045882@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 73421 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, 18 Mar 2005 02:49:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=73421 Change 73421 by jmallett@jmallett_windward on 2005/03/18 02:49:15 Of all the things I've lost I miss my working toolchain the most. Like, seriously. This is pain. Affected files ... .. //depot/projects/mips/gnu/usr.bin/binutils/as/Makefile#5 edit Differences ... ==== //depot/projects/mips/gnu/usr.bin/binutils/as/Makefile#5 (text+ko) ==== @@ -19,7 +19,7 @@ subsegs.c symbols.c write.c depend.c ehopt.c dw2gencfi.c .if ${TARGET_ARCH} == "mips" -SRCS+= itbl-ops.c +SRCS+= itbl-lex.l itbl-ops.c itbl-parse.y .endif .if ${TARGET_ARCH} == "amd64" From owner-p4-projects@FreeBSD.ORG Fri Mar 18 03:20:28 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F3B116A4D1; Fri, 18 Mar 2005 03:20:28 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 71E9716A4CE for ; Fri, 18 Mar 2005 03:20:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4923143D5E for ; Fri, 18 Mar 2005 03:20:28 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2I3KSqF047756 for ; Fri, 18 Mar 2005 03:20:28 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2I3KRVa047753 for perforce@freebsd.org; Fri, 18 Mar 2005 03:20:27 GMT (envelope-from jmallett@freebsd.org) Date: Fri, 18 Mar 2005 03:20:27 GMT Message-Id: <200503180320.j2I3KRVa047753@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 73423 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, 18 Mar 2005 03:20:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=73423 Change 73423 by jmallett@jmallett_windward on 2005/03/18 03:19:40 Yes MIPS does no PIE. (Unless I missed something.) (Like maybe I forgot to update the emulparams or something.) Affected files ... .. //depot/projects/mips/gnu/usr.bin/binutils/ld/Makefile#8 edit Differences ... ==== //depot/projects/mips/gnu/usr.bin/binutils/ld/Makefile#8 (text+ko) ==== @@ -28,7 +28,10 @@ HOST= ${TARGET_TUPLE} LIBSERACHPATH= \"${TOOLS_PREFIX}/lib\":\"${TOOLS_PREFIX}/usr/lib\" -ELF_SCR_EXT= x xbn xn xr xs xu xc xsc xd xdc +ELF_SCR_EXT= x xbn xn xr xs xu xc xsc +if ${TARGET_ARCH} != "mips" +ELF_SCR_EXR+= xd xdc +.endif .for ext in ${ELF_SCR_EXT} LDSCRIPTS+= ${NATIVE_EMULATION}.${ext} .endfor From owner-p4-projects@FreeBSD.ORG Fri Mar 18 03:21:30 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72EF416A4D0; Fri, 18 Mar 2005 03:21:30 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3674716A4CE for ; Fri, 18 Mar 2005 03:21:30 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 07BD143D49 for ; Fri, 18 Mar 2005 03:21:30 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2I3LTMn047798 for ; Fri, 18 Mar 2005 03:21:29 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2I3LTKj047789 for perforce@freebsd.org; Fri, 18 Mar 2005 03:21:29 GMT (envelope-from jmallett@freebsd.org) Date: Fri, 18 Mar 2005 03:21:29 GMT Message-Id: <200503180321.j2I3LTKj047789@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 73424 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, 18 Mar 2005 03:21:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=73424 Change 73424 by jmallett@jmallett_windward on 2005/03/18 03:21:10 I'm a moron. Affected files ... .. //depot/projects/mips/gnu/usr.bin/binutils/ld/Makefile#9 edit Differences ... ==== //depot/projects/mips/gnu/usr.bin/binutils/ld/Makefile#9 (text+ko) ==== @@ -29,7 +29,7 @@ HOST= ${TARGET_TUPLE} LIBSERACHPATH= \"${TOOLS_PREFIX}/lib\":\"${TOOLS_PREFIX}/usr/lib\" ELF_SCR_EXT= x xbn xn xr xs xu xc xsc -if ${TARGET_ARCH} != "mips" +.if ${TARGET_ARCH} != "mips" ELF_SCR_EXR+= xd xdc .endif .for ext in ${ELF_SCR_EXT} From owner-p4-projects@FreeBSD.ORG Fri Mar 18 03:23:33 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CE0E16A4D1; Fri, 18 Mar 2005 03:23:33 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 378CB16A4CE for ; Fri, 18 Mar 2005 03:23:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0656143D55 for ; Fri, 18 Mar 2005 03:23:33 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2I3NWM6047873 for ; Fri, 18 Mar 2005 03:23:32 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2I3NWkD047870 for perforce@freebsd.org; Fri, 18 Mar 2005 03:23:32 GMT (envelope-from jmallett@freebsd.org) Date: Fri, 18 Mar 2005 03:23:32 GMT Message-Id: <200503180323.j2I3NWkD047870@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 73425 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, 18 Mar 2005 03:23:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=73425 Change 73425 by jmallett@jmallett_windward on 2005/03/18 03:22:52 Be like the cool kids. Affected files ... .. //depot/projects/mips/gnu/usr.bin/binutils/ld/Makefile.mips#12 edit Differences ... ==== //depot/projects/mips/gnu/usr.bin/binutils/ld/Makefile.mips#12 (text+ko) ==== @@ -1,27 +1,18 @@ # $FreeBSD$ -TARGET_TUPLE= mips-juli-freebsd +TARGET_TUPLE= mips-juli-freebsd -.if ${TARGET_ARCH} == "mips" -DEFAULT_EMULATION?= elf32btsmipn32 +NATIVE_EMULATION?= elf32btsmipn32 EMULATIONS= elf32btsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip +EMS+= ${EMULATIONS} -HOST= ${TARGET_TUPLE} -CFLAGS+= -DDEFAULT_EMULATION=\"${DEFAULT_EMULATION}\" -CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\" -_mips_path= \"${TOOLS_PREFIX}/usr/lib\" -.else -_mips_path= \"/usr/cross/mips-freebsd/usr/lib\" -.endif -EMS+= ${EMULATIONS} - .for _EMULATION in ${EMULATIONS} LDSCRIPTS+= ${_EMULATION}.x ${_EMULATION}.xbn ${_EMULATION}.xn ${_EMULATION}.xr ${_EMULATION}.xs ${_EMULATION}.xu ${_EMULATION}.xsc SRCS+= e${_EMULATION}.c CLEANFILES+= e${_EMULATION}.c e${_EMULATION}.c: emulparams/${_EMULATION}.sh emultempl/elf32.em \ scripttempl/mips.sc genscripts.sh stringify.sed - sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_mips_path} \ + sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSERACHPATH} \ ${TOOLS_PREFIX}/usr \ ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ ${_EMULATION} "" no ${_EMULATION} ${TARGET_TUPLE} From owner-p4-projects@FreeBSD.ORG Fri Mar 18 04:07:29 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B480716A4D0; Fri, 18 Mar 2005 04:07:28 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A8BC16A4CE for ; Fri, 18 Mar 2005 04:07:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6E1BB43D2F for ; Fri, 18 Mar 2005 04:07:28 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2I47Sbt050055 for ; Fri, 18 Mar 2005 04:07:28 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2I47SXx050052 for perforce@freebsd.org; Fri, 18 Mar 2005 04:07:28 GMT (envelope-from jmallett@freebsd.org) Date: Fri, 18 Mar 2005 04:07:28 GMT Message-Id: <200503180407.j2I47SXx050052@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 73428 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, 18 Mar 2005 04:07:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=73428 Change 73428 by jmallett@jmallett_windward on 2005/03/18 04:06:29 I should say what I mean (I should mean what I say.) Correct a lacking of correctness with a half-assed go at something more interesting. Affected files ... .. //depot/projects/mips/gnu/usr.bin/binutils/ld/Makefile.mips#13 edit Differences ... ==== //depot/projects/mips/gnu/usr.bin/binutils/ld/Makefile.mips#13 (text+ko) ==== @@ -1,10 +1,10 @@ # $FreeBSD$ -TARGET_TUPLE= mips-juli-freebsd +TARGET_TUPLE= mips-juli-freebsd -NATIVE_EMULATION?= elf32btsmipn32 -EMULATIONS= elf32btsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip -EMS+= ${EMULATIONS} +NATIVE_EMULATION=elf64btsmip +EMULATIONS= elf32btsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip +EMS+= ${EMULATIONS} .for _EMULATION in ${EMULATIONS} LDSCRIPTS+= ${_EMULATION}.x ${_EMULATION}.xbn ${_EMULATION}.xn ${_EMULATION}.xr ${_EMULATION}.xs ${_EMULATION}.xu ${_EMULATION}.xsc From owner-p4-projects@FreeBSD.ORG Fri Mar 18 05:12:48 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A635016A4D0; Fri, 18 Mar 2005 05:12:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 638F116A4CE for ; Fri, 18 Mar 2005 05:12:47 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A9B543D1D for ; Fri, 18 Mar 2005 05:12:47 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2I5Clbc060123 for ; Fri, 18 Mar 2005 05:12:47 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2I5CkTT060120 for perforce@freebsd.org; Fri, 18 Mar 2005 05:12:46 GMT (envelope-from jmallett@freebsd.org) Date: Fri, 18 Mar 2005 05:12:46 GMT Message-Id: <200503180512.j2I5CkTT060120@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 73429 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, 18 Mar 2005 05:12:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=73429 Change 73429 by jmallett@jmallett_windward on 2005/03/18 05:12:21 The compiler works, now I have to find something else to do again. Affected files ... .. //depot/projects/mips/sys/conf/Makefile.mips#16 edit Differences ... ==== //depot/projects/mips/sys/conf/Makefile.mips#16 (text+ko) ==== @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 500013 +%VERSREQ= 600001 # We support multiple platforms, and would do well to have a variable for # the platform we are building for. @@ -40,8 +40,7 @@ .endif .include "$S/conf/kern.pre.mk" -MIPSOPTS?= -mips3 -CFLAGS+= -D${PLATFORM} ${MIPSOPTS} +CFLAGS+= -D${PLATFORM} # Disable the gp. LDFLAGS+= -G0 From owner-p4-projects@FreeBSD.ORG Fri Mar 18 05:16:53 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10D1D16A4D0; Fri, 18 Mar 2005 05:16:53 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C8A3316A4CE for ; Fri, 18 Mar 2005 05:16:52 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5E9E43D2F for ; Fri, 18 Mar 2005 05:16:52 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2I5Gqmp060314 for ; Fri, 18 Mar 2005 05:16:52 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2I5GqUu060311 for perforce@freebsd.org; Fri, 18 Mar 2005 05:16:52 GMT (envelope-from jmallett@freebsd.org) Date: Fri, 18 Mar 2005 05:16:52 GMT Message-Id: <200503180516.j2I5GqUu060311@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 73430 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, 18 Mar 2005 05:16:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=73430 Change 73430 by jmallett@jmallett_windward on 2005/03/18 05:16:09 Garbage collect. Affected files ... .. //depot/projects/mips/sys/mips/include/param.h#16 edit .. //depot/projects/mips/sys/mips/mips/genassym.c#14 edit .. //depot/projects/mips/sys/mips/mips/machdep.c#48 edit Differences ... ==== //depot/projects/mips/sys/mips/include/param.h#16 (text+ko) ==== @@ -25,7 +25,6 @@ #define KSTACK_PAGES 2 /* pages of kstack (with pcb) */ #endif #define KSTACK_GUARD_PAGES 1 /* pages of kstack guard; 0 disables */ -#define UAREA_PAGES 1 /* pages of u-area */ /* * Define the architecture. If no platform has been defined, fall back ==== //depot/projects/mips/sys/mips/mips/genassym.c#14 (text+ko) ==== @@ -58,8 +58,6 @@ ASSYM(TD_MD_REGS, offsetof(struct thread, td_md.md_regs)); -ASSYM(P_UAREA, offsetof(struct proc, p_uarea)); - ASSYM(FRAME_SIZ, sizeof(struct frame)); ASSYM(FRAME_ZERO, offsetof(struct frame, f_regs[ZERO])); ASSYM(FRAME_AST, offsetof(struct frame, f_regs[AST])); ==== //depot/projects/mips/sys/mips/mips/machdep.c#48 (text+ko) ==== @@ -67,7 +67,6 @@ static struct pcpu pcpu0; struct pcpu *pcpup = &pcpu0; -char uarea0[UAREA_PAGES * PAGE_SIZE]; struct cpu_info cpu_info_store; @@ -88,9 +87,7 @@ mips_cpu_init(); pmap_bootstrap(); - proc_linkup(&proc0, &ksegrp0, &kse0, &thread0); - proc0.p_uarea = (struct user *)uarea0; - proc0.p_stats = &proc0.p_uarea->u_stats; + proc_linkup(&proc0, &ksegrp0, &thread0); thread0.td_kstack = kstack0; pcpu_init(pcpup, 0, sizeof(struct pcpu)); pcpup->pc_curthread = &thread0; From owner-p4-projects@FreeBSD.ORG Fri Mar 18 07:42:36 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8429A16A4D0; Fri, 18 Mar 2005 07:42:36 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4306B16A4CE for ; Fri, 18 Mar 2005 07:42:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2503343D46 for ; Fri, 18 Mar 2005 07:42:36 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2I7gZWt068950 for ; Fri, 18 Mar 2005 07:42:36 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2I7gZ92068946 for perforce@freebsd.org; Fri, 18 Mar 2005 07:42:35 GMT (envelope-from jmallett@freebsd.org) Date: Fri, 18 Mar 2005 07:42:35 GMT Message-Id: <200503180742.j2I7gZ92068946@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 73441 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, 18 Mar 2005 07:42:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=73441 Change 73441 by jmallett@jmallett_windward on 2005/03/18 07:41:30 I'm not ready for KDB+DDB. I'm going to want to rewrite all the support for that stuff, give or take. Affected files ... .. //depot/projects/mips/sys/mips/conf/GENERIC#16 edit .. //depot/projects/mips/sys/mips/conf/INDY#15 edit Differences ... ==== //depot/projects/mips/sys/mips/conf/GENERIC#16 (text+ko) ==== @@ -20,7 +20,6 @@ device arcs #ARCS Firmware + Console # Debugging for use in -current -options DDB #Enable the kernel debugger options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS options WITNESS #Enable checks to detect deadlocks and cycles ==== //depot/projects/mips/sys/mips/conf/INDY#15 (text+ko) ==== @@ -25,7 +25,6 @@ device gio #GIO bus. # Debugging for use in -current -options DDB #Enable the kernel debugger options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS options WITNESS #Enable checks to detect deadlocks and cycles From owner-p4-projects@FreeBSD.ORG Fri Mar 18 08:34:45 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13A8916A4D0; Fri, 18 Mar 2005 08:34:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C899C16A4CE for ; Fri, 18 Mar 2005 08:34:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A33743D2D for ; Fri, 18 Mar 2005 08:34:44 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2I8Yij5074334 for ; Fri, 18 Mar 2005 08:34:44 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2I8YivD074331 for perforce@freebsd.org; Fri, 18 Mar 2005 08:34:44 GMT (envelope-from jmallett@freebsd.org) Date: Fri, 18 Mar 2005 08:34:44 GMT Message-Id: <200503180834.j2I8YivD074331@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 73448 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, 18 Mar 2005 08:34:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=73448 Change 73448 by jmallett@jmallett_windward on 2005/03/18 08:34:43 Compile. Affected files ... .. //depot/projects/mips/sys/alpha/include/cpu.h#9 edit .. //depot/projects/mips/sys/geom/geom_fx.c#14 edit .. //depot/projects/mips/sys/mips/include/cpu.h#18 edit .. //depot/projects/mips/sys/mips/include/cpufunc.h#18 edit .. //depot/projects/mips/sys/mips/include/critical.h#5 edit .. //depot/projects/mips/sys/mips/include/db_machdep.h#9 edit .. //depot/projects/mips/sys/mips/include/kdb.h#1 add .. //depot/projects/mips/sys/mips/include/pcb.h#8 edit .. //depot/projects/mips/sys/mips/mips/cache_r5k_subr.S#4 edit .. //depot/projects/mips/sys/mips/mips/clock_r4k.c#5 edit .. //depot/projects/mips/sys/mips/mips/cpu.c#6 edit .. //depot/projects/mips/sys/mips/mips/locore.S#16 edit .. //depot/projects/mips/sys/mips/mips/machdep.c#49 edit .. //depot/projects/mips/sys/mips/mips/pmap.c#40 edit Differences ... ==== //depot/projects/mips/sys/alpha/include/cpu.h#9 (text+ko) ==== ==== //depot/projects/mips/sys/geom/geom_fx.c#14 (text+ko) ==== @@ -182,7 +182,7 @@ } break; } - g_access_rel(cp, -1, 0, 0); + g_access(cp, -1, 0, 0); if (LIST_EMPTY(&gp->provider)) { g_slice_spoiled(cp); return (NULL); ==== //depot/projects/mips/sys/mips/include/cpu.h#18 (text+ko) ==== @@ -79,6 +79,8 @@ { "wall_cmos_clock", CTLTYPE_INT }, \ } +#define cpu_spinwait() /* nothing */ + static __inline u_int64_t get_cyclecount(void) { ==== //depot/projects/mips/sys/mips/include/cpufunc.h#18 (text+ko) ==== @@ -160,7 +160,7 @@ #define intr_restore(s) mips_wr_status((s)) static __inline void -mips_break(void) +breakpoint(void) { __asm __volatile ("break"); } ==== //depot/projects/mips/sys/mips/include/critical.h#5 (text+ko) ==== @@ -33,7 +33,7 @@ * related support functions residing * in //critical.c - prototyped * - * $P4: //depot/projects/mips/sys/mips/include/critical.h#4 $ + * $P4: //depot/projects/mips/sys/mips/include/critical.h#5 $ */ #ifndef _MACHINE_CRITICAL_H_ @@ -57,11 +57,8 @@ * of td_critnest, prior to it being incremented to 1. */ static __inline void -cpu_critical_enter(void) +cpu_critical_enter(struct thread *td) { - struct thread *td; - - td = curthread; td->td_md.md_savecrit = intr_disable(); } @@ -73,11 +70,8 @@ * exiting the last critical section. */ static __inline void -cpu_critical_exit(void) +cpu_critical_exit(struct thread *td) { - struct thread *td; - - td = curthread; intr_restore(td->td_md.md_savecrit); } ==== //depot/projects/mips/sys/mips/include/db_machdep.h#9 (text+ko) ==== @@ -82,7 +82,6 @@ */ void kdb_kbd_trap(db_regs_t *); void db_set_ddb_regs(int type, struct trapframe *); -int kdb_trap(int type, struct trapframe *); int kdbpeek(db_addr_t); #define DB_SMALL_VALUE_MAX (0x7fffffff) ==== //depot/projects/mips/sys/mips/include/pcb.h#8 (text+ko) ==== @@ -42,6 +42,7 @@ #ifdef _KERNEL #define PCB_FSR(pcb) (0) +void makectx(struct trapframe *, struct pcb *); int savectx(struct pcb *pcb); #endif ==== //depot/projects/mips/sys/mips/mips/cache_r5k_subr.S#4 (text+ko) ==== @@ -41,14 +41,14 @@ */ LEAF(r5k_enable_sdcache) lw t2, mips_sdcache_size - la t1, MIPS_KSEG0_START + dla t1, MIPS_KSEG0_START beq t2, zero, 3f # if no sdcache, we can bail now nop add t2, t1, t2 - la v0, 1f + dla v0, 1f or v0, MIPS_KSEG1_START j v0 # run the rest from uncached space ==== //depot/projects/mips/sys/mips/mips/clock_r4k.c#5 (text+ko) ==== @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/mips/sys/mips/mips/cpu.c#6 (text+ko) ==== @@ -25,8 +25,10 @@ * $FreeBSD$ */ +#define __RMAN_RESOURCE_VISIBLE #include #include +#include #include #include #include ==== //depot/projects/mips/sys/mips/mips/locore.S#16 (text+ko) ==== @@ -89,10 +89,10 @@ sw t1, fpu_id /* Set up the GP. */ - la gp, _gp + dla gp, _gp /* Set up our temporary stack. */ - la sp, topstack + dla sp, topstack /* Call the platform-specific startup code. */ jal platform_start ==== //depot/projects/mips/sys/mips/mips/machdep.c#49 (text+ko) ==== @@ -135,17 +135,26 @@ } void -Debugger(const char *msg) +dumpsys(struct dumperinfo *dip) { - printf("Debugger(%s)\n", msg); - mips_break(); } +/* + * Construct a PCB from a trapframe. This is called from kdb_trap() where + * we want to start a backtrace from the function that caused us to enter + * the debugger. We have the context in the trapframe, but base the trace + * on the PCB. The PCB doesn't have to be perfect, as long as it contains + * enough for a backtrace. + */ void -dumpsys(struct dumperinfo *dip) +makectx(struct trapframe *tf, struct pcb *pcb) { + pcb->pcb_regs[11] = tf->tf_regs[TF_SR]; + pcb->pcb_regs[10] = tf->tf_regs[TF_RA]; + pcb->pcb_regs[8] = tf->tf_regs[TF_SP]; } + int get_mcontext(struct thread *td, mcontext_t *mcp, int clear_ret) { ==== //depot/projects/mips/sys/mips/mips/pmap.c#40 (text+ko) ==== @@ -101,6 +101,7 @@ #include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Fri Mar 18 08:54:09 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC8B816A4D1; Fri, 18 Mar 2005 08:54:08 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AB68C16A4CE for ; Fri, 18 Mar 2005 08:54:08 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 808F143D5D for ; Fri, 18 Mar 2005 08:54:08 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2I8s8JN082030 for ; Fri, 18 Mar 2005 08:54:08 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2I8s8GS082027 for perforce@freebsd.org; Fri, 18 Mar 2005 08:54:08 GMT (envelope-from jmallett@freebsd.org) Date: Fri, 18 Mar 2005 08:54:08 GMT Message-Id: <200503180854.j2I8s8GS082027@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 73450 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, 18 Mar 2005 08:54:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=73450 Change 73450 by jmallett@jmallett_windward on 2005/03/18 08:53:59 Get the balance^W^H emulation right. Affected files ... .. //depot/projects/mips/sys/conf/ldscript.mips#8 edit Differences ... ==== //depot/projects/mips/sys/conf/ldscript.mips#8 (text+ko) ==== @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -OUTPUT_FORMAT("elf32-ntradbigmips", "elf32-ntradbigmips", "elf32-ntradlittlemips") +OUTPUT_FORMAT("elf64-tradbigmips", "elf64-tradbigmips", "elf64-tradlittlemips") OUTPUT_ARCH(mips) ENTRY(start) SEARCH_DIR(/usr/lib); From owner-p4-projects@FreeBSD.ORG Fri Mar 18 09:23:45 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96CA116A4D0; Fri, 18 Mar 2005 09:23:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 622EA16A4CE for ; Fri, 18 Mar 2005 09:23:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 383AD43D1D for ; Fri, 18 Mar 2005 09:23:45 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2I9NjrS083120 for ; Fri, 18 Mar 2005 09:23:45 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2I9Nio0083117 for perforce@freebsd.org; Fri, 18 Mar 2005 09:23:44 GMT (envelope-from jmallett@freebsd.org) Date: Fri, 18 Mar 2005 09:23:44 GMT Message-Id: <200503180923.j2I9Nio0083117@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 73452 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, 18 Mar 2005 09:23:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=73452 Change 73452 by jmallett@jmallett_windward on 2005/03/18 09:23:10 Yuck. Affected files ... .. //depot/projects/mips/sys/mips/mips/support.S#13 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/support.S#13 (text+ko) ==== @@ -286,8 +286,6 @@ nop END(copyinstr) -#ifdef DDB - /* * setjmp(9) * int setjmp(jmp_buf) @@ -333,5 +331,3 @@ jr ra nop END(longjmp) - -#endif /* DDB */ From owner-p4-projects@FreeBSD.ORG Fri Mar 18 09:23:46 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A20416A4DD; Fri, 18 Mar 2005 09:23:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C669816A4EA for ; Fri, 18 Mar 2005 09:23:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86C8843D1D for ; Fri, 18 Mar 2005 09:23:45 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2I9NjpI083127 for ; Fri, 18 Mar 2005 09:23:45 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2I9NjtK083123 for perforce@freebsd.org; Fri, 18 Mar 2005 09:23:45 GMT (envelope-from jmallett@freebsd.org) Date: Fri, 18 Mar 2005 09:23:45 GMT Message-Id: <200503180923.j2I9NjtK083123@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 73453 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, 18 Mar 2005 09:23:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=73453 Change 73453 by jmallett@jmallett_windward on 2005/03/18 09:23:28 Link (it runs!) Affected files ... .. //depot/projects/mips/sys/mips/mips/elf_machdep.c#5 edit .. //depot/projects/mips/sys/mips/mips/machdep.c#50 edit .. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#38 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/elf_machdep.c#5 (text+ko) ==== @@ -31,6 +31,12 @@ #include #include +void +elf64_dump_thread(struct thread *td, void *dst, size_t *off) +{ + printf("%s unimplemented at %s:%d.\n", __func__, __FILE__, __LINE__); +} + int elf_cpu_load_file(linker_file_t fil) { ==== //depot/projects/mips/sys/mips/mips/machdep.c#50 (text+ko) ==== @@ -35,6 +35,8 @@ #include #include #include +#include +#include #include #include #include @@ -114,6 +116,13 @@ } +/* Get current clock frequency for the given cpu id. */ +int +cpu_est_clockrate(int cpu_id, uint64_t *rate) +{ + return (ENXIO); +} + void cpu_halt(void) { @@ -210,6 +219,12 @@ } int +ptrace_clear_single_step(struct thread *td) +{ + return (0); +} + +int ptrace_single_step(struct thread *td) { return (0); ==== //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#38 (text+ko) ==== @@ -62,7 +62,8 @@ { NULL, NULL, 0 } }; -int arcsmem, availmem, lpmem; +long realmem; +static long arcsmem, availmem, lpmem; int mach_type, mach_subtype, mach_boardrev; struct platform platform; @@ -124,6 +125,7 @@ if (mem == NULL) break; + realmem += btoc(size); first = round_page(mem->BasePage << ARCS_PAGESHIFT); last = trunc_page(first + (mem->PageCount << ARCS_PAGESHIFT)); size = last - first; @@ -159,11 +161,13 @@ platform_identify(void) { printf("machine: %s\n", arcs_systemid()); - printf("ARCS memory = %d (%d KB)\n", ctob(arcsmem), + printf("real memory = %ld (%ld MB)\n", ctob(realmem), + ctob(realmem) / (1024 * 1024)); + printf("ARCS memory = %ld (%ld KB)\n", ctob(arcsmem), ctob(arcsmem) / 1024); - printf("Loaded program memory = %d (%d KB)\n", ctob(lpmem), + printf("Loaded program memory = %ld (%ld KB)\n", ctob(lpmem), ctob(lpmem) / 1024); - printf("avail memory = %d (%d MB)\n", ctob(availmem), + printf("avail memory = %ld (%ld MB)\n", ctob(availmem), ctob(availmem) / (1024 * 1024)); } From owner-p4-projects@FreeBSD.ORG Fri Mar 18 19:53:16 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32CD316A4D0; Fri, 18 Mar 2005 19:53:16 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CD75116A4CE; Fri, 18 Mar 2005 19:53:15 +0000 (GMT) Received: from dragon.NUXI.org (trang.nuxi.com [66.93.134.19]) by mx1.FreeBSD.org (Postfix) with ESMTP id 640DE43D2F; Fri, 18 Mar 2005 19:53:15 +0000 (GMT) (envelope-from obrien@NUXI.com) Received: from dragon.NUXI.org (obrien@localhost [127.0.0.1]) by dragon.NUXI.org (8.13.3/8.13.3) with ESMTP id j2IJrCwB056138; Fri, 18 Mar 2005 11:53:13 -0800 (PST) (envelope-from obrien@dragon.NUXI.org) Received: (from obrien@localhost) by dragon.NUXI.org (8.13.3/8.13.1/Submit) id j2IJrC4Y056137; Fri, 18 Mar 2005 11:53:12 -0800 (PST) (envelope-from obrien) Date: Fri, 18 Mar 2005 11:53:12 -0800 From: "David O'Brien" To: Juli Mallett Message-ID: <20050318195312.GA54333@dragon.NUXI.org> References: <200503180249.j2I2noVR045882@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200503180249.j2I2noVR045882@repoman.freebsd.org> X-Operating-System: FreeBSD 6.0-CURRENT Organization: The NUXI BSD Group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 User-Agent: Mutt/1.5.8i cc: Perforce Change Reviews Subject: Re: PERFORCE change 73421 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: obrien@FreeBSD.org List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Mar 2005 19:53:16 -0000 On Fri, Mar 18, 2005 at 02:49:50AM +0000, Juli Mallett wrote: > http://perforce.freebsd.org/chv.cgi?CH=73421 > > Change 73421 by jmallett@jmallett_windward on 2005/03/18 02:49:15 > > Of all the things I've lost I miss my working toolchain the most. > Like, seriously. This is pain. If there was a login on a MIPS box one could offer -- I might just write the needed bits and commit them to the FSF GCC & Binutils CVS repo. But to date, there isn't a usable system that I've seen. -- -- David (obrien@FreeBSD.org) From owner-p4-projects@FreeBSD.ORG Sat Mar 19 00:15:11 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5B7D16A4D0; Sat, 19 Mar 2005 00:15:10 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9114C16A4CE for ; Sat, 19 Mar 2005 00:15:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 625DF43D41 for ; Sat, 19 Mar 2005 00:15:10 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2J0FAUZ047051 for ; Sat, 19 Mar 2005 00:15:10 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2J0F98Q047048 for perforce@freebsd.org; Sat, 19 Mar 2005 00:15:09 GMT (envelope-from jmallett@freebsd.org) Date: Sat, 19 Mar 2005 00:15:09 GMT Message-Id: <200503190015.j2J0F98Q047048@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 73488 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, 19 Mar 2005 00:15:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=73488 Change 73488 by jmallett@jmallett_windward on 2005/03/19 00:14:37 Stop using cache, sort phys_avail[] Affected files ... .. //depot/projects/mips/sys/conf/Makefile.mips#17 edit .. //depot/projects/mips/sys/conf/kern.sgimips.mk#2 edit .. //depot/projects/mips/sys/mips/conf/GENERIC#17 edit .. //depot/projects/mips/sys/mips/conf/INDY#16 edit .. //depot/projects/mips/sys/mips/mips/pmap.c#41 edit Differences ... ==== //depot/projects/mips/sys/conf/Makefile.mips#17 (text+ko) ==== ==== //depot/projects/mips/sys/conf/kern.sgimips.mk#2 (text+ko) ==== @@ -4,4 +4,4 @@ # # $FreeBSD$ -TEXTADDR?= 0x80069000 +TEXTADDR?= 0xffffffffa0069000 ==== //depot/projects/mips/sys/mips/conf/GENERIC#17 (text+ko) ==== @@ -10,7 +10,7 @@ makeoptions MIPSOPTS=-mips3 #Build for a MIPS III -#makeoptions TEXTADDR=0x88069000 #Indy +#makeoptions TEXTADDR=0xa8069000 #Indy # Platform support platform sgimips #SGI MIPS systems. ==== //depot/projects/mips/sys/mips/conf/INDY#16 (text+ko) ==== @@ -10,9 +10,7 @@ hints "INDY.hints" -makeoptions MIPSOPTS=-mips3 #Build for a MIPS III - -makeoptions TEXTADDR=0xFFFFFFFF88069000 #Indy +makeoptions TEXTADDR=0xFFFFFFFFA8069000 #Indy # Platform support platform sgimips #SGI MIPS systems. ==== //depot/projects/mips/sys/mips/mips/pmap.c#41 (text+ko) ==== @@ -248,7 +248,7 @@ pa = phys_avail[0]; phys_avail[0] += size; - va = MIPS_PHYS_TO_KSEG0(pa); + va = MIPS_PHYS_TO_KSEG1(pa); bzero((caddr_t) va, size); return va; } @@ -264,6 +264,26 @@ { int i; + /* Sort. */ +again: + for (i = 0; phys_avail[i + 1] != 0; i += 2) { + if (i < 2) + continue; + if (phys_avail[i - 2] > phys_avail[i]) { + vm_paddr_t ptemp[2]; + + ptemp[0] = phys_avail[i+0]; + ptemp[1] = phys_avail[i+1]; + + phys_avail[i + 0] = phys_avail[i - 2]; + phys_avail[i + 1] = phys_avail[i - 1]; + + phys_avail[i - 2] = ptemp[0]; + phys_avail[i - 1] = ptemp[1]; + goto again; + } + } + /* * Steal the message buffer from the beginning of memory. */ @@ -331,7 +351,7 @@ break; } - va = (void *)MIPS_PHYS_TO_KSEG0(m->phys_addr); + va = (void *)MIPS_PHYS_TO_KSEG1(m->phys_addr); if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0) bzero(va, PAGE_SIZE); return (va); @@ -342,7 +362,7 @@ { vm_page_t m; - m = PHYS_TO_VM_PAGE(MIPS_KSEG0_TO_PHYS((vm_offset_t)mem)); + m = PHYS_TO_VM_PAGE(MIPS_KSEG1_TO_PHYS((vm_offset_t)mem)); vm_page_lock_queues(); vm_page_free(m); vm_page_unlock_queues(); @@ -649,7 +669,7 @@ #if 0 /* XXX notyet, need pmap_extract etc., to love us. */ return MIPS_PHYS_TO_XKPHYS(MIPS_XKPHYS_UC, start); #endif - return MIPS_PHYS_TO_KSEG0(start); + return MIPS_PHYS_TO_KSEG1(start); } void @@ -699,7 +719,7 @@ vm_page_unlock_queues(); VM_OBJECT_UNLOCK(pmap->pm_pteobj); - pmap->pm_lev1 = (pt_entry_t*) MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(lev1pg)); + pmap->pm_lev1 = (pt_entry_t*) MIPS_PHYS_TO_KSEG1(VM_PAGE_TO_PHYS(lev1pg)); /* install self-referential address mapping entry (not PG_ASM) */ pmap->pm_lev1[PTLEV1I] = pmap_phys_to_pte(VM_PAGE_TO_PHYS(lev1pg)) @@ -1254,7 +1274,7 @@ void pmap_zero_page(vm_page_t m) { - vm_offset_t va = MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(m)); + vm_offset_t va = MIPS_PHYS_TO_KSEG1(VM_PAGE_TO_PHYS(m)); bzero((caddr_t) va, PAGE_SIZE); } @@ -1270,7 +1290,7 @@ void pmap_zero_page_area(vm_page_t m, int off, int size) { - vm_offset_t va = MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(m)); + vm_offset_t va = MIPS_PHYS_TO_KSEG1(VM_PAGE_TO_PHYS(m)); bzero((char *)(caddr_t)va + off, size); } @@ -1284,7 +1304,7 @@ void pmap_zero_page_idle(vm_page_t m) { - vm_offset_t va = MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(m)); + vm_offset_t va = MIPS_PHYS_TO_KSEG1(VM_PAGE_TO_PHYS(m)); bzero((caddr_t) va, PAGE_SIZE); } @@ -1298,8 +1318,8 @@ void pmap_copy_page(vm_page_t msrc, vm_page_t mdst) { - vm_offset_t src = MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(msrc)); - vm_offset_t dst = MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(mdst)); + vm_offset_t src = MIPS_PHYS_TO_KSEG1(VM_PAGE_TO_PHYS(msrc)); + vm_offset_t dst = MIPS_PHYS_TO_KSEG1(VM_PAGE_TO_PHYS(mdst)); bcopy((caddr_t) src, (caddr_t) dst, PAGE_SIZE); } From owner-p4-projects@FreeBSD.ORG Sat Mar 19 01:22:34 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3295B16A4CF; Sat, 19 Mar 2005 01:22:34 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D465216A4D1 for ; Sat, 19 Mar 2005 01:22:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A125743D1D for ; Sat, 19 Mar 2005 01:22:33 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2J1MXnd059154 for ; Sat, 19 Mar 2005 01:22:33 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2J1MXHO059148 for perforce@freebsd.org; Sat, 19 Mar 2005 01:22:33 GMT (envelope-from jmallett@freebsd.org) Date: Sat, 19 Mar 2005 01:22:33 GMT Message-Id: <200503190122.j2J1MXHO059148@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 73495 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, 19 Mar 2005 01:22:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=73495 Change 73495 by jmallett@jmallett_windward on 2005/03/19 01:22:25 We're not using a loader yet. Affected files ... .. //depot/projects/mips/sys/kern/link_elf.c#13 edit Differences ... ==== //depot/projects/mips/sys/kern/link_elf.c#13 (text+ko) ==== @@ -367,6 +367,8 @@ switch (dp->d_tag) { case DT_HASH: { + if (ef->address == NULL) + return (EINVAL); /* From src/libexec/rtld-elf/rtld.c */ const Elf_Hashelt *hashtab = (const Elf_Hashelt *) (ef->address + dp->d_un.d_ptr); From owner-p4-projects@FreeBSD.ORG Sat Mar 19 03:28:07 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E506816A4D0; Sat, 19 Mar 2005 03:28:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA22C16A4CE for ; Sat, 19 Mar 2005 03:28:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A186E43D5C for ; Sat, 19 Mar 2005 03:28:06 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2J3S6E3069523 for ; Sat, 19 Mar 2005 03:28:06 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2J3S63K069520 for perforce@freebsd.org; Sat, 19 Mar 2005 03:28:06 GMT (envelope-from jmallett@freebsd.org) Date: Sat, 19 Mar 2005 03:28:06 GMT Message-Id: <200503190328.j2J3S63K069520@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 73500 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, 19 Mar 2005 03:28:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=73500 Change 73500 by jmallett@jmallett_windward on 2005/03/19 03:27:18 Attach ARCS. Affected files ... .. //depot/projects/mips/sys/mips/sgimips/mainbus.c#3 edit Differences ... ==== //depot/projects/mips/sys/mips/sgimips/mainbus.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/sgimips/mainbus.c#2 $ + * $P4: //depot/projects/mips/sys/mips/sgimips/mainbus.c#3 $ */ #include @@ -71,6 +71,7 @@ static const char *mainbus_devices[] = { "imc", + "arcs", NULL }; From owner-p4-projects@FreeBSD.ORG Sat Mar 19 03:30:10 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6027016A4D0; Sat, 19 Mar 2005 03:30:10 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2333416A4CE for ; Sat, 19 Mar 2005 03:30:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AFCAB43D3F for ; Sat, 19 Mar 2005 03:30:09 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2J3U9Or069657 for ; Sat, 19 Mar 2005 03:30:09 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2J3U9Sb069654 for perforce@freebsd.org; Sat, 19 Mar 2005 03:30:09 GMT (envelope-from jmallett@freebsd.org) Date: Sat, 19 Mar 2005 03:30:09 GMT Message-Id: <200503190330.j2J3U9Sb069654@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 73501 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, 19 Mar 2005 03:30:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=73501 Change 73501 by jmallett@jmallett_windward on 2005/03/19 03:29:35 Make an ARCS device and try to use it to hang stuff off. Affected files ... .. //depot/projects/mips/sys/conf/files.mips#41 edit .. //depot/projects/mips/sys/dev/arcs/arcs.c#5 edit .. //depot/projects/mips/sys/dev/arcs/arcs.h#5 edit .. //depot/projects/mips/sys/dev/arcs/arcs_dev.c#1 add .. //depot/projects/mips/sys/dev/arcs/arcs_disk.c#3 edit .. //depot/projects/mips/sys/mips/conf/INDY#17 edit .. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#39 edit Differences ... ==== //depot/projects/mips/sys/conf/files.mips#41 (text+ko) ==== @@ -60,6 +60,7 @@ # This stanza is device files. dev/arcs/arcs.c optional arcs dev/arcs/arcs_console.c optional arcs +dev/arcs/arcs_dev.c optional arcs dev/arcs/arcs_disk.c optional arcs_disk arcs mips/sgimips/gio/gio.c optional gio ==== //depot/projects/mips/sys/dev/arcs/arcs.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs.c#4 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs.c#5 $ */ #include @@ -60,7 +60,7 @@ #define ARCS_FV_GetEnvironmentVariable_Offset (30 * sizeof (ARCS_Pointer_t)) int -arcs_attach(void *arcs_base) +arcs_init(void *arcs_base) { uint32_t *arcs_signature; ==== //depot/projects/mips/sys/dev/arcs/arcs.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs.h#4 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs.h#5 $ */ #ifndef _DEV_ARCS_ARCS_H_ @@ -56,7 +56,7 @@ /* * Bookkeeping. */ -int arcs_attach(void *); +int arcs_init(void *); const char *arcs_systemid(void); void arcs_cnattach(void); ==== //depot/projects/mips/sys/dev/arcs/arcs_disk.c#3 (text+ko) ==== @@ -23,12 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs_disk.c#2 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs_disk.c#3 $ */ #include #include #include +#include #include #include #include @@ -67,7 +68,7 @@ static devclass_t arcs_disk_devclass; -DRIVER_MODULE(arcs_disk, root, arcs_disk_driver, arcs_disk_devclass, 0, 0); +DRIVER_MODULE(arcs_disk, arcs, arcs_disk_driver, arcs_disk_devclass, 0, 0); /* * Disk device control interface. @@ -127,7 +128,7 @@ sc->sc_disk = disk_alloc(); sc->sc_disk->d_strategy = arcs_disk_strategy; - sc->sc_disk->d_name = "ufs_disk"; + sc->sc_disk->d_name = "arcs_disk"; sc->sc_disk->d_sectorsize = ARCS_DISK_BSIZE; sc->sc_disk->d_mediasize = (off_t)8/*XXX*/ * ARCS_DISK_BSIZE; sc->sc_disk->d_fwsectors = 0; ==== //depot/projects/mips/sys/mips/conf/INDY#17 (text+ko) ==== @@ -18,6 +18,7 @@ # Hardware support device arcs #ARCS Firmware + Console. +device arcs_disk #ARCS Disk. device imc #IMC bus. device hpc #HPC bus. device gio #GIO bus. ==== //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#39 (text+ko) ==== @@ -91,7 +91,7 @@ /* * Initialise the ARCS stuff. */ - arcs_attach((void *)MIPS_PHYS_TO_KSEG1(0x00001000)); + arcs_init((void *)MIPS_PHYS_TO_KSEG1(0x00001000)); arcs_cnattach(); bootverbose = 1; From owner-p4-projects@FreeBSD.ORG Sat Mar 19 08:34:25 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CCF316A4D0; Sat, 19 Mar 2005 08:34:25 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5CC3116A4CE for ; Sat, 19 Mar 2005 08:34:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C5A2143D2D for ; Sat, 19 Mar 2005 08:34:24 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2J8YOur087800 for ; Sat, 19 Mar 2005 08:34:24 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2J8YOc5087797 for perforce@freebsd.org; Sat, 19 Mar 2005 08:34:24 GMT (envelope-from jmallett@freebsd.org) Date: Sat, 19 Mar 2005 08:34:24 GMT Message-Id: <200503190834.j2J8YOc5087797@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 73510 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, 19 Mar 2005 08:34:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=73510 Change 73510 by jmallett@jmallett_windward on 2005/03/19 08:34:09 Prepare to attach everything below ARCS. Affected files ... .. //depot/projects/mips/sys/dev/arcs/arcs.c#6 edit .. //depot/projects/mips/sys/dev/arcs/arcs.h#6 edit .. //depot/projects/mips/sys/dev/arcs/arcs_dev.c#2 edit .. //depot/projects/mips/sys/dev/arcs/arcs_disk.c#4 edit .. //depot/projects/mips/sys/mips/sgimips/hpc/hpc.c#4 edit .. //depot/projects/mips/sys/mips/sgimips/imc/imc.c#11 edit .. //depot/projects/mips/sys/mips/sgimips/mainbus.c#4 edit Differences ... ==== //depot/projects/mips/sys/dev/arcs/arcs.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003 Juli Mallett + * Copyright (c) 2003-2005 Juli Mallett * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs.c#5 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs.c#6 $ */ #include @@ -49,6 +49,7 @@ #define ARCS_FV_Reboot_Offset (6 * sizeof (ARCS_Pointer_t)) #define ARCS_FV_EnterInteractiveMode_Offset (7 * sizeof (ARCS_Pointer_t)) +#define ARCS_FV_GetPeer_Offset (9 * sizeof (ARCS_Pointer_t)) #define ARCS_FV_GetChild_Offset (10 * sizeof (ARCS_Pointer_t)) #define ARCS_FV_GetMemoryDescriptor_Offset (18 * sizeof (ARCS_Pointer_t)) #define ARCS_FV_Open_Offset (23 * sizeof (ARCS_Pointer_t)) @@ -254,6 +255,21 @@ } struct ARCS_Component * +ARCS_GetPeer(const struct ARCS_Component *component) +{ + ARCS_Pointer_t (*GetPeer)(ARCS_Pointer_t); + struct ARCS_Component *next; + ARCS_Pointer_t componentd; + ARCS_Pointer_t nextd; + + GetPeer = (ARCS_Pointer_t (*)(ARCS_Pointer_t))(intptr_t)*(ARCS_Pointer_t *)&ARCS_FV[ARCS_FV_GetPeer_Offset]; + componentd = (ARCS_Pointer_t)(intptr_t)component; + nextd = (*GetPeer)(componentd); + next = (struct ARCS_Component *)(intptr_t)nextd; + return (next); +} + +struct ARCS_Component * ARCS_GetChild(const struct ARCS_Component *component) { ARCS_Pointer_t (*GetChild)(ARCS_Pointer_t); ==== //depot/projects/mips/sys/dev/arcs/arcs.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs.h#5 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs.h#6 $ */ #ifndef _DEV_ARCS_ARCS_H_ @@ -104,8 +104,34 @@ /* Used to enumerate system components. */ struct ARCS_Component { uint32_t Class; +#if defined(sgimips) +#define ARCS_Component_Class_SystemClass 0 +#define ARCS_Component_Class_ProcessorClass 1 +#define ARCS_Component_Class_CacheClass 2 +#define ARCS_Component_Class_MemoryClass 3 +#define ARCS_Component_Class_AdapterClass 4 +#define ARCS_Component_Class_ControllerClass 5 +#define ARCS_Component_Class_PeripheralClass 6 +#else +#define ARCS_Component_Class_SystemClass 0 +#define ARCS_Component_Class_ProcessorClass 1 +#define ARCS_Component_Class_CacheClass 2 +#define ARCS_Component_Class_AdapterClass 3 +#define ARCS_Component_Class_ControllerClass 4 +#define ARCS_Component_Class_PeripheralClass 5 +#define ARCS_Component_Class_MemoryClass 6 +#endif uint32_t Type; +#define ARCS_Component_Type_Processor_CPU 1 +#define ARCS_Component_Type_Processor_FPU 2 uint32_t Flags; +#define ARCS_Component_Flags_Failed (0x01) +#define ARCS_Component_Flags_ReadOnly (0x02) +#define ARCS_Component_Flags_Removable (0x04) +#define ARCS_Component_Flags_ConsoleIn (0x08) +#define ARCS_Component_Flags_ConsoleOut (0x10) +#define ARCS_Component_Flags_Input (0x20) +#define ARCS_Component_Flags_Output (0x40) uint16_t Version; uint16_t Revision; uint32_t Key; @@ -128,6 +154,7 @@ int ARCS_GetReadStatus(int); size_t ARCS_Write(int, const char *, size_t); int ARCS_Seek(int, off_t *, int); +struct ARCS_Component *ARCS_GetPeer(const struct ARCS_Component *); struct ARCS_Component *ARCS_GetChild(const struct ARCS_Component *); #endif /* _DEV_ARCS_ARCS_H_ */ ==== //depot/projects/mips/sys/dev/arcs/arcs_dev.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs_dev.c#1 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs_dev.c#2 $ */ #include @@ -42,11 +42,13 @@ * ARCS bus interface. */ static int arcs_probe(device_t); -static int arcs_attach(device_t); static device_method_t arcs_methods[] = { DEVMETHOD(device_probe, arcs_probe), - DEVMETHOD(device_attach, arcs_attach), + DEVMETHOD(device_attach, bus_generic_attach), + DEVMETHOD(device_detach, bus_generic_detach), + DEVMETHOD(device_shutdown, bus_generic_shutdown), + { 0, 0 } }; @@ -60,32 +62,93 @@ DRIVER_MODULE(arcs, mainbus, arcs_driver, arcs_devclass, 0, 0); -static const char *arcs_children[] = { - "arcs_disk", - NULL -}; +static void +arcs_configure(device_t parent, struct ARCS_Component *this) +{ + struct ARCS_Component *c; + device_t me; + + me = parent; + if (this != NULL) { + const char *device; + int unit; + + device = NULL; + unit = this->Key; + + switch (this->Class) { + case ARCS_Component_Class_SystemClass: + device = "arcs_system"; + unit = 0; + break; + case ARCS_Component_Class_ProcessorClass: + switch (this->Type) { + case ARCS_Component_Type_Processor_CPU: + device = "arcs_cpu"; + break; + case ARCS_Component_Type_Processor_FPU: + device = "arcs_fpu"; + break; + default: + device_printf(parent, + "Unknown ARCS CPU %d\n", + this->Class); + } + break; + case ARCS_Component_Class_CacheClass: + /* Not yet. */ + break; + case ARCS_Component_Class_MemoryClass: + /* Not yet. */ + break; + case ARCS_Component_Class_AdapterClass: + /* Not yet. */ + break; + case ARCS_Component_Class_ControllerClass: + /* Not yet. */ + break; + case ARCS_Component_Class_PeripheralClass: + /* Not yet. */ + break; + default: + device_printf(parent, + "Unknown ARCS class %d\n", + this->Class); + } + if (device != NULL) { + me = device_add_child(parent, device, unit); + if (me != NULL) { + device_set_desc(me, + (const char *) + (intptr_t) + this->Identifier); + } + } else { + device_printf(parent, + "Not attaching ARCS device " + "class %d, type %d, #%d: %s\n", + this->Class, this->Type, + this->Key, (const char *) + (intptr_t) + this->Identifier); + } + c = ARCS_GetPeer(this); + if (c != NULL) + arcs_configure(parent, c); + } -static int -arcs_probe(device_t dev) -{ - if (arcs_systemid() == NULL) - return (ENXIO); - device_set_desc(dev, "ARCS"); - return (0); + c = ARCS_GetChild(this); + if (c != NULL) + arcs_configure(me, c); } static int -arcs_attach(device_t dev) +arcs_probe(device_t dev) { - const char **child; - struct ARCS_Component *c; + if (device_get_unit(dev) != 0) + panic("can't have more than one ARCS"); - for (c = ARCS_GetChild(NULL); c != NULL; c = ARCS_GetChild(c)) { - device_printf(dev, "Component %s\n", - (const char *)(intptr_t)c->Identifier); - } - - for (child = arcs_children; *child != NULL; child++) - device_add_child(dev, *child, -1); + device_set_desc(dev, "ARCS Component Tree"); + arcs_configure(dev, NULL); return (0); } ==== //depot/projects/mips/sys/dev/arcs/arcs_disk.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs_disk.c#3 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs_disk.c#4 $ */ #include @@ -57,6 +57,9 @@ static device_method_t arcs_disk_methods[] = { DEVMETHOD(device_probe, arcs_disk_probe), DEVMETHOD(device_attach, arcs_disk_attach), + DEVMETHOD(device_detach, bus_generic_detach), + DEVMETHOD(device_shutdown, bus_generic_shutdown), + { 0, 0 } }; ==== //depot/projects/mips/sys/mips/sgimips/hpc/hpc.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/sgimips/hpc/hpc.c#3 $ + * $P4: //depot/projects/mips/sys/mips/sgimips/hpc/hpc.c#4 $ */ #include @@ -114,9 +114,7 @@ device_printf(dev, "port %#lx\n", (long)sc->sc_handle); - bus_generic_attach(dev); - - return (0); + return (bus_generic_attach(dev)); } DRIVER_MODULE(hpc, gio, hpc_driver, hpc_devclass, 0, 0); ==== //depot/projects/mips/sys/mips/sgimips/imc/imc.c#11 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/sgimips/imc/imc.c#10 $ + * $P4: //depot/projects/mips/sys/mips/sgimips/imc/imc.c#11 $ */ #include @@ -186,9 +186,7 @@ } IMC_WRITE_4(port, IMC_GIO64ARB, reg); - bus_generic_attach(dev); - - return (0); + return (bus_generic_attach(dev)); } static void ==== //depot/projects/mips/sys/mips/sgimips/mainbus.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/sgimips/mainbus.c#3 $ + * $P4: //depot/projects/mips/sys/mips/sgimips/mainbus.c#4 $ */ #include @@ -53,11 +53,6 @@ DEVMETHOD(device_detach, bus_generic_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - /* XXX should move interrupt controller (or some perversion thereof) - * here since all real busses will attach below here. should we - * just attach ioc/int here and attach off that? hmm. - * TODO TODO - */ /* Bus interface */ DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), @@ -69,17 +64,9 @@ "mainbus", mainbus_methods, 1 }; -static const char *mainbus_devices[] = { - "imc", - "arcs", - NULL -}; - static int mainbus_probe(device_t dev) { - const char **namep; - if (device_get_unit(dev) != 0) panic("can't have more than one mainbus"); @@ -89,8 +76,7 @@ device_set_desc(dev, "SGI IP22 (Indigo2)"); else device_set_desc(dev, "SGI IP24 (Indy)"); - for (namep = mainbus_devices; *namep != NULL; namep++) - device_add_child(dev, *namep, -1); + device_add_child(dev, "arcs", device_get_unit(dev)); break; default: panic("can't attach mainbus for unknown system %d", mach_type); From owner-p4-projects@FreeBSD.ORG Sat Mar 19 09:13:13 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED0FA16A4D0; Sat, 19 Mar 2005 09:13:12 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6417916A4CE for ; Sat, 19 Mar 2005 09:13:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 06AEB43D1D for ; Sat, 19 Mar 2005 09:13:12 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2J9DB2a095991 for ; Sat, 19 Mar 2005 09:13:11 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2J9DBbo095988 for perforce@freebsd.org; Sat, 19 Mar 2005 09:13:11 GMT (envelope-from jmallett@freebsd.org) Date: Sat, 19 Mar 2005 09:13:11 GMT Message-Id: <200503190913.j2J9DBbo095988@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 73511 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, 19 Mar 2005 09:13:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=73511 Change 73511 by jmallett@jmallett_windward on 2005/03/19 09:12:35 Some places to attach things (not 100% yet) Affected files ... .. //depot/projects/mips/sys/conf/files.mips#42 edit .. //depot/projects/mips/sys/dev/arcs/arcs.c#7 edit .. //depot/projects/mips/sys/dev/arcs/arcs.h#7 edit .. //depot/projects/mips/sys/dev/arcs/arcs_cpu.c#1 add .. //depot/projects/mips/sys/dev/arcs/arcs_dev.c#3 edit .. //depot/projects/mips/sys/dev/arcs/arcs_fpu.c#1 add .. //depot/projects/mips/sys/dev/arcs/arcs_system.c#1 add Differences ... ==== //depot/projects/mips/sys/conf/files.mips#42 (text+ko) ==== @@ -60,7 +60,10 @@ # This stanza is device files. dev/arcs/arcs.c optional arcs dev/arcs/arcs_console.c optional arcs +dev/arcs/arcs_cpu.c optional arcs dev/arcs/arcs_dev.c optional arcs +dev/arcs/arcs_fpu.c optional arcs +dev/arcs/arcs_system.c optional arcs dev/arcs/arcs_disk.c optional arcs_disk arcs mips/sgimips/gio/gio.c optional gio ==== //depot/projects/mips/sys/dev/arcs/arcs.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs.c#6 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs.c#7 $ */ #include @@ -85,12 +85,18 @@ root = ARCS_GetChild(NULL); if (root != NULL) - systemid = (const char *)(intptr_t)root->Identifier; + systemid = arcs_component_identifier(root); else systemid = "SGI-IP27"; return (systemid); } +const char * +arcs_component_identifier(struct ARCS_Component *component) +{ + return ((const char *)(intptr_t)component->Identifier); +} + struct ARCS_Mem * ARCS_GetMemoryDescriptor(const struct ARCS_Mem *mem) { ==== //depot/projects/mips/sys/dev/arcs/arcs.h#7 (text+ko) ==== @@ -23,12 +23,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs.h#6 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs.h#7 $ */ #ifndef _DEV_ARCS_ARCS_H_ #define _DEV_ARCS_ARCS_H_ +struct ARCS_Component; + #ifdef sgimips #include "opt_model.h" @@ -58,6 +60,7 @@ */ int arcs_init(void *); const char *arcs_systemid(void); +const char *arcs_component_identifier(struct ARCS_Component *); void arcs_cnattach(void); /* ==== //depot/projects/mips/sys/dev/arcs/arcs_dev.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs_dev.c#2 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs_dev.c#3 $ */ #include @@ -118,19 +118,15 @@ if (device != NULL) { me = device_add_child(parent, device, unit); if (me != NULL) { - device_set_desc(me, - (const char *) - (intptr_t) - this->Identifier); + device_set_softc(me, this); } } else { device_printf(parent, "Not attaching ARCS device " "class %d, type %d, #%d: %s\n", this->Class, this->Type, - this->Key, (const char *) - (intptr_t) - this->Identifier); + this->Key, + arcs_component_identifier(this)); } c = ARCS_GetPeer(this); if (c != NULL) From owner-p4-projects@FreeBSD.ORG Sat Mar 19 09:59:09 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B67CD16A4D0; Sat, 19 Mar 2005 09:59:08 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7405A16A4CE for ; Sat, 19 Mar 2005 09:59:08 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECFBD43D54 for ; Sat, 19 Mar 2005 09:59:07 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2J9x7U1097784 for ; Sat, 19 Mar 2005 09:59:07 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2J9x7IO097781 for perforce@freebsd.org; Sat, 19 Mar 2005 09:59:07 GMT (envelope-from jmallett@freebsd.org) Date: Sat, 19 Mar 2005 09:59:07 GMT Message-Id: <200503190959.j2J9x7IO097781@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 73513 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, 19 Mar 2005 09:59:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=73513 Change 73513 by jmallett@jmallett_windward on 2005/03/19 09:59:07 Hierarchical attachment. Affected files ... .. //depot/projects/mips/sys/dev/arcs/arcs_cpu.c#2 edit .. //depot/projects/mips/sys/dev/arcs/arcs_dev.c#4 edit .. //depot/projects/mips/sys/dev/arcs/arcs_fpu.c#2 edit .. //depot/projects/mips/sys/dev/arcs/arcs_system.c#2 edit Differences ... ==== //depot/projects/mips/sys/dev/arcs/arcs_cpu.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs_cpu.c#1 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs_cpu.c#2 $ */ #include @@ -35,6 +35,7 @@ #include #include +#include #include @@ -60,12 +61,12 @@ static devclass_t arcs_cpu_devclass; -DRIVER_MODULE(arcs_cpu, arcs, arcs_cpu_driver, arcs_cpu_devclass, 0, 0); +DRIVER_MODULE(arcs_cpu, arcs_system, arcs_cpu_driver, arcs_cpu_devclass, 0, 0); static int arcs_cpu_probe(device_t dev) { - struct ARCS_Component *component; + struct ARCS_Component *component, *child; component = device_get_softc(dev); if (component == NULL) @@ -73,5 +74,9 @@ device_set_desc(dev, arcs_component_identifier(component)); device_printf(dev, "version %d revision %d\n", component->Version, component->Revision); + + child = ARCS_GetChild(component); + if (child != NULL) + arcs_configure(dev, child); return (0); } ==== //depot/projects/mips/sys/dev/arcs/arcs_dev.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs_dev.c#3 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs_dev.c#4 $ */ #include @@ -35,6 +35,7 @@ #include #include +#include #include @@ -62,89 +63,82 @@ DRIVER_MODULE(arcs, mainbus, arcs_driver, arcs_devclass, 0, 0); -static void +void arcs_configure(device_t parent, struct ARCS_Component *this) { struct ARCS_Component *c; device_t me; + const char *device; + int unit; - me = parent; - if (this != NULL) { - const char *device; - int unit; + device = NULL; + unit = this->Key; - device = NULL; - unit = this->Key; - - switch (this->Class) { - case ARCS_Component_Class_SystemClass: - device = "arcs_system"; - unit = 0; + switch (this->Class) { + case ARCS_Component_Class_SystemClass: + device = "arcs_system"; + unit = 0; + break; + case ARCS_Component_Class_ProcessorClass: + switch (this->Type) { + case ARCS_Component_Type_Processor_CPU: + device = "arcs_cpu"; break; - case ARCS_Component_Class_ProcessorClass: - switch (this->Type) { - case ARCS_Component_Type_Processor_CPU: - device = "arcs_cpu"; - break; - case ARCS_Component_Type_Processor_FPU: - device = "arcs_fpu"; - break; - default: - device_printf(parent, - "Unknown ARCS CPU %d\n", - this->Class); - } - break; - case ARCS_Component_Class_CacheClass: - /* Not yet. */ - break; - case ARCS_Component_Class_MemoryClass: - /* Not yet. */ - break; - case ARCS_Component_Class_AdapterClass: - /* Not yet. */ + case ARCS_Component_Type_Processor_FPU: + device = "arcs_fpu"; break; - case ARCS_Component_Class_ControllerClass: - /* Not yet. */ - break; - case ARCS_Component_Class_PeripheralClass: - /* Not yet. */ - break; default: - device_printf(parent, - "Unknown ARCS class %d\n", + device_printf(parent, "Unknown ARCS CPU %d\n", this->Class); } - if (device != NULL) { - me = device_add_child(parent, device, unit); - if (me != NULL) { - device_set_softc(me, this); - } - } else { - device_printf(parent, - "Not attaching ARCS device " - "class %d, type %d, #%d: %s\n", - this->Class, this->Type, - this->Key, - arcs_component_identifier(this)); - } - c = ARCS_GetPeer(this); - if (c != NULL) - arcs_configure(parent, c); + break; + case ARCS_Component_Class_CacheClass: + /* Not yet. */ + break; + case ARCS_Component_Class_MemoryClass: + /* Not yet. */ + break; + case ARCS_Component_Class_AdapterClass: + /* Not yet. */ + break; + case ARCS_Component_Class_ControllerClass: + /* Not yet. */ + break; + case ARCS_Component_Class_PeripheralClass: + /* Not yet. */ + break; + default: + device_printf(parent, "Unknown ARCS class %d\n", + this->Class); + } + if (device != NULL) { + device_printf(parent, "attaching %s\n", device); + me = device_add_child(parent, device, unit); + if (me != NULL) + device_set_softc(me, this); + } else { + device_printf(parent, + "Not attaching ARCS device " + "class %d, type %d, #%d: %s\n", + this->Class, this->Type, this->Key, + arcs_component_identifier(this)); } - - c = ARCS_GetChild(this); + c = ARCS_GetPeer(this); if (c != NULL) - arcs_configure(me, c); + arcs_configure(parent, c); } static int arcs_probe(device_t dev) { + struct ARCS_Component *root; + if (device_get_unit(dev) != 0) panic("can't have more than one ARCS"); device_set_desc(dev, "ARCS Component Tree"); - arcs_configure(dev, NULL); + root = ARCS_GetChild(NULL); + if (root != NULL) + arcs_configure(dev, root); return (0); } ==== //depot/projects/mips/sys/dev/arcs/arcs_fpu.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs_fpu.c#1 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs_fpu.c#2 $ */ #include @@ -35,6 +35,7 @@ #include #include +#include #include @@ -60,12 +61,12 @@ static devclass_t arcs_fpu_devclass; -DRIVER_MODULE(arcs_fpu, arcs, arcs_fpu_driver, arcs_fpu_devclass, 0, 0); +DRIVER_MODULE(arcs_fpu, arcs_cpu, arcs_fpu_driver, arcs_fpu_devclass, 0, 0); static int arcs_fpu_probe(device_t dev) { - struct ARCS_Component *component; + struct ARCS_Component *component, *child; component = device_get_softc(dev); if (component == NULL) @@ -73,5 +74,9 @@ device_set_desc(dev, arcs_component_identifier(component)); device_printf(dev, "version %d revision %d\n", component->Version, component->Revision); + + child = ARCS_GetChild(component); + if (child != NULL) + arcs_configure(dev, child); return (0); } ==== //depot/projects/mips/sys/dev/arcs/arcs_system.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs_system.c#1 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs_system.c#2 $ */ #include @@ -35,6 +35,7 @@ #include #include +#include #include @@ -65,7 +66,7 @@ static int arcs_system_probe(device_t dev) { - struct ARCS_Component *component; + struct ARCS_Component *component, *child; component = device_get_softc(dev); if (component == NULL) @@ -73,6 +74,11 @@ device_set_desc(dev, arcs_component_identifier(component)); device_printf(dev, "version %d revision %d\n", component->Version, component->Revision); + + child = ARCS_GetChild(component); + if (child != NULL) + arcs_configure(dev, child); + /* * Attach busses for this system. */ From owner-p4-projects@FreeBSD.ORG Sat Mar 19 10:45:04 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5562716A4D0; Sat, 19 Mar 2005 10:45:04 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 275C916A4CE for ; Sat, 19 Mar 2005 10:45:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 04C9543D39 for ; Sat, 19 Mar 2005 10:45:04 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2JAj37f099749 for ; Sat, 19 Mar 2005 10:45:03 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2JAj3Df099746 for perforce@freebsd.org; Sat, 19 Mar 2005 10:45:03 GMT (envelope-from jmallett@freebsd.org) Date: Sat, 19 Mar 2005 10:45:03 GMT Message-Id: <200503191045.j2JAj3Df099746@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 73515 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, 19 Mar 2005 10:45:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=73515 Change 73515 by jmallett@jmallett_windward on 2005/03/19 10:44:04 Attach IMC at arcs_system. Whee! Affected files ... .. //depot/projects/mips/sys/dev/arcs/arcs_system.c#3 edit .. //depot/projects/mips/sys/mips/sgimips/imc/imc.c#12 edit Differences ... ==== //depot/projects/mips/sys/dev/arcs/arcs_system.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs_system.c#2 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs_system.c#3 $ */ #include @@ -63,10 +63,20 @@ DRIVER_MODULE(arcs_system, arcs, arcs_system_driver, arcs_system_devclass, 0, 0); +static struct mainbus_name { + const char *mn_system; + const char *mn_device; +} mainbus_names[] = { + { "SGI-IP22", "imc" }, + { NULL, NULL } +}; + static int arcs_system_probe(device_t dev) { struct ARCS_Component *component, *child; + struct mainbus_name *mainbus; + const char *system; component = device_get_softc(dev); if (component == NULL) @@ -82,5 +92,10 @@ /* * Attach busses for this system. */ + system = arcs_component_identifier(component); + for (mainbus = mainbus_names; mainbus->mn_system != NULL; mainbus++) { + if (strcmp(mainbus->mn_system, system) == 0) + device_add_child(dev, mainbus->mn_device, -1); + } return (0); } ==== //depot/projects/mips/sys/mips/sgimips/imc/imc.c#12 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/sgimips/imc/imc.c#11 $ + * $P4: //depot/projects/mips/sys/mips/sgimips/imc/imc.c#12 $ */ #include @@ -203,4 +203,4 @@ IMC_WRITE_4(port, IMC_GIO_ERRSTAT, 0); } -DRIVER_MODULE(imc, mainbus, imc_driver, imc_devclass, 0, 0); +DRIVER_MODULE(imc, arcs_system, imc_driver, imc_devclass, 0, 0); From owner-p4-projects@FreeBSD.ORG Sat Mar 19 19:29:47 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BB8216A4D0; Sat, 19 Mar 2005 19:29:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2907916A4CE for ; Sat, 19 Mar 2005 19:29:47 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 102C743D39 for ; Sat, 19 Mar 2005 19:29:47 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2JJTk8G033078 for ; Sat, 19 Mar 2005 19:29:46 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2JJTkYv033075 for perforce@freebsd.org; Sat, 19 Mar 2005 19:29:46 GMT (envelope-from jmallett@freebsd.org) Date: Sat, 19 Mar 2005 19:29:46 GMT Message-Id: <200503191929.j2JJTkYv033075@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 73527 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, 19 Mar 2005 19:29:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=73527 Change 73527 by jmallett@jmallett_windward on 2005/03/19 19:29:22 Quiet down. Affected files ... .. //depot/projects/mips/sys/dev/arcs/arcs_dev.c#5 edit Differences ... ==== //depot/projects/mips/sys/dev/arcs/arcs_dev.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs_dev.c#4 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs_dev.c#5 $ */ #include @@ -112,11 +112,10 @@ this->Class); } if (device != NULL) { - device_printf(parent, "attaching %s\n", device); me = device_add_child(parent, device, unit); if (me != NULL) device_set_softc(me, this); - } else { + } else if (bootverbose) { device_printf(parent, "Not attaching ARCS device " "class %d, type %d, #%d: %s\n", From owner-p4-projects@FreeBSD.ORG Sat Mar 19 19:43:05 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CBFC16A4D0; Sat, 19 Mar 2005 19:43:05 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 25FC316A4CE for ; Sat, 19 Mar 2005 19:43:05 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0DBA643D1D for ; Sat, 19 Mar 2005 19:43:05 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2JJh4x6033669 for ; Sat, 19 Mar 2005 19:43:04 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2JJh4Fx033666 for perforce@freebsd.org; Sat, 19 Mar 2005 19:43:04 GMT (envelope-from jmallett@freebsd.org) Date: Sat, 19 Mar 2005 19:43:04 GMT Message-Id: <200503191943.j2JJh4Fx033666@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 73531 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, 19 Mar 2005 19:43:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=73531 Change 73531 by jmallett@jmallett_windward on 2005/03/19 19:42:42 Cleanup. Affected files ... .. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#40 edit Differences ... ==== //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#40 (text+ko) ==== @@ -160,15 +160,16 @@ void platform_identify(void) { - printf("machine: %s\n", arcs_systemid()); - printf("real memory = %ld (%ld MB)\n", ctob(realmem), + printf("real memory = %ld (%ld MB)\n", ctob(realmem), ctob(realmem) / (1024 * 1024)); - printf("ARCS memory = %ld (%ld KB)\n", ctob(arcsmem), - ctob(arcsmem) / 1024); - printf("Loaded program memory = %ld (%ld KB)\n", ctob(lpmem), - ctob(lpmem) / 1024); - printf("avail memory = %ld (%ld MB)\n", ctob(availmem), + printf("avail memory = %ld (%ld MB)\n", ctob(availmem), ctob(availmem) / (1024 * 1024)); + if (bootverbose) { + printf("ARCS memory = %ld (%ld KB)\n", ctob(arcsmem), + ctob(arcsmem) / 1024); + printf("Loaded program memory = %ld (%ld KB)\n", ctob(lpmem), + ctob(lpmem) / 1024); + } } /* From owner-p4-projects@FreeBSD.ORG Sat Mar 19 19:55:20 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9044016A4D0; Sat, 19 Mar 2005 19:55:20 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 67B1316A4CE for ; Sat, 19 Mar 2005 19:55:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2DBF643D1D for ; Sat, 19 Mar 2005 19:55:20 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2JJtKZ0034205 for ; Sat, 19 Mar 2005 19:55:20 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2JJtJd2034202 for perforce@freebsd.org; Sat, 19 Mar 2005 19:55:19 GMT (envelope-from jmallett@freebsd.org) Date: Sat, 19 Mar 2005 19:55:19 GMT Message-Id: <200503191955.j2JJtJd2034202@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 73532 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, 19 Mar 2005 19:55:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=73532 Change 73532 by jmallett@jmallett_windward on 2005/03/19 19:54:18 Reduce diffs with other GEOM modules. Affected files ... .. //depot/projects/mips/sys/geom/geom_fx.c#15 edit Differences ... ==== //depot/projects/mips/sys/geom/geom_fx.c#15 (text+ko) ==== @@ -57,7 +57,8 @@ #define FX_CLASS_NAME "FX" struct g_fx_softc { - struct volhdr sc_volhdr; + u_int sectorsize; + struct volhdr volhdr; }; static void @@ -119,10 +120,7 @@ int error, i, npart; u_char *buf; struct g_fx_softc *ms; - off_t mediasize; - u_int sectorsize; struct g_slicer *gsp; - struct volhdr *label; struct volpart *vp; g_trace(G_T_TOPOLOGY, "g_fx_taste(%s,%s)", mp->name, pp->name); @@ -134,24 +132,29 @@ if (gp == NULL) return (NULL); gsp = gp->softc; - gp->dumpconf = g_fx_dumpconf; npart = 0; - while (1) { /* a trick to allow us to use break */ + do { if (gp->rank != 2 && flags == G_TF_NORMAL) break; - sectorsize = cp->provider->sectorsize; - if (sectorsize < 512) + ms->sectorsize = cp->provider->sectorsize; + if (ms->sectorsize < 512) break; - mediasize = cp->provider->mediasize; g_topology_unlock(); buf = g_read_data(cp, 0, sizeof (struct volhdr), &error); g_topology_lock(); if (buf == NULL || error != 0) break; - label = (struct volhdr *)buf; - if (be32dec((u_char *)&label->vh_magic) != FX_LABEL_MAGIC) + + ms->volhdr = *(struct volhdr *)buf; + g_free(buf); + + /* + * XXX/juli + * Need to split out to another function like sunlabel. + */ + if (be32dec((u_char *)&ms->volhdr.vh_magic) != FX_LABEL_MAGIC) break; - error = g_fx_cksum(label); + error = g_fx_cksum(&ms->volhdr); if (error != 0) { if (bootverbose) { printf("Found a bad label on %s (sum %d)\n", @@ -159,15 +162,15 @@ } break; } - ms->sc_volhdr = *label; for (i = 0; i < FX_NPARTS; i++) { - vp = &label->vh_part[i]; + vp = &ms->volhdr.vh_part[i]; g_fx_swap_volpart(vp); if (!vp->vp_size) continue; g_slice_config(gp, i, G_SLICE_CONFIG_SET, ((off_t)vp->vp_begin) << 9ULL, - ((off_t)vp->vp_size) << 9ULL, sectorsize, + ((off_t)vp->vp_size) << 9ULL, + ms->sectorsize, "%s%c", pp->name, 'a' + i); if (bootverbose) { printf("Added %s%c of type %d (%s)\n", @@ -181,7 +184,7 @@ npart, pp->name); } break; - } + } while (0); g_access(cp, -1, 0, 0); if (LIST_EMPTY(&gp->provider)) { g_slice_spoiled(cp); @@ -192,7 +195,9 @@ static struct g_class g_fx_class = { .name = FX_CLASS_NAME, + .version = G_VERSION, .taste = g_fx_taste, + .dumpconf = g_fx_dumpconf, }; DECLARE_GEOM_CLASS(g_fx_class, g_fx); From owner-p4-projects@FreeBSD.ORG Sat Mar 19 19:55:21 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54BC216A4D6; Sat, 19 Mar 2005 19:55:21 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BE00416A4EA for ; Sat, 19 Mar 2005 19:55:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E1C643D31 for ; Sat, 19 Mar 2005 19:55:20 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2JJtKBK034211 for ; Sat, 19 Mar 2005 19:55:20 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2JJtKrE034208 for perforce@freebsd.org; Sat, 19 Mar 2005 19:55:20 GMT (envelope-from jmallett@freebsd.org) Date: Sat, 19 Mar 2005 19:55:20 GMT Message-Id: <200503191955.j2JJtKrE034208@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 73533 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, 19 Mar 2005 19:55:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=73533 Change 73533 by jmallett@jmallett_windward on 2005/03/19 19:54:56 Don't attach failed components. (XXX Should hack GXemul to have a few failed components.) Affected files ... .. //depot/projects/mips/sys/dev/arcs/arcs_cpu.c#3 edit .. //depot/projects/mips/sys/dev/arcs/arcs_fpu.c#3 edit .. //depot/projects/mips/sys/dev/arcs/arcs_system.c#4 edit Differences ... ==== //depot/projects/mips/sys/dev/arcs/arcs_cpu.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs_cpu.c#2 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs_cpu.c#3 $ */ #include @@ -71,6 +71,8 @@ component = device_get_softc(dev); if (component == NULL) return (EINVAL); + if (component->Flags & ARCS_Component_Flags_Failed) + return (ENXIO); device_set_desc(dev, arcs_component_identifier(component)); device_printf(dev, "version %d revision %d\n", component->Version, component->Revision); ==== //depot/projects/mips/sys/dev/arcs/arcs_fpu.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs_fpu.c#2 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs_fpu.c#3 $ */ #include @@ -71,6 +71,8 @@ component = device_get_softc(dev); if (component == NULL) return (EINVAL); + if (component->Flags & ARCS_Component_Flags_Failed) + return (ENXIO); device_set_desc(dev, arcs_component_identifier(component)); device_printf(dev, "version %d revision %d\n", component->Version, component->Revision); ==== //depot/projects/mips/sys/dev/arcs/arcs_system.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs_system.c#3 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs_system.c#4 $ */ #include @@ -81,6 +81,8 @@ component = device_get_softc(dev); if (component == NULL) return (EINVAL); + if (component->Flags & ARCS_Component_Flags_Failed) + return (ENXIO); device_set_desc(dev, arcs_component_identifier(component)); device_printf(dev, "version %d revision %d\n", component->Version, component->Revision); From owner-p4-projects@FreeBSD.ORG Sat Mar 19 20:34:08 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 680AB16A4D0; Sat, 19 Mar 2005 20:34:08 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3FEAB16A4CE for ; Sat, 19 Mar 2005 20:34:08 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E57DC43D41 for ; Sat, 19 Mar 2005 20:34:07 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2JKY7aC035688 for ; Sat, 19 Mar 2005 20:34:07 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2JKY7HA035685 for perforce@freebsd.org; Sat, 19 Mar 2005 20:34:07 GMT (envelope-from jmallett@freebsd.org) Date: Sat, 19 Mar 2005 20:34:07 GMT Message-Id: <200503192034.j2JKY7HA035685@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 73535 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, 19 Mar 2005 20:34:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=73535 Change 73535 by jmallett@jmallett_windward on 2005/03/19 20:33:52 Garbage collect. Affected files ... .. //depot/projects/mips/sys/mips/mips/machdep.c#51 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/machdep.c#51 (text+ko) ==== @@ -106,14 +106,9 @@ { cpu_identify(); platform_identify(); - - printf("real memory = %lu (%lu MB)\n", physsz, - physsz / (1024 * 1024)); - vm_ksubmap_init(&kmi); bufinit(); vm_pager_bufferinit(); - } /* Get current clock frequency for the given cpu id. */ From owner-p4-projects@FreeBSD.ORG Sat Mar 19 21:04:46 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F1C116A4D2; Sat, 19 Mar 2005 21:04:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D38A516A4D0 for ; Sat, 19 Mar 2005 21:04:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B16E143D1F for ; Sat, 19 Mar 2005 21:04:45 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2JL4jWA043558 for ; Sat, 19 Mar 2005 21:04:45 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2JL4jWc043555 for perforce@freebsd.org; Sat, 19 Mar 2005 21:04:45 GMT (envelope-from jmallett@freebsd.org) Date: Sat, 19 Mar 2005 21:04:45 GMT Message-Id: <200503192104.j2JL4jWc043555@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 73537 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, 19 Mar 2005 21:04:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=73537 Change 73537 by jmallett@jmallett_windward on 2005/03/19 21:04:21 Disk hacky. Affected files ... .. //depot/projects/mips/sys/dev/arcs/arcs_dev.c#6 edit .. //depot/projects/mips/sys/dev/arcs/arcs_disk.c#5 edit Differences ... ==== //depot/projects/mips/sys/dev/arcs/arcs_dev.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs_dev.c#5 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs_dev.c#6 $ */ #include @@ -139,5 +139,6 @@ root = ARCS_GetChild(NULL); if (root != NULL) arcs_configure(dev, root); + device_add_child(dev, "arcs_disk", 1); return (0); } ==== //depot/projects/mips/sys/dev/arcs/arcs_disk.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs_disk.c#4 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs_disk.c#5 $ */ #include @@ -124,10 +124,10 @@ sc = device_get_softc(dev); - error = ARCS_Open("scsi(0)disk(1)", ARCS_O_RDONLY, &sc->sc_fd); + error = ARCS_Open("scsi(0)disk(0)", ARCS_O_RDWR, &sc->sc_fd); if (error != 0) return (error); - device_printf(dev, "ARCS Disk scsi(0)disk(1)\n"); + device_printf(dev, "ARCS Disk scsi(0)disk(0) opened\n"); sc->sc_disk = disk_alloc(); sc->sc_disk->d_strategy = arcs_disk_strategy; From owner-p4-projects@FreeBSD.ORG Sat Mar 19 21:30:18 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A39916A4D0; Sat, 19 Mar 2005 21:30:18 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 02B7A16A4CE for ; Sat, 19 Mar 2005 21:30:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C78BE43D3F for ; Sat, 19 Mar 2005 21:30:17 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2JLUHK3045080 for ; Sat, 19 Mar 2005 21:30:17 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2JLUHEH045077 for perforce@freebsd.org; Sat, 19 Mar 2005 21:30:17 GMT (envelope-from jmallett@freebsd.org) Date: Sat, 19 Mar 2005 21:30:17 GMT Message-Id: <200503192130.j2JLUHEH045077@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 73540 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, 19 Mar 2005 21:30:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=73540 Change 73540 by jmallett@jmallett_windward on 2005/03/19 21:29:55 Use GetFileInformation to figure out disk size. This panics in interesting ways now. Probably because of the pointer size difference with ARCS. Affected files ... .. //depot/projects/mips/sys/dev/arcs/arcs.c#8 edit .. //depot/projects/mips/sys/dev/arcs/arcs.h#8 edit .. //depot/projects/mips/sys/dev/arcs/arcs_disk.c#6 edit Differences ... ==== //depot/projects/mips/sys/dev/arcs/arcs.c#8 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs.c#7 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs.c#8 $ */ #include @@ -59,6 +59,7 @@ #define ARCS_FV_Write_Offset (27 * sizeof (ARCS_Pointer_t)) #define ARCS_FV_Seek_Offset (28 * sizeof (ARCS_Pointer_t)) #define ARCS_FV_GetEnvironmentVariable_Offset (30 * sizeof (ARCS_Pointer_t)) +#define ARCS_FV_GetFileInformation_Offset (32 * sizeof (ARCS_Pointer_t)) int arcs_init(void *arcs_base) @@ -289,3 +290,20 @@ next = (struct ARCS_Component *)(intptr_t)nextd; return (next); } + +int +ARCS_GetFileInformation(int fd, struct ARCS_FileInformation *info) +{ + uint32_t (*GetFileInformation)(uint32_t, ARCS_Pointer_t); + int error; + uint32_t errord; + uint32_t fdd; + ARCS_Pointer_t infod; + + GetFileInformation = (uint32_t (*)(uint32_t, ARCS_Pointer_t))(intptr_t)*(ARCS_Pointer_t *)&ARCS_FV[ARCS_FV_GetFileInformation_Offset]; + fdd = (uint32_t)fd; + infod = (ARCS_Pointer_t)(intptr_t)info; + errord = (*GetFileInformation)(fdd, infod); + error = (int)errord; + return (error); +} ==== //depot/projects/mips/sys/dev/arcs/arcs.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs.h#7 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs.h#8 $ */ #ifndef _DEV_ARCS_ARCS_H_ @@ -144,6 +144,17 @@ ARCS_Pointer_t Identifier; } __packed; +/* Used to store file information. */ +struct ARCS_FileInformation { + uint64_t StartingAddress; + uint64_t EndingAddress; + uint64_t CurrentAddress; + uint32_t Type; + uint32_t FileNameLength; + uint8_t Attributes; + u_char Filename[32]; +} __packed; + /* * Firmware hooks. */ @@ -159,5 +170,6 @@ int ARCS_Seek(int, off_t *, int); struct ARCS_Component *ARCS_GetPeer(const struct ARCS_Component *); struct ARCS_Component *ARCS_GetChild(const struct ARCS_Component *); +int ARCS_GetFileInformation(int, struct ARCS_FileInformation *); #endif /* _DEV_ARCS_ARCS_H_ */ ==== //depot/projects/mips/sys/dev/arcs/arcs_disk.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs_disk.c#5 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs_disk.c#6 $ */ #include @@ -119,7 +119,9 @@ static int arcs_disk_attach(device_t dev) { + struct ARCS_FileInformation info; struct arcs_disk_softc *sc; + uint64_t size; int error; sc = device_get_softc(dev); @@ -127,13 +129,20 @@ error = ARCS_Open("scsi(0)disk(0)", ARCS_O_RDWR, &sc->sc_fd); if (error != 0) return (error); + + error = ARCS_GetFileInformation(sc->sc_fd, &info); + if (error != 0) + return (error); + size = info.EndingAddress - info.StartingAddress; + size %= ARCS_DISK_BSIZE; + device_printf(dev, "ARCS Disk scsi(0)disk(0) opened\n"); sc->sc_disk = disk_alloc(); sc->sc_disk->d_strategy = arcs_disk_strategy; sc->sc_disk->d_name = "arcs_disk"; sc->sc_disk->d_sectorsize = ARCS_DISK_BSIZE; - sc->sc_disk->d_mediasize = (off_t)8/*XXX*/ * ARCS_DISK_BSIZE; + sc->sc_disk->d_mediasize = (off_t)size; sc->sc_disk->d_fwsectors = 0; sc->sc_disk->d_fwheads = 0; sc->sc_disk->d_drv1 = sc; From owner-p4-projects@FreeBSD.ORG Sat Mar 19 21:54:48 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E635F16A4D0; Sat, 19 Mar 2005 21:54:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BBE8316A4CE for ; Sat, 19 Mar 2005 21:54:47 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99A1343D48 for ; Sat, 19 Mar 2005 21:54:47 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2JLsle2046062 for ; Sat, 19 Mar 2005 21:54:47 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2JLsl4W046059 for perforce@freebsd.org; Sat, 19 Mar 2005 21:54:47 GMT (envelope-from jmallett@freebsd.org) Date: Sat, 19 Mar 2005 21:54:47 GMT Message-Id: <200503192154.j2JLsl4W046059@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 73541 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, 19 Mar 2005 21:54:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=73541 Change 73541 by jmallett@jmallett_windward on 2005/03/19 21:53:55 dike out arcs disk Affected files ... .. //depot/projects/mips/sys/mips/conf/INDY#18 edit Differences ... ==== //depot/projects/mips/sys/mips/conf/INDY#18 (text+ko) ==== @@ -18,7 +18,10 @@ # Hardware support device arcs #ARCS Firmware + Console. -device arcs_disk #ARCS Disk. +#XXX/juli arcs disk doesn't work because we make ARCS deref a low addr. +# yay for ARCS being 32-bit. Really need to give up on using it for +# non-trivial stuff. +#device arcs_disk #ARCS Disk. device imc #IMC bus. device hpc #HPC bus. device gio #GIO bus. From owner-p4-projects@FreeBSD.ORG Sat Mar 19 22:02:58 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6919A16A4D0; Sat, 19 Mar 2005 22:02:58 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 40D4516A4CE for ; Sat, 19 Mar 2005 22:02:58 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE59343D2F for ; Sat, 19 Mar 2005 22:02:57 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2JM2vfl046418 for ; Sat, 19 Mar 2005 22:02:57 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2JM2vV0046415 for perforce@freebsd.org; Sat, 19 Mar 2005 22:02:57 GMT (envelope-from jmallett@freebsd.org) Date: Sat, 19 Mar 2005 22:02:57 GMT Message-Id: <200503192202.j2JM2vV0046415@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 73542 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, 19 Mar 2005 22:02:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=73542 Change 73542 by jmallett@jmallett_windward on 2005/03/19 22:02:16 Make the most of this realmem stuff. Affected files ... .. //depot/projects/mips/sys/mips/include/pmap.h#17 edit .. //depot/projects/mips/sys/mips/mips/machdep.c#52 edit .. //depot/projects/mips/sys/mips/mips/pmap.c#42 edit .. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#41 edit Differences ... ==== //depot/projects/mips/sys/mips/include/pmap.h#17 (text+ko) ==== @@ -72,7 +72,6 @@ extern pmap_t kernel_pmap; extern vm_offset_t phys_avail[]; -extern vm_size_t physsz; extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; ==== //depot/projects/mips/sys/mips/mips/machdep.c#52 (text+ko) ==== @@ -76,16 +76,13 @@ vm_offset_t kstack0; -vm_size_t physsz; - void cpu_startup(void *); SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL); void mips_init(void) { - physmem = btoc(physsz); - + init_param2(physmem); mips_cpu_init(); pmap_bootstrap(); ==== //depot/projects/mips/sys/mips/mips/pmap.c#42 (text+ko) ==== @@ -298,7 +298,7 @@ /* * Initialise TLB management, and have it allocate page tables. */ - tlb_bootstrap(physsz >> PAGE_SHIFT, pmap_steal_memory); + tlb_bootstrap(realmem, pmap_steal_memory); for (i = 0; phys_avail[i+2]; i+= 2) /* find non-empty ones */; ==== //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#41 (text+ko) ==== @@ -125,10 +125,10 @@ if (mem == NULL) break; - realmem += btoc(size); first = round_page(mem->BasePage << ARCS_PAGESHIFT); last = trunc_page(first + (mem->PageCount << ARCS_PAGESHIFT)); size = last - first; + realmem += btoc(size); switch (mem->Type) { case ARCS_Mem_Type_FirmwareTemporary: @@ -150,10 +150,8 @@ default: break; } - physsz += size; } - - init_param2(btoc(physsz)); + physmem = realmem; mips_init(); } From owner-p4-projects@FreeBSD.ORG Sat Mar 19 22:12:10 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D48C16A4D0; Sat, 19 Mar 2005 22:12:10 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B2E0216A4CE for ; Sat, 19 Mar 2005 22:12:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 81C0843D2F for ; Sat, 19 Mar 2005 22:12:09 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2JMC9rr046904 for ; Sat, 19 Mar 2005 22:12:09 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2JMC9ap046901 for perforce@freebsd.org; Sat, 19 Mar 2005 22:12:09 GMT (envelope-from jmallett@freebsd.org) Date: Sat, 19 Mar 2005 22:12:09 GMT Message-Id: <200503192212.j2JMC9ap046901@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 73543 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, 19 Mar 2005 22:12:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=73543 Change 73543 by jmallett@jmallett_windward on 2005/03/19 22:12:08 use ivars not softc. Affected files ... .. //depot/projects/mips/sys/dev/arcs/arcs_cpu.c#4 edit .. //depot/projects/mips/sys/dev/arcs/arcs_dev.c#7 edit .. //depot/projects/mips/sys/dev/arcs/arcs_fpu.c#4 edit .. //depot/projects/mips/sys/dev/arcs/arcs_system.c#5 edit Differences ... ==== //depot/projects/mips/sys/dev/arcs/arcs_cpu.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs_cpu.c#3 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs_cpu.c#4 $ */ #include @@ -56,7 +56,7 @@ static driver_t arcs_cpu_driver = { "arcs_cpu", arcs_cpu_methods, - sizeof (struct ARCS_Component *) + 1 }; static devclass_t arcs_cpu_devclass; @@ -68,7 +68,7 @@ { struct ARCS_Component *component, *child; - component = device_get_softc(dev); + component = device_get_ivars(dev); if (component == NULL) return (EINVAL); if (component->Flags & ARCS_Component_Flags_Failed) ==== //depot/projects/mips/sys/dev/arcs/arcs_dev.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs_dev.c#6 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs_dev.c#7 $ */ #include @@ -114,7 +114,7 @@ if (device != NULL) { me = device_add_child(parent, device, unit); if (me != NULL) - device_set_softc(me, this); + device_set_ivars(me, this); } else if (bootverbose) { device_printf(parent, "Not attaching ARCS device " @@ -139,6 +139,5 @@ root = ARCS_GetChild(NULL); if (root != NULL) arcs_configure(dev, root); - device_add_child(dev, "arcs_disk", 1); return (0); } ==== //depot/projects/mips/sys/dev/arcs/arcs_fpu.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs_fpu.c#3 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs_fpu.c#4 $ */ #include @@ -56,7 +56,7 @@ static driver_t arcs_fpu_driver = { "arcs_fpu", arcs_fpu_methods, - sizeof (struct ARCS_Component *) + 1 }; static devclass_t arcs_fpu_devclass; @@ -68,7 +68,7 @@ { struct ARCS_Component *component, *child; - component = device_get_softc(dev); + component = device_get_ivars(dev); if (component == NULL) return (EINVAL); if (component->Flags & ARCS_Component_Flags_Failed) ==== //depot/projects/mips/sys/dev/arcs/arcs_system.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs_system.c#4 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs_system.c#5 $ */ #include @@ -56,7 +56,7 @@ static driver_t arcs_system_driver = { "arcs_system", arcs_system_methods, - sizeof (struct ARCS_Component *) + 1 }; static devclass_t arcs_system_devclass; @@ -78,7 +78,7 @@ struct mainbus_name *mainbus; const char *system; - component = device_get_softc(dev); + component = device_get_ivars(dev); if (component == NULL) return (EINVAL); if (component->Flags & ARCS_Component_Flags_Failed) From owner-p4-projects@FreeBSD.ORG Sat Mar 19 22:36:41 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36A5E16A4D0; Sat, 19 Mar 2005 22:36:41 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0EBE716A4CF for ; Sat, 19 Mar 2005 22:36:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D94743D41 for ; Sat, 19 Mar 2005 22:36:40 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2JMae6S047890 for ; Sat, 19 Mar 2005 22:36:40 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2JMaer8047887 for perforce@freebsd.org; Sat, 19 Mar 2005 22:36:40 GMT (envelope-from jmallett@freebsd.org) Date: Sat, 19 Mar 2005 22:36:40 GMT Message-Id: <200503192236.j2JMaer8047887@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 73546 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, 19 Mar 2005 22:36:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=73546 Change 73546 by jmallett@jmallett_windward on 2005/03/19 22:36:39 Remove r5k and mips32/mips64 cache support for now. As per usual, this is support I'll want later, but it helps to remove some clutter. Affected files ... .. //depot/projects/mips/sys/conf/files.mips#43 edit .. //depot/projects/mips/sys/mips/include/cache.h#2 edit .. //depot/projects/mips/sys/mips/include/cache_mipsNN.h#2 delete .. //depot/projects/mips/sys/mips/include/cache_r5k.h#3 delete .. //depot/projects/mips/sys/mips/include/mipsNN.h#2 delete .. //depot/projects/mips/sys/mips/mips/cache.c#8 edit .. //depot/projects/mips/sys/mips/mips/cache_mipsNN.c#3 delete .. //depot/projects/mips/sys/mips/mips/cache_r5k.c#5 delete .. //depot/projects/mips/sys/mips/mips/cache_r5k_subr.S#5 delete .. //depot/projects/mips/sys/mips/mips/machdep.c#53 edit Differences ... ==== //depot/projects/mips/sys/conf/files.mips#43 (text+ko) ==== @@ -34,10 +34,7 @@ mips/mips/vm_machdep.c standard # XXX cache code needs to be split up per CPU type, but yuck. mips/mips/cache.c standard -mips/mips/cache_mipsNN.c standard mips/mips/cache_r4k.c standard -mips/mips/cache_r5k.c standard -mips/mips/cache_r5k_subr.S standard mips/mips/db_disasm.c optional ddb mips/mips/db_hwwatch.c optional ddb ==== //depot/projects/mips/sys/mips/include/cache.h#2 (text+ko) ==== @@ -135,20 +135,11 @@ void (*mco_pdcache_wb_range)(vm_paddr_t, vm_size_t); /* These are called only by the (mipsNN) icache functions. */ - void (*mco_intern_pdcache_wbinv_all)(void); - void (*mco_intern_pdcache_wbinv_range_index)(vm_paddr_t, vm_size_t); - void (*mco_intern_pdcache_wb_range)(vm_paddr_t, vm_size_t); - void (*mco_sdcache_wbinv_all)(void); void (*mco_sdcache_wbinv_range)(vm_paddr_t, vm_size_t); void (*mco_sdcache_wbinv_range_index)(vm_paddr_t, vm_size_t); void (*mco_sdcache_inv_range)(vm_paddr_t, vm_size_t); void (*mco_sdcache_wb_range)(vm_paddr_t, vm_size_t); - - /* These are called only by the (mipsNN) icache functions. */ - void (*mco_intern_sdcache_wbinv_all)(void); - void (*mco_intern_sdcache_wbinv_range_index)(vm_paddr_t, vm_size_t); - void (*mco_intern_sdcache_wb_range)(vm_paddr_t, vm_size_t); }; extern struct mips_cache_ops mips_cache_ops; @@ -199,11 +190,6 @@ extern u_int mips_cache_alias_mask; extern u_int mips_cache_prefer_mask; -/* - * XXX XXX XXX THIS SHOULD NOT EXIST XXX XXX XXX - */ -#define mips_cache_indexof(x) (((vm_paddr_t)(x)) & mips_cache_alias_mask) - #define __mco_noargs(prefix, x) \ do { \ (*mips_cache_ops.mco_ ## prefix ## p ## x )(); \ @@ -242,21 +228,5 @@ #define mips_dcache_wb_range(v, s) \ __mco_2args(, dcache_wb_range, (v), (s)) - -/* - * Private D-cache functions only called from (currently only the - * mipsNN) I-cache functions. - */ -#define mips_intern_dcache_wbinv_all() \ - __mco_noargs(intern_, dcache_wbinv_all) - -#define mips_intern_dcache_wbinv_range_index(v, s) \ - __mco_2args(intern_, dcache_wbinv_range_index, (v), (s)) - -#define mips_intern_dcache_wb_range(v, s) \ - __mco_2args(intern_, dcache_wb_range, (v), (s)) - void mips_config_cache(void); void mips_dcache_compute_align(void); - -#include ==== //depot/projects/mips/sys/mips/mips/cache.c#8 (text+ko) ==== @@ -76,11 +76,7 @@ #include #include -#include -#include /* MIPS32/MIPS64 registers */ -#include - /* PRIMARY CACHE VARIABLES */ u_int mips_picache_size; u_int mips_picache_line_size; @@ -231,24 +227,6 @@ * Configure primary caches. */ switch (MIPS_PRID_IMPL(cpu_id)) { - case MIPS_R4100: - /* - * R4100 (NEC VR series) revision number means: - * - * MIPS_PRID_REV_MAJ MIPS_PRID_REV_MIN - * VR4102 4 ? - * VR4111 5 ? - * VR4181 5 ? - * VR4121 6 ? - * VR4122 7 0 or 1 - * VR4181A 7 3 < - * VR4131 8 ? - */ - /* Vr4131 has R4600 style 2-way set-associative cache */ - if (MIPS_PRID_REV_MAJ(cpu_id) == 8) - goto primary_cache_is_2way; - /* FALLTHROUGH */ - case MIPS_R4000: case MIPS_R4300: mips_picache_ways = 1; @@ -316,102 +294,6 @@ /* Virtually-indexed cache; no use for colors. */ break; - case MIPS_R4600: -#ifdef ENABLE_MIPS_R4700 - case MIPS_R4700: -#endif -#ifndef ENABLE_MIPS_R3NKK - case MIPS_R5000: -#endif - case MIPS_RM5200: -primary_cache_is_2way: - mips_picache_ways = 2; - mips_pdcache_ways = 2; - - mips3_get_cache_config(csizebase); - - switch (mips_picache_line_size) { - case 32: - mips_cache_ops.mco_icache_sync_all = - r5k_icache_sync_all_32; - mips_cache_ops.mco_icache_sync_range = - r5k_icache_sync_range_32; - mips_cache_ops.mco_icache_sync_range_index = - r5k_icache_sync_range_index_32; - break; - - default: - panic("r5k picache line size %d", - mips_picache_line_size); - } - - switch (mips_pdcache_line_size) { - case 16: - mips_cache_ops.mco_pdcache_wbinv_all = - r5k_pdcache_wbinv_all_16; - mips_cache_ops.mco_pdcache_wbinv_range = - r5k_pdcache_wbinv_range_16; - mips_cache_ops.mco_pdcache_wbinv_range_index = - r5k_pdcache_wbinv_range_index_16; - mips_cache_ops.mco_pdcache_inv_range = - r5k_pdcache_inv_range_16; - mips_cache_ops.mco_pdcache_wb_range = - r5k_pdcache_wb_range_16; - break; - - case 32: - mips_cache_ops.mco_pdcache_wbinv_all = - r5k_pdcache_wbinv_all_32; - mips_cache_ops.mco_pdcache_wbinv_range = - r5k_pdcache_wbinv_range_32; - mips_cache_ops.mco_pdcache_wbinv_range_index = - r5k_pdcache_wbinv_range_index_32; - mips_cache_ops.mco_pdcache_inv_range = - r5k_pdcache_inv_range_32; - mips_cache_ops.mco_pdcache_wb_range = - r5k_pdcache_wb_range_32; - break; - - default: - panic("r5k pdcache line size %d", - mips_pdcache_line_size); - } - - /* - * Deal with R4600 chip bugs. - */ - if (MIPS_PRID_IMPL(cpu_id) == MIPS_R4600 && - MIPS_PRID_REV_MAJ(cpu_id) == 1) { - KASSERT(mips_pdcache_line_size == 32, ("line size 32")); - mips_cache_ops.mco_pdcache_wbinv_range = - r4600v1_pdcache_wbinv_range_32; - mips_cache_ops.mco_pdcache_inv_range = - r4600v1_pdcache_inv_range_32; - mips_cache_ops.mco_pdcache_wb_range = - r4600v1_pdcache_wb_range_32; - } else if (MIPS_PRID_IMPL(cpu_id) == MIPS_R4600 && - MIPS_PRID_REV_MAJ(cpu_id) == 2) { - KASSERT(mips_pdcache_line_size == 32, ("line size 32")); - mips_cache_ops.mco_pdcache_wbinv_range = - r4600v2_pdcache_wbinv_range_32; - mips_cache_ops.mco_pdcache_inv_range = - r4600v2_pdcache_inv_range_32; - mips_cache_ops.mco_pdcache_wb_range = - r4600v2_pdcache_wb_range_32; - } - - /* - * Deal with VR4131 chip bugs. - */ - if (MIPS_PRID_IMPL(cpu_id) == MIPS_R4100 && - MIPS_PRID_REV_MAJ(cpu_id) == 8) { - KASSERT(mips_pdcache_line_size == 16, ("line size 16")); - mips_cache_ops.mco_pdcache_wbinv_range = - vr4131v1_pdcache_wbinv_range_16; - } - - /* Virtually-indexed cache; no use for colors. */ - break; default: panic("can't handle primary cache on impl 0x%x", MIPS_PRID_IMPL(cpu_id)); @@ -510,22 +392,6 @@ mips_sdcache_ways, mips_sdcache_line_size); } break; -#ifndef ENABLE_MIPS_R3NKK - case MIPS_R5000: -#endif - case MIPS_RM5200: - mips_cache_ops.mco_sdcache_wbinv_all = - r5k_sdcache_wbinv_all; - mips_cache_ops.mco_sdcache_wbinv_range = - r5k_sdcache_wbinv_range; - mips_cache_ops.mco_sdcache_wbinv_range_index = - r5k_sdcache_wbinv_rangeall; /* XXX? */ - mips_cache_ops.mco_sdcache_inv_range = - r5k_sdcache_wbinv_range; - mips_cache_ops.mco_sdcache_wb_range = - r5k_sdcache_wb_range; - break; - default: panic("can't handle secondary cache on impl 0x%x", MIPS_PRID_IMPL(cpu_id)); @@ -559,7 +425,6 @@ void mips3_get_cache_config(int csizebase) { - int has_sdcache_enable = 0; uint32_t config; config = mips_rd_config(); @@ -579,15 +444,6 @@ mips_cache_prefer_mask = max(mips_pdcache_size, mips_picache_size) - 1; - switch(MIPS_PRID_IMPL(cpu_id)) { -#ifndef ENABLE_MIPS_R3NKK - case MIPS_R5000: -#endif - case MIPS_RM5200: - has_sdcache_enable = 1; - break; - } - /* * If CPU has a software-enabled L2 cache, check both if it's * present and if it's enabled before making assumptions the @@ -595,17 +451,7 @@ * as if there were no L2 cache. */ if ((config & MIPS_CONFIG_SC) == 0) { - if (has_sdcache_enable == 0 || - (has_sdcache_enable && (config & MIPS_CONFIG_SE))) { - mips_sdcache_line_size = - MIPS_CONFIG_CACHE_L2_LSIZE(config); - if ((config & MIPS_CONFIG_SS) == 0) - mips_scache_unified = 1; - } else { -#ifdef CACHE_DEBUG - printf("External cache detected, but is disabled -- WILL NOT ENABLE!\n"); -#endif /* CACHE_DEBUG */ - } + printf("External cache detected, but is disabled -- WILL NOT ENABLE!\n"); } } ==== //depot/projects/mips/sys/mips/mips/machdep.c#53 (text+ko) ==== @@ -56,7 +56,6 @@ #include #include #include -#include #include #include