From owner-p4-projects@FreeBSD.ORG Sun Jun 22 08:12:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5C5037B404; Sun, 22 Jun 2003 08:12:02 -0700 (PDT) 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 875FF37B401 for ; Sun, 22 Jun 2003 08:12:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1630343F93 for ; Sun, 22 Jun 2003 08:12:02 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5MFC10U045181 for ; Sun, 22 Jun 2003 08:12:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5MFC1Cr045167 for perforce@freebsd.org; Sun, 22 Jun 2003 08:12:01 -0700 (PDT) Date: Sun, 22 Jun 2003 08:12:01 -0700 (PDT) Message-Id: <200306221512.h5MFC1Cr045167@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 33523 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, 22 Jun 2003 15:12:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=33523 Change 33523 by rwatson@rwatson_powerbook on 2003/06/22 08:11:10 Add the license used to cover NAI-developed pieces of the port of the TrustedBSD MAC Framework to Darwin. Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/NAI_LICENSE#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jun 22 08:25:20 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1C4B37B404; Sun, 22 Jun 2003 08:25:19 -0700 (PDT) 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 60CD437B401 for ; Sun, 22 Jun 2003 08:25:19 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD53C43FA3 for ; Sun, 22 Jun 2003 08:25:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5MFPI0U049772 for ; Sun, 22 Jun 2003 08:25:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5MFPIVR049769 for perforce@freebsd.org; Sun, 22 Jun 2003 08:25:18 -0700 (PDT) Date: Sun, 22 Jun 2003 08:25:18 -0700 (PDT) Message-Id: <200306221525.h5MFPIVR049769@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 33524 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, 22 Jun 2003 15:25:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=33524 Change 33524 by rwatson@rwatson_powerbook on 2003/06/22 08:25:00 Substitute Mach mutex_t calls for FreeBSD struct mtx calls; lock using mutex_lock(), allocate using mutex_alloc(). The Mach API prevents us from storing the mutex statically; we must pass around the pointers. "#if 0" all mutex references to Giant; we'll need to look at the funnel issues here; the BSD funnel is probably right one for all of these cases, since they generally have to do with VFS, but we'll need to check that. Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mac.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mac.c#8 (text+ko) ==== @@ -259,7 +259,7 @@ * exclusive consumers that they should try to acquire the lock if a * first attempt at exclusive access fails. */ -static mutex_t mac_policy_mtx; +static mutex_t *mac_policy_mtx; static struct cv mac_policy_cv; static int mac_policy_count; static LIST_HEAD(, mac_policy_conf) mac_policy_list; @@ -279,9 +279,9 @@ { WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "mac_policy_grab_exclusive() at %s:%d", __FILE__, __LINE__); - mtx_lock(&mac_policy_mtx); + mutex_lock(mac_policy_mtx); while (mac_policy_count != 0) - cv_wait(&mac_policy_cv, &mac_policy_mtx); + cv_wait(&mac_policy_cv, mac_policy_mtx); } static __inline void @@ -298,16 +298,16 @@ KASSERT(mac_policy_count == 0, ("mac_policy_release_exclusive(): not exclusive")); - mtx_unlock(&mac_policy_mtx); + mutex_unlock(mac_policy_mtx); cv_signal(&mac_policy_cv); } static __inline void mac_policy_list_busy(void) { - mtx_lock(&mac_policy_mtx); + mutex_lock(mac_policy_mtx); mac_policy_count++; - mtx_unlock(&mac_policy_mtx); + mutex_unlock(mac_policy_mtx); } static __inline int @@ -315,25 +315,25 @@ { int ret; - mtx_lock(&mac_policy_mtx); + mutex_lock(mac_policy_mtx); if (!LIST_EMPTY(&mac_policy_list)) { mac_policy_count++; ret = 1; } else ret = 0; - mtx_unlock(&mac_policy_mtx); + mutex_unlock(mac_policy_mtx); return (ret); } static __inline void mac_policy_list_unbusy(void) { - mtx_lock(&mac_policy_mtx); + mutex_lock(mac_policy_mtx); mac_policy_count--; KASSERT(mac_policy_count >= 0, ("MAC_POLICY_LIST_LOCK")); if (mac_policy_count == 0) cv_signal(&mac_policy_cv); - mtx_unlock(&mac_policy_mtx); + mutex_unlock(mac_policy_mtx); } /* @@ -491,7 +491,7 @@ LIST_INIT(&mac_static_policy_list); LIST_INIT(&mac_policy_list); - mtx_init(&mac_policy_mtx, "mac_policy_mtx", NULL, MTX_DEF); + mac_policy_mtx = mutex_alloc(ETAP_NO_TRACE); cv_init(&mac_policy_cv, "mac_policy_cv"); } @@ -3514,9 +3514,9 @@ #if 0 if (mac_enforce_vm) { - mtx_lock(&Giant); + mutex_lock(Giant); /* XXX FUNNEL? */ mac_cred_mmapped_drop_perms(td, newcred); - mtx_unlock(&Giant); + mutex_unlock(Giant); /* XXX FUNNEL? */ } #endif @@ -3561,7 +3561,9 @@ } buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); - mtx_lock(&Giant); /* VFS */ +#if 0 + mutex_lock(&Giant); /* VFS */ /* XXX FUNNEL? */ +#endif error = fget(td, uap->fd, &fp); if (error) goto out; @@ -3620,7 +3622,9 @@ error = copyout(buffer, mac.m_string, strlen(buffer)+1); out: - mtx_unlock(&Giant); /* VFS */ +#if 0 + mutex_unlock(&Giant); /* VFS */ /* XXX FUNNEL? */ +#endif free(buffer, M_MACTEMP); free(elements, M_MACTEMP); @@ -3655,7 +3659,9 @@ } buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); - mtx_lock(&Giant); /* VFS */ +#if 0 + mutex_lock(&Giant); /* VFS */ /* XXX FUNNEL? */ +#endif NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, uap->path_p, td); error = namei(&nd); @@ -3674,7 +3680,9 @@ error = copyout(buffer, mac.m_string, strlen(buffer)+1); out: - mtx_unlock(&Giant); /* VFS */ +#if 0 + mutex_unlock(&Giant); /* VFS */ /* XXX FUNNEL? */ +#endif free(buffer, M_MACTEMP); free(elements, M_MACTEMP); @@ -3710,7 +3718,9 @@ } buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); - mtx_lock(&Giant); /* VFS */ +#if 0 + mutex_lock(&Giant); /* VFS */ /* XXX FUNNEL? */ +#endif NDINIT(&nd, LOOKUP, LOCKLEAF | NOFOLLOW, UIO_USERSPACE, uap->path_p, td); error = namei(&nd); @@ -3728,7 +3738,9 @@ error = copyout(buffer, mac.m_string, strlen(buffer)+1); out: - mtx_unlock(&Giant); /* VFS */ +#if 0 + mutex_unlock(&Giant); /* VFS */ /* XXX FUNNEL? */ +#endif free(buffer, M_MACTEMP); free(elements, M_MACTEMP); @@ -3768,7 +3780,9 @@ return (error); } - mtx_lock(&Giant); /* VFS */ +#if 0 + mutex_lock(&Giant); /* VFS */ /* XXX FUNNEL? */ +#endif error = fget(td, uap->fd, &fp); if (error) @@ -3821,7 +3835,9 @@ fdrop(fp, td); out: - mtx_unlock(&Giant); /* VFS */ +#if 0 + mutex_unlock(&Giant); /* VFS */ /* XXX FUNNEL? */ +#endif free(buffer, M_MACTEMP); @@ -3864,7 +3880,9 @@ return (error); } - mtx_lock(&Giant); /* VFS */ +#if 0 + mutex_lock(&Giant); /* VFS */ /* XXX FUNNEL? */ +#endif NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, uap->path_p, td); @@ -3878,7 +3896,9 @@ } NDFREE(&nd, 0); - mtx_unlock(&Giant); /* VFS */ +#if 0 + mutex_unlock(&Giant); /* VFS */ /* XXX FUNNEL? */ +#endif mac_destroy_vnode_label(&intlabel); return (error); @@ -3920,7 +3940,9 @@ return (error); } - mtx_lock(&Giant); /* VFS */ +#if 0 + mutex_lock(&Giant); /* VFS */ /* XXX FUNNEL? */ +#endif NDINIT(&nd, LOOKUP, LOCKLEAF | NOFOLLOW, UIO_USERSPACE, uap->path_p, td); @@ -3934,7 +3956,9 @@ } NDFREE(&nd, 0); - mtx_unlock(&Giant); /* VFS */ +#if 0 + mutex_unlock(&Giant); /* VFS */ /* XXX FUNNEL? */ +#endif mac_destroy_vnode_label(&intlabel); return (error); From owner-p4-projects@FreeBSD.ORG Sun Jun 22 08:41:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B223437B407; Sun, 22 Jun 2003 08:41:40 -0700 (PDT) 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 6355237B404 for ; Sun, 22 Jun 2003 08:41:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC51F43F85 for ; Sun, 22 Jun 2003 08:41:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5MFfd0U053849 for ; Sun, 22 Jun 2003 08:41:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5MFfdef053843 for perforce@freebsd.org; Sun, 22 Jun 2003 08:41:39 -0700 (PDT) Date: Sun, 22 Jun 2003 08:41:39 -0700 (PDT) Message-Id: <200306221541.h5MFfdef053843@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 33526 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, 22 Jun 2003 15:41:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=33526 Change 33526 by rwatson@rwatson_powerbook on 2003/06/22 08:40:46 Rewrite MAC mbuf code to hold the mbuf label in the mbuf header, as that's easier in the short term than adding m_tags to Darwin. However, we might want to do that at a later date instead. Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mac.c#9 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mac.c#9 (text+ko) ==== @@ -747,8 +747,11 @@ struct m_tag *tag; struct label *label; +#if 0 tag = m_tag_find(mbuf, PACKET_TAG_MACLABEL, NULL); label = (struct label *)(tag+1); +#endif + label = &mbuf->m_pkthdr.label; return (label); } @@ -851,6 +854,7 @@ return (error); } +#if 0 int mac_init_mbuf_tag(struct m_tag *tag, int flag) { @@ -871,6 +875,7 @@ #endif return (error); } +#endif int mac_init_mbuf(struct mbuf *m, int flag) @@ -880,6 +885,7 @@ M_ASSERTPKTHDR(m); +#if 0 #ifndef MAC_ALWAYS_LABEL_MBUF /* * Don't reserve space for labels on mbufs unless we have a policy @@ -900,7 +906,19 @@ #ifndef MAC_ALWAYS_LABEL_MBUF } #endif - return (0); +#else + mac_init_label(&m->m_pkthdr.label); + MAC_CHECK(init_mbuf_label, &m->m_pkthdr.label, flag); + if (error) { + MAC_PERFORM(destroy_mbuf_label, &m->m_pkthdr.label); + mac_destroy(&m->m_pkthdr.label); + } +#ifdef MAC_DEBUG + if (error == 0) + atomic_add_int(&nmacmbufs, 1); +#endif +#endif + return (error); } void @@ -1094,14 +1112,11 @@ } void -mac_destroy_mbuf_tag(struct m_tag *tag) +mac_destroy_mbuf(struct mbuf *m) { - struct label *label; - label = (struct label *)(tag+1); - - MAC_PERFORM(destroy_mbuf_label, label); - mac_destroy_label(label); + MAC_PERFORM(destroy_mbuf_label, &m->m_pkthdr.label); + mac_destroy_label(&mk->m_pkthdr.label); #ifdef MAC_DEBUG atomic_subtract_int(&nmacmbufs, 1); #endif @@ -1198,18 +1213,10 @@ } void -mac_copy_mbuf_tag(struct m_tag *src, struct m_tag *dest) +mac_copy_mbuf(struct mbuf *src, struct dst *dest) { - struct label *src_label, *dest_label; - src_label = (struct label *)(src+1); - dest_label = (struct label *)(dest+1); - - /* - * mac_init_mbuf_tag() is called on the target tag in - * m_tag_copy(), so we don't need to call it here. - */ - MAC_PERFORM(copy_mbuf_label, src_label, dest_label); + MAC_PERFORM(copy_mbuf_label, &src->m_pkthdr.label, &dst->m_pkthdr.label); } #if 0 From owner-p4-projects@FreeBSD.ORG Sun Jun 22 08:45:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B39937B404; Sun, 22 Jun 2003 08:45:46 -0700 (PDT) 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 D4CA637B401 for ; Sun, 22 Jun 2003 08:45:45 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 76EE243F75 for ; Sun, 22 Jun 2003 08:45:45 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5MFjj0U055805 for ; Sun, 22 Jun 2003 08:45:45 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5MFjjvV055801 for perforce@freebsd.org; Sun, 22 Jun 2003 08:45:45 -0700 (PDT) Date: Sun, 22 Jun 2003 08:45:45 -0700 (PDT) Message-Id: <200306221545.h5MFjjvV055801@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 33527 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, 22 Jun 2003 15:45:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=33527 Change 33527 by rwatson@rwatson_powerbook on 2003/06/22 08:45:32 We now need to include mbuf.h to get the pkthdr definition; correct typos in argument types hidden by those warnings. Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mac.c#10 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mac.c#10 (text+ko) ==== @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -1116,7 +1117,7 @@ { MAC_PERFORM(destroy_mbuf_label, &m->m_pkthdr.label); - mac_destroy_label(&mk->m_pkthdr.label); + mac_destroy_label(&m->m_pkthdr.label); #ifdef MAC_DEBUG atomic_subtract_int(&nmacmbufs, 1); #endif @@ -1213,7 +1214,7 @@ } void -mac_copy_mbuf(struct mbuf *src, struct dst *dest) +mac_copy_mbuf(struct mbuf *src, struct mbuf *dst) { MAC_PERFORM(copy_mbuf_label, &src->m_pkthdr.label, &dst->m_pkthdr.label); From owner-p4-projects@FreeBSD.ORG Mon Jun 23 02:29:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B926537B404; Mon, 23 Jun 2003 02:29:48 -0700 (PDT) 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 4BC8737B401 for ; Mon, 23 Jun 2003 02:29:48 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1AABF43FCB for ; Mon, 23 Jun 2003 02:29:47 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5N9Tl0U013067 for ; Mon, 23 Jun 2003 02:29:47 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5N9TjDE013064 for perforce@freebsd.org; Mon, 23 Jun 2003 02:29:45 -0700 (PDT) Date: Mon, 23 Jun 2003 02:29:45 -0700 (PDT) Message-Id: <200306230929.h5N9TjDE013064@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 33557 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, 23 Jun 2003 09:29:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=33557 Change 33557 by marcel@marcel_nfs on 2003/06/23 02:29:01 IFC @33556 Affected files ... .. //depot/projects/ia64/Makefile#26 integrate .. //depot/projects/ia64/Makefile.inc1#67 integrate .. //depot/projects/ia64/bin/cp/utils.c#9 integrate .. //depot/projects/ia64/contrib/gdtoa/gdtoaimp.h#5 integrate .. //depot/projects/ia64/contrib/groff/src/roff/nroff/nroff.sh#4 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#15 integrate .. //depot/projects/ia64/etc/rc.d/devdb#3 delete .. //depot/projects/ia64/gnu/usr.bin/send-pr/categories#5 integrate .. //depot/projects/ia64/gnu/usr.bin/send-pr/send-pr.1#6 integrate .. //depot/projects/ia64/include/paths.h#9 integrate .. //depot/projects/ia64/include/stdlib.h#19 integrate .. //depot/projects/ia64/lib/libc/compat-43/sigpause.2#4 integrate .. //depot/projects/ia64/lib/libc/gdtoa/glue.c#2 integrate .. //depot/projects/ia64/lib/libc/gen/devname.3#5 integrate .. //depot/projects/ia64/lib/libc/gen/devname.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/ttyname.c#3 integrate .. //depot/projects/ia64/lib/libc/sys/ntp_adjtime.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/ntp_gettime.2#2 integrate .. //depot/projects/ia64/lib/libpthread/Makefile#8 integrate .. //depot/projects/ia64/lib/libpthread/arch/alpha/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libpthread/arch/alpha/alpha/_atomic_lock.S#2 delete .. //depot/projects/ia64/lib/libpthread/arch/i386/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libpthread/arch/ia64/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libpthread/arch/ia64/ia64/_atomic_lock.S#2 delete .. //depot/projects/ia64/lib/libpthread/arch/ia64/include/atomic_ops.h#1 branch .. //depot/projects/ia64/lib/libpthread/arch/ia64/include/pthread_md.h#1 branch .. //depot/projects/ia64/lib/libpthread/sys/Makefile.inc#5 integrate .. //depot/projects/ia64/libexec/ftpd/ftpcmd.y#16 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#20 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#99 integrate .. //depot/projects/ia64/release/picobsd/bridge/PICOBSD#4 integrate .. //depot/projects/ia64/release/picobsd/bridge/crunch.conf#6 integrate .. //depot/projects/ia64/sbin/dmesg/dmesg.c#5 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#20 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#16 integrate .. //depot/projects/ia64/share/man/man4/pci.4#2 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_mount.c#9 integrate .. //depot/projects/ia64/sys/amd64/amd64/mem.c#3 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/ia64/sys/amd64/include/pmap.h#4 integrate .. //depot/projects/ia64/sys/compat/linux/linux_file.c#16 integrate .. //depot/projects/ia64/sys/compat/linux/linux_stats.c#13 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_fcntl.c#10 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#20 integrate .. //depot/projects/ia64/sys/conf/files#82 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#34 integrate .. //depot/projects/ia64/sys/dev/md/md.c#30 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#24 integrate .. //depot/projects/ia64/sys/dev/pci/pci_user.c#7 integrate .. //depot/projects/ia64/sys/fs/fdescfs/fdesc_vnops.c#14 integrate .. //depot/projects/ia64/sys/fs/ntfs/ntfs_subr.c#11 integrate .. //depot/projects/ia64/sys/fs/pseudofs/pseudofs_vnops.c#18 integrate .. //depot/projects/ia64/sys/fs/unionfs/union_subr.c#13 integrate .. //depot/projects/ia64/sys/i386/bios/apm.c#3 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_misc.c#11 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_stat.c#7 integrate .. //depot/projects/ia64/sys/i386/isa/pcf.c#6 integrate .. //depot/projects/ia64/sys/kern/kern_acl.c#17 integrate .. //depot/projects/ia64/sys/kern/kern_alq.c#7 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#58 integrate .. //depot/projects/ia64/sys/kern/kern_ktr.c#12 integrate .. //depot/projects/ia64/sys/kern/kern_mac.c#28 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#53 integrate .. //depot/projects/ia64/sys/kern/kern_timeout.c#8 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#19 integrate .. //depot/projects/ia64/sys/kern/subr_log.c#11 integrate .. //depot/projects/ia64/sys/kern/subr_msgbuf.c#1 branch .. //depot/projects/ia64/sys/kern/subr_prf.c#27 integrate .. //depot/projects/ia64/sys/kern/tty.c#29 integrate .. //depot/projects/ia64/sys/kern/tty_cons.c#14 integrate .. //depot/projects/ia64/sys/kern/vfs_aio.c#35 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#54 integrate .. //depot/projects/ia64/sys/kern/vfs_syscalls.c#47 integrate .. //depot/projects/ia64/sys/kern/vfs_vnops.c#32 integrate .. //depot/projects/ia64/sys/kern/vnode_if.src#13 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#19 integrate .. //depot/projects/ia64/sys/netsmb/smb_dev.c#12 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_serv.c#22 integrate .. //depot/projects/ia64/sys/pci/viapm.c#5 integrate .. //depot/projects/ia64/sys/security/mac_biba/mac_biba.c#19 integrate .. //depot/projects/ia64/sys/security/mac_lomac/mac_lomac.c#12 integrate .. //depot/projects/ia64/sys/security/mac_mls/mac_mls.c#19 integrate .. //depot/projects/ia64/sys/security/mac_none/mac_none.c#9 integrate .. //depot/projects/ia64/sys/security/mac_partition/mac_partition.c#5 integrate .. //depot/projects/ia64/sys/security/mac_test/mac_test.c#10 integrate .. //depot/projects/ia64/sys/sparc64/include/bus.h#17 integrate .. //depot/projects/ia64/sys/sparc64/include/cpufunc.h#9 integrate .. //depot/projects/ia64/sys/sparc64/pci/psycho.c#27 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/support.S#7 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/trap.c#28 integrate .. //depot/projects/ia64/sys/sys/alq.h#3 integrate .. //depot/projects/ia64/sys/sys/fcntl.h#5 integrate .. //depot/projects/ia64/sys/sys/file.h#18 integrate .. //depot/projects/ia64/sys/sys/mac_policy.h#15 integrate .. //depot/projects/ia64/sys/sys/msgbuf.h#6 integrate .. //depot/projects/ia64/sys/sys/tty.h#7 integrate .. //depot/projects/ia64/sys/tools/vnode_if.awk#7 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#30 integrate .. //depot/projects/ia64/sys/vm/swap_pager.h#10 integrate .. //depot/projects/ia64/sys/vm/vm_fault.c#34 integrate .. //depot/projects/ia64/sys/vm/vm_mmap.c#20 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#61 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#48 integrate .. //depot/projects/ia64/sys/vm/vm_pager.c#13 integrate .. //depot/projects/ia64/sys/vm/vm_pager.h#7 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#34 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.pl#14 integrate .. //depot/projects/ia64/usr.bin/Makefile#48 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.computer#3 integrate .. //depot/projects/ia64/usr.bin/locale/Makefile#2 integrate .. //depot/projects/ia64/usr.bin/locale/locale.1#1 branch .. //depot/projects/ia64/usr.bin/locale/locale.c#2 integrate .. //depot/projects/ia64/usr.sbin/Makefile#41 integrate .. //depot/projects/ia64/usr.sbin/adduser/adduser.8#11 integrate .. //depot/projects/ia64/usr.sbin/adduser/adduser.sh#8 integrate .. //depot/projects/ia64/usr.sbin/adduser/rmuser.sh#5 integrate .. //depot/projects/ia64/usr.sbin/apmd/apmd.8#4 integrate .. //depot/projects/ia64/usr.sbin/apmd/apmd.c#2 integrate .. //depot/projects/ia64/usr.sbin/dev_mkdb/Makefile#2 delete .. //depot/projects/ia64/usr.sbin/dev_mkdb/dev_mkdb.8#5 delete .. //depot/projects/ia64/usr.sbin/dev_mkdb/dev_mkdb.c#7 delete .. //depot/projects/ia64/usr.sbin/gifconfig/Makefile#2 delete .. //depot/projects/ia64/usr.sbin/gifconfig/gifconfig.8#6 delete .. //depot/projects/ia64/usr.sbin/gifconfig/gifconfig.c#3 delete .. //depot/projects/ia64/usr.sbin/lpr/filters.ru/koi2855/koi2855.c#3 integrate .. //depot/projects/ia64/usr.sbin/pciconf/pciconf.c#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/command.c#15 integrate .. //depot/projects/ia64/usr.sbin/ppp/ncpaddr.c#9 integrate .. //depot/projects/ia64/usr.sbin/ppp/ppp.8.m4#17 integrate .. //depot/projects/ia64/usr.sbin/ppp/radius.c#10 integrate .. //depot/projects/ia64/usr.sbin/ppp/radius.h#7 integrate .. //depot/projects/ia64/usr.sbin/prefix/Makefile#3 delete .. //depot/projects/ia64/usr.sbin/prefix/prefix.8#6 delete .. //depot/projects/ia64/usr.sbin/prefix/prefix.sh#2 delete Differences ... ==== //depot/projects/ia64/Makefile#26 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.280 2003/04/03 05:34:36 imp Exp $ +# $FreeBSD: src/Makefile,v 1.282 2003/06/22 21:56:22 ru Exp $ # # The user-driven targets are: # @@ -11,7 +11,9 @@ # world - buildworld + installworld. # buildkernel - Rebuild the kernel and the kernel-modules. # installkernel - Install the kernel and the kernel-modules. +# installkernel.debug # reinstallkernel - Reinstall the kernel and the kernel-modules. +# reinstallkernel.debug # kernel - buildkernel + installkernel. # update - Convenient way to update your source tree (cvs). # most - Build user commands, no libraries or include files. @@ -60,8 +62,9 @@ # TGTS= all all-man buildkernel buildworld checkdpadd clean \ cleandepend cleandir depend distribute distributeworld everything \ - hierarchy install installcheck installkernel \ - reinstallkernel installmost installworld libraries lint maninstall \ + hierarchy install installcheck installkernel installkernel.debug\ + reinstallkernel reinstallkernel.debug installmost installworld \ + libraries lint maninstall \ mk most obj objlink regress rerelease tags update BITGTS= files includes @@ -71,7 +74,9 @@ .ORDER: buildworld distributeworld .ORDER: buildworld buildkernel .ORDER: buildkernel installkernel +.ORDER: buildkernel installkernel.debug .ORDER: buildkernel reinstallkernel +.ORDER: buildkernel reinstallkernel.debug PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKEOBJDIRPREFIX?= /usr/obj @@ -135,7 +140,7 @@ # upgrade_checks: @if ! (cd ${.CURDIR}/tools/regression/usr.bin/make && \ - PATH=${PATH} ${MAKE} 2>/dev/null); \ + PATH=${PATH} ${MAKE} >/dev/null 2>&1); \ then \ (cd ${.CURDIR} && make make); \ fi @@ -155,7 +160,7 @@ make: @echo @echo "--------------------------------------------------------------" - @echo " Building an up-to-date make(1)" + @echo ">>> Building an up-to-date make(1)" @echo "--------------------------------------------------------------" @cd ${.CURDIR}/usr.bin/make; \ ${MMAKE} obj && \ ==== //depot/projects/ia64/Makefile.inc1#67 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.367 2003/06/14 17:50:13 imp Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.368 2003/06/22 10:01:03 simokawa Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -538,14 +538,14 @@ # # Install the kernel defined by INSTALLKERNEL # -installkernel reinstallkernel: +installkernel reinstallkernel installkernel.debug reinstallkernel.debug: .if empty(INSTALLKERNEL) @echo "ERROR: No kernel \"${KERNCONF}\" to install." @false .endif cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ ${CROSSENV} PATH=${TMPPATH} \ - ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel$//} + ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//} # # update ==== //depot/projects/ia64/bin/cp/utils.c#9 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.40 2003/04/07 11:00:56 mdodd Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.41 2003/06/22 07:02:17 jmg Exp $"); #include #include @@ -233,7 +233,7 @@ warn("symlink: %s", llink); return (1); } - return (0); + return (pflag ? setfile(p->fts_statp, -1) : 0); } int @@ -247,7 +247,7 @@ warn("mkfifo: %s", to.p_path); return (1); } - return (pflag ? setfile(from_stat, 0) : 0); + return (pflag ? setfile(from_stat, -1) : 0); } int @@ -261,7 +261,7 @@ warn("mknod: %s", to.p_path); return (1); } - return (pflag ? setfile(from_stat, 0) : 0); + return (pflag ? setfile(from_stat, -1) : 0); } int @@ -269,20 +269,22 @@ { static struct timeval tv[2]; struct stat ts; - int rval; - int gotstat; + int rval, gotstat, islink, fdval; rval = 0; + fdval = fd != -1; + islink = !fdval && S_ISLNK(fs->st_mode); fs->st_mode &= S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO; TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atimespec); TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtimespec); - if (utimes(to.p_path, tv)) { - warn("utimes: %s", to.p_path); + if (islink ? lutimes(to.p_path, tv) : utimes(to.p_path, tv)) { + warn("%sutimes: %s", islink ? "l" : "", to.p_path); rval = 1; } - if (fd ? fstat(fd, &ts) : stat(to.p_path, &ts)) + if (fdval ? fstat(fd, &ts) : + (islink ? lstat(to.p_path, &ts) : stat(to.p_path, &ts))) gotstat = 0; else { gotstat = 1; @@ -296,8 +298,9 @@ * chown. If chown fails, lose setuid/setgid bits. */ if (!gotstat || fs->st_uid != ts.st_uid || fs->st_gid != ts.st_gid) - if (fd ? fchown(fd, fs->st_uid, fs->st_gid) : - chown(to.p_path, fs->st_uid, fs->st_gid)) { + if (fdval ? fchown(fd, fs->st_uid, fs->st_gid) : + (islink ? lchown(to.p_path, fs->st_uid, fs->st_gid) : + chown(to.p_path, fs->st_uid, fs->st_gid))) { if (errno != EPERM) { warn("chown: %s", to.p_path); rval = 1; @@ -306,14 +309,18 @@ } if (!gotstat || fs->st_mode != ts.st_mode) - if (fd ? fchmod(fd, fs->st_mode) : chmod(to.p_path, fs->st_mode)) { + if (fdval ? fchmod(fd, fs->st_mode) : + (islink ? lchmod(to.p_path, fs->st_mode) : + chmod(to.p_path, fs->st_mode))) { warn("chmod: %s", to.p_path); rval = 1; } if (!gotstat || fs->st_flags != ts.st_flags) - if (fd ? - fchflags(fd, fs->st_flags) : chflags(to.p_path, fs->st_flags)) { + if (fdval ? + fchflags(fd, fs->st_flags) : + (islink ? (errno = ENOSYS) : + chflags(to.p_path, fs->st_flags))) { warn("chflags: %s", to.p_path); rval = 1; } ==== //depot/projects/ia64/contrib/gdtoa/gdtoaimp.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ ****************************************************************/ -/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.5 2003/04/09 06:04:35 das Exp $ */ +/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.6 2003/06/21 08:20:14 das Exp $ */ /* This is a variation on dtoa.c that converts arbitary binary floating-point formats to and from decimal notation. It uses @@ -188,7 +188,10 @@ #include "stdlib.h" #include "string.h" #include "libc_private.h" -#include "spinlock.h" + +#include "namespace.h" +#include +#include "un-namespace.h" #ifdef KR_headers #define Char char @@ -465,14 +468,14 @@ #endif #define MULTIPLE_THREADS -extern spinlock_t __gdtoa_locks[2]; -#define ACQUIRE_DTOA_LOCK(n) do { \ - if (__isthreaded) \ - _SPINLOCK(&__gdtoa_locks[n]); \ +extern pthread_mutex_t __gdtoa_locks[2]; +#define ACQUIRE_DTOA_LOCK(n) do { \ + if (__isthreaded) \ + _pthread_mutex_lock(&__gdtoa_locks[n]); \ } while(0) -#define FREE_DTOA_LOCK(n) do { \ - if (__isthreaded) \ - _SPINUNLOCK(&__gdtoa_locks[n]); \ +#define FREE_DTOA_LOCK(n) do { \ + if (__isthreaded) \ + _pthread_mutex_unlock(&__gdtoa_locks[n]); \ } while(0) #define Kmax 15 ==== //depot/projects/ia64/contrib/groff/src/roff/nroff/nroff.sh#4 (text+ko) ==== @@ -1,18 +1,20 @@ #!/bin/sh # Emulate nroff with groff. -# $FreeBSD: src/contrib/groff/src/roff/nroff/nroff.sh,v 1.14 2003/05/01 13:18:29 ru Exp $ +# $FreeBSD: src/contrib/groff/src/roff/nroff/nroff.sh,v 1.15 2003/06/22 10:41:47 ru Exp $ prog="$0" # Default device. # First try the "locale charmap" command, because it's most reliable. # On systems where it doesn't exist, look at the environment variables. -case "`#locale charmap 2>/dev/null`" in +case "`locale charmap 2>/dev/null`" in UTF-8) T=-Tutf8 ;; - ISO-8859-1) + ISO*8859-1 | ISO*8859-15) T=-Tlatin1 ;; IBM-1047) T=-Tcp1047 ;; + KOI8-R) + T=-Tkoi8-r ;; *) case "${LC_ALL-${LC_CTYPE-${LANG}}}" in *.UTF-8) ==== //depot/projects/ia64/etc/rc.d/Makefile#15 (text+ko) ==== @@ -1,11 +1,11 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.17 2003/06/11 23:17:01 bde Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.18 2003/06/20 09:47:09 phk Exp $ .include FILES= DAEMON LOGIN NETWORKING SERVERS abi accounting addswap adjkerntz amd \ apm apmd archdep atm1 atm2.sh atm3.sh bgfsck bootparams ccd cleanvar \ - cleartmp cron devd devdb devfs dhclient diskless dmesg dumpon fsck \ + cleartmp cron devd devfs dhclient diskless dmesg dumpon fsck \ hostname inetd initdiskless initrandom ip6fw ipfilter ipfs ipfw ipmon \ ipnat ipsec ipxrouted isdnd jail \ kadmind kerberos keyserv kldxref kpasswdd \ ==== //depot/projects/ia64/gnu/usr.bin/send-pr/categories#5 (text+ko) ==== @@ -1,6 +1,7 @@ -# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.14 2002/07/03 00:35:09 des Exp $ +# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.15 2003/06/20 10:48:26 des Exp $ advocacy alpha +amd64 bin conf docs ==== //depot/projects/ia64/gnu/usr.bin/send-pr/send-pr.1#6 (text+ko) ==== @@ -22,7 +22,7 @@ .\" .\" --------------------------------------------------------------------------- .\" -.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.15 2003/03/26 01:45:20 keramida Exp $ +.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.16 2003/06/20 10:48:26 des Exp $ .nh .TH SEND-PR 1 3.113 "February 1993" .SH NAME @@ -179,6 +179,9 @@ .B alpha Alpha processor specific problems. .TP +.B amd64 +AMD64 processor specific problems. +.TP .B bin Corrections or enhancements to system executables. .TP ==== //depot/projects/ia64/include/paths.h#9 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)paths.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/paths.h,v 1.19 2003/05/05 22:49:22 obrien Exp $ + * $FreeBSD: src/include/paths.h,v 1.20 2003/06/20 22:50:33 phk Exp $ */ #ifndef _PATHS_H_ @@ -53,7 +53,6 @@ #define _PATH_CP "/bin/cp" #define _PATH_CSHELL "/bin/csh" #define _PATH_DEFTAPE "/dev/sa0" -#define _PATH_DEVDB "/var/run/dev.db" #define _PATH_DEVNULL "/dev/null" #define _PATH_DEVZERO "/dev/zero" #define _PATH_DRUM "/dev/drum" ==== //depot/projects/ia64/include/stdlib.h#19 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.49 2003/06/15 11:01:52 des Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.51 2003/06/22 10:34:49 dwmalone Exp $ */ #ifndef _STDLIB_H_ @@ -258,6 +258,7 @@ int daemon(int, int); char *devname(int, int); +char *devname_r(int, int, char *, int); int getloadavg(double [], int); __const char * getprogname(void); ==== //depot/projects/ia64/lib/libc/compat-43/sigpause.2#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)sigpause.2 8.1 (Berkeley) 6/2/93 -.\" $FreeBSD: src/lib/libc/compat-43/sigpause.2,v 1.12 2002/12/19 09:40:21 ru Exp $ +.\" $FreeBSD: src/lib/libc/compat-43/sigpause.2,v 1.13 2003/06/20 22:41:00 wollman Exp $ .\" .Dd June 2, 1993 .Dt SIGPAUSE 2 @@ -75,6 +75,20 @@ .Xr sigprocmask 2 , .Xr sigsuspend 2 , .Xr sigvec 2 +.Sh STANDARDS +The +.Fn sigpause +function is implemented for compatibility with historic +.Bx 4.3 +applications. +An incompatible interface by the same name, which used a single signal number +rather than a mask, was present in +.At V , +and was copied from there into the +.Sy X/Open System Interfaces +.Pq Tn XSI +option of +.St -p1003.1-2001 . .Sh HISTORY The .Fn sigpause ==== //depot/projects/ia64/lib/libc/gdtoa/glue.c#2 (text+ko) ==== @@ -2,9 +2,12 @@ * Machine-independent glue to integrate David Gay's gdtoa * package into libc. * - * $FreeBSD: src/lib/libc/gdtoa/glue.c,v 1.1 2003/03/12 20:29:58 das Exp $ + * $FreeBSD: src/lib/libc/gdtoa/glue.c,v 1.2 2003/06/21 08:20:14 das Exp $ */ -#include "spinlock.h" +#include -spinlock_t __gdtoa_locks[2]; +pthread_mutex_t __gdtoa_locks[] = { + PTHREAD_MUTEX_INITIALIZER, + PTHREAD_MUTEX_INITIALIZER +}; ==== //depot/projects/ia64/lib/libc/gen/devname.3#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)devname.3 8.2 (Berkeley) 4/29/95 -.\" $FreeBSD: src/lib/libc/gen/devname.3,v 1.15 2002/12/27 12:15:28 schweikh Exp $ +.\" $FreeBSD: src/lib/libc/gen/devname.3,v 1.16 2003/06/20 09:52:27 phk Exp $ .\" .Dd July 18, 1999 .Dt DEVNAME 3 @@ -45,6 +45,8 @@ .In stdlib.h .Ft char * .Fn devname "dev_t dev" "mode_t type" +.Ft char * +.Fn devname_r "dev_t dev" "mode_t type" "char *buf" "int len" .Sh DESCRIPTION The .Fn devname @@ -61,27 +63,25 @@ .Dv S_IFCHR . To find the right name, .Fn devname -first searches the device database created by -.Xr dev_mkdb 8 ; -if that fails, it asks the kernel via the +asks the kernel via the .Va kern.devname sysctl. -If it was still unable to come up with a suitable name, +If it is unable to come up with a suitable name, it will format the information encapsulated in .Fa dev and .Fa type in a human-readable format. +.Pp +.Fn devname +returns the name stored in a static buffer which will be overwritten +on subsequent calls. +.Fn devname_r +takes a buffer and length as argument to avoid this problem. .Sh SEE ALSO .Xr stat 2 , -.Xr dev_mkdb 8 .Sh HISTORY The .Fn devname function appeared in .Bx 4.4 . -.Sh BUGS -The -.Fn devname -function returns a pointer to an internal static object; -thus, subsequent calls will modify the same buffer. ==== //depot/projects/ia64/lib/libc/gen/devname.c#4 (text+ko) ==== @@ -35,70 +35,27 @@ static char sccsid[] = "@(#)devname.c 8.2 (Berkeley) 4/29/95"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/devname.c,v 1.8 2003/06/05 21:55:57 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/devname.c,v 1.9 2003/06/20 09:52:27 phk Exp $"); #include #include -#include #include #include -#include #include #include #include #include -static char * -xdevname(dev, type) - dev_t dev; - mode_t type; -{ - struct { - mode_t type; - dev_t dev; - } bkey; - static DB *db; - static int failure; - DBT data, key; - - if (!db && !failure && - !(db = dbopen(_PATH_DEVDB, O_RDONLY, 0, DB_HASH, NULL))) - failure = 1; - if (failure) - return (NULL); - - /* - * Keys are a mode_t followed by a dev_t. The former is the type of - * the file (mode & S_IFMT), the latter is the st_rdev field. Be - * sure to clear any padding that may be found in bkey. - */ - memset(&bkey, 0, sizeof(bkey)); - bkey.dev = dev; - bkey.type = type; - key.data = &bkey; - key.size = sizeof(bkey); - return ((db->get)(db, &key, &data, 0) ? NULL : (char *)data.data); -} - char * -devname(dev, type) - dev_t dev; - mode_t type; +devname_r(dev_t dev, mode_t type, char *buf, int len) { - static char buf[SPECNAMELEN + 1]; int i; size_t j; char *r; - /* First check the DB file. */ - r = xdevname(dev, type); - if (r != NULL) - return (r); - - /* Then ask the kernel. */ if ((type & S_IFMT) == S_IFCHR) { - j = sizeof(buf); + j = len; i = sysctlbyname("kern.devname", buf, &j, &dev, sizeof (dev)); if (i == 0) return (buf); @@ -109,7 +66,15 @@ r = "#NODEV"; else r = "#%c:%d:0x%x"; - snprintf(buf, SPECNAMELEN + 1, r, + snprintf(buf, len, r, (type & S_IFMT) == S_IFCHR ? 'C' : 'B', major(dev), minor(dev)); return (buf); } + +char * +devname(dev_t dev, mode_t type) +{ + static char buf[SPECNAMELEN + 1]; + + return(devname_r(dev, type, buf, sizeof(buf))); +} ==== //depot/projects/ia64/lib/libc/gen/ttyname.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)ttyname.c 8.2 (Berkeley) 1/27/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/ttyname.c,v 1.12 2002/02/01 01:32:19 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/ttyname.c,v 1.14 2003/06/21 08:16:12 phk Exp $"); #include "namespace.h" #include @@ -50,7 +50,6 @@ #include #include "un-namespace.h" -#include #include "libc_private.h" static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV; @@ -77,8 +76,6 @@ char * ttyname_r(int fd, char *buf, size_t len) { - struct dirent *dirp; - DIR *dp; struct stat dsb; struct stat sb; char *rval; @@ -96,23 +93,10 @@ if (len <= sizeof(_PATH_DEV)) return (rval); - if ((dp = opendir(_PATH_DEV)) != NULL) { - memcpy(buf, _PATH_DEV, sizeof(_PATH_DEV)); - for (rval = NULL; (dirp = readdir(dp)) != NULL;) { - if (dirp->d_fileno != sb.st_ino) - continue; - minlen = (len - (sizeof(_PATH_DEV) - 1)) < (dirp->d_namlen + 1) ? - (len - (sizeof(_PATH_DEV) - 1)) : (dirp->d_namlen + 1); - memcpy(buf + sizeof(_PATH_DEV) - 1, dirp->d_name, minlen); - if (stat(buf, &dsb) || sb.st_dev != dsb.st_dev || - sb.st_ino != dsb.st_ino) - continue; - rval = buf; - break; - } - (void) closedir(dp); - } - return (rval); + strcpy(buf, _PATH_DEV); + devname_r(sb.st_rdev, S_IFCHR, + buf + strlen(buf), sizeof(buf) - strlen(buf)); + return (buf); } static char * @@ -151,12 +135,6 @@ { struct stat sb; struct termios ttyb; - DB *db; - DBT data, key; - struct { - mode_t type; - dev_t dev; - } bkey; /* Must be a terminal. */ if (tcgetattr(fd, &ttyb) < 0) @@ -165,44 +143,8 @@ if (_fstat(fd, &sb) || !S_ISCHR(sb.st_mode)) return (NULL); - if ( (db = dbopen(_PATH_DEVDB, O_RDONLY, 0, DB_HASH, NULL)) ) { - memset(&bkey, 0, sizeof(bkey)); - bkey.type = S_IFCHR; - bkey.dev = sb.st_rdev; - key.data = &bkey; - key.size = sizeof(bkey); - if (!(db->get)(db, &key, &data, 0)) { - bcopy(data.data, - buf + sizeof(_PATH_DEV) - 1, data.size); - (void)(db->close)(db); - return (buf); - } - (void)(db->close)(db); - } - return (oldttyname(fd, &sb)); -} - -static char * -oldttyname(int fd, struct stat *sb) -{ - struct dirent *dirp; - struct stat dsb; - DIR *dp; - - if ((dp = opendir(_PATH_DEV)) == NULL) - return (NULL); - - while ( (dirp = readdir(dp)) ) { - if (dirp->d_fileno != sb->st_ino) - continue; - bcopy(dirp->d_name, buf + sizeof(_PATH_DEV) - 1, - dirp->d_namlen + 1); - if (stat(buf, &dsb) || sb->st_dev != dsb.st_dev || - sb->st_ino != dsb.st_ino) - continue; - (void)closedir(dp); - return (buf); - } - (void)closedir(dp); - return (NULL); + strcpy(buf, _PATH_DEV); + devname_r(sb.st_rdev, S_IFCHR, + buf + strlen(buf), sizeof(buf) - strlen(buf)); + return (buf); } ==== //depot/projects/ia64/lib/libc/sys/ntp_adjtime.2#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/ntp_adjtime.2,v 1.1 2003/04/15 15:42:10 trhodes Exp $ +.\" $FreeBSD: src/lib/libc/sys/ntp_adjtime.2,v 1.2 2003/06/20 21:14:59 imp Exp $ .\" .Dd April 1, 2003 .Dt NTP_ADJTIME 2 @@ -114,7 +114,10 @@ .Fa tp argument with the current clock state. .Sh RETURN VALUES -.Rv -std ntp_adjtime +Upon successful completion the clock state is returned. +Otherwise a -1 is returned and the global variable +.Va errno +is set to indicate the error. .Pp Possible states of the clock are: .Pp ==== //depot/projects/ia64/lib/libc/sys/ntp_gettime.2#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/ntp_gettime.2,v 1.1 2003/04/17 18:39:30 trhodes Exp $ +.\" $FreeBSD: src/lib/libc/sys/ntp_gettime.2,v 1.2 2003/06/21 20:27:54 imp Exp $ .\" -.Dd April 1, 2003 +.Dd June 21, 2003 .Dt NTP_GETTIME 2 .Os .Sh NAME @@ -57,7 +57,7 @@ struct timespec time; /* current time (ns) (ro) */ long maxerror; /* maximum error (us) (ro) */ long esterror; /* estimated error (us) (ro) */ - long tai; /* TAI offset */ + long tai; /* TAI-UTC offset */ int time_state; /* time status */ }; .Ed @@ -71,9 +71,14 @@ .It Va esterror Estimated error in microseconds (read-only). .It Va tai -Temps Atomique International (French for International Atomic Time), -measures real time. -Used for acute time measurements. +Offset in seconds between the TAI and UTC time scales. +This offset is published twice a year and is an integral number of +seconds between TAI (which does not have leap seconds) and UTC (which +does). +.Xr ntpd 8 +or some other agent maintains this value. +A value of 0 means unknown. +As of the date of the manual page, the offset is 32 seconds. .It Va time_state Current time status. .El @@ -86,9 +91,11 @@ .It Dv TIME_OK Everything okay, no leap second warning. .It Dv TIME_INS -Insert leap second warning. +Positive leap second warning. +At the end of the day, an additional second will be inserted after 23:59:59. .It Dv TIME_DEL -Delete leap second warning. +Negative leap second warning. +At the end of the day, 23:59:59 is skipped. .It Dv TIME_OOP Leap second in progress. .It Dv TIME_WAIT @@ -98,7 +105,10 @@ .El .Sh SEE ALSO .Xr ntp_adjtime 2 , -.Xr ntpd 8 +.Xr ntpd 8 , +.Dq Li http://www.bipm.fr/enus/5_Scientific/c_time/time_1.html , +.Dq Li http://www.boulder.nist.gov/timefreq/general/faq.htm , +.Dq Li ftp://time.nist.gov/pub/leap-seconds.list .Sh AUTHORS This manual page was written by .An Tom Rhodes Aq trhodes@FreeBSD.org . ==== //depot/projects/ia64/lib/libpthread/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/Makefile,v 1.42 2003/05/30 00:21:51 kan Exp $ +# $FreeBSD: src/lib/libpthread/Makefile,v 1.43 2003/06/23 04:28:30 marcel Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -30,8 +30,9 @@ AINC= -I${.CURDIR}/../libc/${MACHINE_ARCH} -I${.CURDIR}/thread PRECIOUSLIB= yes +.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" +.include "${.CURDIR}/support/Makefile.inc" +.include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/thread/Makefile.inc" -.include "${.CURDIR}/sys/Makefile.inc" -.include "${.CURDIR}/support/Makefile.inc" .include ==== //depot/projects/ia64/lib/libpthread/sys/Makefile.inc#5 (text+ko) ==== @@ -1,7 +1,5 @@ -# $FreeBSD: src/lib/libpthread/sys/Makefile.inc,v 1.14 2003/05/30 00:21:52 kan Exp $ +# $FreeBSD: src/lib/libpthread/sys/Makefile.inc,v 1.15 2003/06/23 04:28:31 marcel Exp $ -.PATH: ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/sys -SRCS+= thr_error.c _atomic_lock.S ksd.c thr_enter_uts.S thr_getcontext.S \ - thr_switch.S lock.c - +SRCS+= lock.c thr_error.c ==== //depot/projects/ia64/libexec/ftpd/ftpcmd.y#16 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.51 2003/06/16 11:30:23 yar Exp $"; + "$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.52 2003/06/21 10:45:38 yar Exp $"; #endif /* not lint */ #include @@ -89,10 +89,8 @@ extern int maxtimeout; extern int pdata; extern char *hostname; -extern char remotehost[]; extern char proctitle[]; extern int usedefault; -extern int transflag; extern char tmpline[]; extern int readonly; extern int noepsv; ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#20 (text+ko) ==== @@ -36,7 +36,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.41 2003/06/09 22:33:19 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.42 2003/06/20 21:07:05 bmah Exp $ 2000 @@ -184,6 +184,13 @@ Research Projects Agency (DARPA): OpenPAM, NSS support, PAE support, various MAC framework updates, the GEOM disk geometry system. + + An integer overflow could cause kernel panics on PAE-using + machines with certain memory sizes. This bug has been corrected + on both the RELENG_5_1 and + HEAD branches. A workaround for this problem + is to remove some memory, update the system in question, and + reinstall the memory. ]]> ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#99 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.576 2003/06/17 20:01:49 bmah Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 23 18:17:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF77737B404; Mon, 23 Jun 2003 18:17:17 -0700 (PDT) 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 4EB3737B401 for ; Mon, 23 Jun 2003 18:17:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 28E1B43F75 for ; Mon, 23 Jun 2003 18:17:16 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5O1HG0U033036 for ; Mon, 23 Jun 2003 18:17:16 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5O1HFDj033033 for perforce@freebsd.org; Mon, 23 Jun 2003 18:17:15 -0700 (PDT) Date: Mon, 23 Jun 2003 18:17:15 -0700 (PDT) Message-Id: <200306240117.h5O1HFDj033033@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 33596 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, 24 Jun 2003 01:17:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=33596 Change 33596 by marcel@marcel_nfs on 2003/06/23 18:16:47 IFC @33595 Affected files ... .. //depot/projects/ia64/contrib/nvi/catalog/ru_RU.KOI8-R#2 integrate .. //depot/projects/ia64/contrib/nvi/catalog/ru_RU.KOI8-R.base#2 integrate .. //depot/projects/ia64/contrib/nvi/catalog/ru_RU.KOI8-R.owner#2 integrate .. //depot/projects/ia64/contrib/nvi/catalog/ru_SU.KOI8-R#3 delete .. //depot/projects/ia64/contrib/nvi/catalog/ru_SU.KOI8-R.base#3 delete .. //depot/projects/ia64/contrib/nvi/catalog/ru_SU.KOI8-R.check#2 delete .. //depot/projects/ia64/contrib/nvi/catalog/ru_SU.KOI8-R.owner#2 delete .. //depot/projects/ia64/games/grdc/grdc.c#3 integrate .. //depot/projects/ia64/include/Makefile#28 integrate .. //depot/projects/ia64/lib/libpthread/arch/i386/i386/ksd.c#3 integrate .. //depot/projects/ia64/lib/libpthread/arch/i386/include/ksd.h#3 integrate .. //depot/projects/ia64/lib/libpthread/arch/i386/include/pthread_md.h#3 integrate .. //depot/projects/ia64/lib/libpthread/arch/ia64/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libpthread/arch/ia64/include/ksd.h#1 branch .. //depot/projects/ia64/lib/libpthread/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#20 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_private.h#14 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#17 integrate .. //depot/projects/ia64/share/man/man4/Makefile#50 integrate .. //depot/projects/ia64/share/man/man4/ath.4#1 branch .. //depot/projects/ia64/share/man/man4/ath_hal.4#1 branch .. //depot/projects/ia64/share/man/man4/fatm.4#1 branch .. //depot/projects/ia64/share/man/man4/natm.4#4 integrate .. //depot/projects/ia64/share/man/man4/natmip.4#3 integrate .. //depot/projects/ia64/share/man/man7/ports.7#8 integrate .. //depot/projects/ia64/share/syscons/keymaps/INDEX.keymaps#7 integrate .. //depot/projects/ia64/share/syscons/keymaps/Makefile#10 integrate .. //depot/projects/ia64/share/syscons/keymaps/lat-amer.kbd#2 delete .. //depot/projects/ia64/share/syscons/keymaps/latinamerican.iso.acc.kbd#1 branch .. //depot/projects/ia64/share/syscons/keymaps/latinamerican.kbd#1 branch .. //depot/projects/ia64/sys/conf/NOTES#54 integrate .. //depot/projects/ia64/sys/conf/files#83 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwregs.c#7 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.c#14 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath.c#1 branch .. //depot/projects/ia64/sys/dev/ath/if_ath_pci.c#1 branch .. //depot/projects/ia64/sys/dev/ath/if_athioctl.h#1 branch .. //depot/projects/ia64/sys/dev/ath/if_athvar.h#1 branch .. //depot/projects/ia64/sys/dev/fatm/firmware.h#1 branch .. //depot/projects/ia64/sys/dev/fatm/if_fatm.c#1 branch .. //depot/projects/ia64/sys/dev/fatm/if_fatm_rate.h#1 branch .. //depot/projects/ia64/sys/dev/fatm/if_fatmreg.h#1 branch .. //depot/projects/ia64/sys/dev/fatm/if_fatmvar.h#1 branch .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#35 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumio.c#18 integrate .. //depot/projects/ia64/sys/kern/kern_tc.c#23 integrate .. //depot/projects/ia64/sys/modules/Makefile#54 integrate .. //depot/projects/ia64/sys/modules/ath/Makefile#1 branch .. //depot/projects/ia64/sys/modules/fatm/Makefile#1 branch .. //depot/projects/ia64/sys/modules/ufs/Makefile#2 integrate .. //depot/projects/ia64/sys/net/if_atmsubr.c#12 integrate .. //depot/projects/ia64/sys/net80211/ieee80211.c#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211.h#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_crypto.c#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_crypto.h#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_input.c#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_ioctl.c#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_ioctl.h#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_node.c#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_node.h#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_output.c#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_proto.c#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_proto.h#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_var.h#1 branch .. //depot/projects/ia64/sys/netinet/ip_dummynet.c#18 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#20 integrate .. //depot/projects/ia64/sys/pci/agp_intel.c#12 integrate .. //depot/projects/ia64/sys/pci/agp_via.c#6 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#31 integrate .. //depot/projects/ia64/usr.bin/fstat/fstat.c#14 integrate .. //depot/projects/ia64/usr.bin/soelim/Makefile#4 delete .. //depot/projects/ia64/usr.bin/soelim/soelim.1#4 delete .. //depot/projects/ia64/usr.bin/soelim/soelim.c#6 delete .. //depot/projects/ia64/usr.bin/vi/Makefile#9 integrate .. //depot/projects/ia64/usr.sbin/keyadmin/Makefile#2 delete .. //depot/projects/ia64/usr.sbin/keyadmin/keyadmin.8#3 delete .. //depot/projects/ia64/usr.sbin/keyadmin/keyadmin.c#3 delete .. //depot/projects/ia64/usr.sbin/keyadmin/keys#2 delete .. //depot/projects/ia64/usr.sbin/ppp/Makefile#5 integrate Differences ... ==== //depot/projects/ia64/contrib/nvi/catalog/ru_RU.KOI8-R#2 (text+ko) ==== @@ -101,10 +101,10 @@ Недопустимая комбинация в адресеX Неправильный адрес: всего %lu строк в файлеX Неправильный адрес: файл пустX -Комманда %s не может использовать адрес 0X +Команда %s не может использовать адрес 0X Аббревиатуры отсутствуютX Аббревиатуры должны заканчиваться символом "word"X -Аббревиатуры не могут содержать символоы табляции или пробелыX +Аббревиатуры не могут содержать символы табуляции или пробелыX Аббревиатуры не могут сочетаться с символами слов/не-слов, за исключением конца строкиX "%s" не является аббревиатуройX @@ -120,7 +120,7 @@ Файл изменен с момента последней полной записи: используйте ! для обходаX Невозможно найти домашний каталогX Новый каталог: %sX -Нет вырезаных буферовX +Нет вырезанных буферовX Команда %s не может быть использована внутри глобальной или v командыX %s/%s: не открыт: не принадлежит Вам или root-уX %s/%s: не открыт: не принадлежит ВамX @@ -169,7 +169,7 @@ ПрерваноX Отсутствие буфера для использованияX -Нет предидущего регулярного выраженияX +Нет предыдущего регулярного выраженияX Команда %s подразумевает наличие прочтенного файлаX Использование: %sX Команда visual подразумевает обязательную установку опции openX ==== //depot/projects/ia64/contrib/nvi/catalog/ru_RU.KOI8-R.base#2 (text+ko) ==== @@ -77,10 +77,10 @@ 101 "Недопустимая комбинация в адресе" 102 "Неправильный адрес: всего %lu строк в файле" 103 "Неправильный адрес: файл пуст" -104 "Комманда %s не может использовать адрес 0" +104 "Команда %s не может использовать адрес 0" 105 "Аббревиатуры отсутствуют" 106 "Аббревиатуры должны заканчиваться символом "word"" -107 "Аббревиатуры не могут содержать символоы табляции или пробелы" +107 "Аббревиатуры не могут содержать символы табуляции или пробелы" 108 "Аббревиатуры не могут сочетаться с символами слов/не-слов, за исключением конца строки" 109 ""%s" не является аббревиатурой" 111 "Файлов для редактирования больше нет" @@ -95,7 +95,7 @@ 120 "Файл изменен с момента последней полной записи: используйте ! для обхода" 121 "Невозможно найти домашний каталог" 122 "Новый каталог: %s" -123 "Нет вырезаных буферов" +123 "Нет вырезанных буферов" 124 "Команда %s не может быть использована внутри глобальной или v команды" 125 "%s/%s: не открыт: не принадлежит Вам или root-у" 126 "%s/%s: не открыт: не принадлежит Вам" @@ -138,7 +138,7 @@ 168 "Буфер %s пуст" 170 "Прервано" 171 "Отсутствие буфера для использования" -172 "Нет предидущего регулярного выражения" +172 "Нет предыдущего регулярного выражения" 173 "Команда %s подразумевает наличие прочтенного файла" 174 "Использование: %s" 175 "Команда visual подразумевает обязательную установку опции open" ==== //depot/projects/ia64/contrib/nvi/catalog/ru_RU.KOI8-R.owner#2 (text+ko) ==== @@ -1,1 +1,1 @@ -Dima Ruban , "Andrey A. Chernov" +Dima Ruban , "Andrey A. Chernov" ==== //depot/projects/ia64/games/grdc/grdc.c#3 (text+ko) ==== @@ -11,7 +11,7 @@ * modified 03-25-03 for 12 hour option * - Samy Al Bahra * - * $FreeBSD: src/games/grdc/grdc.c,v 1.10 2003/03/28 16:37:45 mux Exp $ + * $FreeBSD: src/games/grdc/grdc.c,v 1.12 2003/06/23 16:02:40 will Exp $ */ #include @@ -149,8 +149,12 @@ if (tm->tm_hour > 12) { tm->tm_hour -= 12; mvaddstr(YBASE + 5, XBASE + 52, "PM"); - } else + } else { + if (tm->tm_hour == 0) + tm->tm_hour = 12; + mvaddstr(YBASE + 5, XBASE + 52, "AM"); + } } set(tm->tm_hour%10, 20); ==== //depot/projects/ia64/include/Makefile#28 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.198 2003/06/12 14:28:31 harti Exp $ +# $FreeBSD: src/include/Makefile,v 1.199 2003/06/23 14:43:43 ru Exp $ # # Doing a "make install" builds /usr/include. @@ -104,8 +104,11 @@ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \ ${DESTDIR}${INCLUDEDIR}/$i .endfor - cd ${.CURDIR}/../sys; \ - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 opencrypto/*.h \ + cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \ + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ + ${DESTDIR}${INCLUDEDIR}/netinet + cd ${.CURDIR}/../sys/opencrypto; \ + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/crypto cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ @@ -136,6 +139,11 @@ ln -fs ../../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \ done .endfor + cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \ + for h in *.h; do \ + ln -fs ../../../sys/contrib/ipfilter/netinet/$$h \ + ${DESTDIR}${INCLUDEDIR}/netinet; \ + done cd ${.CURDIR}/../sys/opencrypto; \ for h in *.h; do \ ln -fs ../../../sys/opencrypto/$$h \ ==== //depot/projects/ia64/lib/libpthread/arch/i386/i386/ksd.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/arch/i386/i386/ksd.c,v 1.3 2003/05/19 23:04:49 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/arch/i386/i386/ksd.c,v 1.4 2003/06/23 23:15:05 marcel Exp $"); #include #include @@ -39,6 +39,7 @@ #include #include +#include "pthread_md.h" #include "ksd.h" #define LDT_ENTRIES 8192 ==== //depot/projects/ia64/lib/libpthread/arch/i386/include/ksd.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ /* - * $FreeBSD: src/lib/libpthread/arch/i386/include/ksd.h,v 1.3 2003/04/23 21:49:34 deischen Exp $ + * $FreeBSD: src/lib/libpthread/arch/i386/include/ksd.h,v 1.5 2003/06/23 23:15:06 marcel Exp $ */ #ifndef _KSD_H_ @@ -34,22 +34,9 @@ #include -struct pthread; -struct __ucontext; struct kse; /* - * KSE Specific Data. - */ -struct ksd { - int ldt; -#define KSDF_INITIALIZED 0x01 - long flags; - void *base; - long size; -}; - -/* * Evaluates to the byte offset of the per-kse variable name. */ #define __ksd_offset(name) __offsetof(struct kse, name) @@ -132,11 +119,11 @@ #define KSD_SET_PTR(member, val) __KSD_SET32(k_ ## member, val) #define KSD_READANDCLEAR_PTR(member) __KSD_READANDCLEAR32(k_ ## member) -#define _ksd_curkse ((struct kse *)KSD_GET_PTR(mbx.km_udata)) -#define _ksd_curthread KSD_GET_PTR(curthread) +#define _ksd_curkse() ((struct kse *)KSD_GET_PTR(mbx.km_udata)) +#define _ksd_curthread() KSD_GET_PTR(curthread) #define _ksd_set_tmbx(value) KSD_SET_PTR(mbx.km_curthread, (void *)value) -#define _ksd_get_tmbx(value) KSD_GET_PTR(mbx.km_curthread) -#define _ksd_readandclear_tmbx KSD_READANDCLEAR_PTR(mbx.km_curthread) +#define _ksd_get_tmbx() KSD_GET_PTR(mbx.km_curthread) +#define _ksd_readandclear_tmbx() KSD_READANDCLEAR_PTR(mbx.km_curthread) int _ksd_create(struct ksd *ksd, void *base, int size); void _ksd_destroy(struct ksd *ksd); ==== //depot/projects/ia64/lib/libpthread/arch/i386/include/pthread_md.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/lib/libpthread/arch/i386/include/pthread_md.h,v 1.3 2003/04/30 15:05:17 deischen Exp $ + * $FreeBSD: src/lib/libpthread/arch/i386/include/pthread_md.h,v 1.4 2003/06/23 23:15:06 marcel Exp $ */ /* * Machine-dependent thread prototypes/definitions for the thread kernel. @@ -51,4 +51,16 @@ #define THR_ALIGNBYTES 15 #define THR_ALIGN(td) (((unsigned)(td) + THR_ALIGNBYTES) & ~THR_ALIGNBYTES) + +/* + * KSE Specific Data. + */ +struct ksd { + int ldt; +#define KSDF_INITIALIZED 0x01 + long flags; + void *base; + long size; +}; + #endif ==== //depot/projects/ia64/lib/libpthread/arch/ia64/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/lib/libpthread/arch/ia64/Makefile.inc,v 1.1 2003/06/23 04:28:31 marcel Exp $ +# $FreeBSD: src/lib/libpthread/arch/ia64/Makefile.inc,v 1.2 2003/06/23 23:15:06 marcel Exp $ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} -SRCS+= ksd.c thr_enter_uts.S thr_switch.S +SRCS+= thr_enter_uts.S thr_switch.S ==== //depot/projects/ia64/lib/libpthread/arch/ia64/include/pthread_md.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/ia64/include/pthread_md.h,v 1.1 2003/06/23 04:52:09 marcel Exp $ + * $FreeBSD: src/lib/libpthread/arch/ia64/include/pthread_md.h,v 1.2 2003/06/23 23:15:06 marcel Exp $ */ #ifndef _PTHREAD_MD_H_ @@ -35,4 +35,10 @@ #define THR_ALIGNBYTES 15 #define THR_ALIGN(td) (((uintptr_t)(td) + THR_ALIGNBYTES) & ~THR_ALIGNBYTES) +/* KSE Specific Data. */ +struct ksd { + void *ksd_base; + int ksd_size; +}; + #endif /* _PTHREAD_MD_H_ */ ==== //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#20 (text+ko) ==== @@ -33,7 +33,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.69 2003/06/08 17:35:11 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.71 2003/06/23 23:15:06 marcel Exp $"); #include #include @@ -52,8 +52,8 @@ #include "atomic_ops.h" #include "thr_private.h" -#include "pthread_md.h" #include "libc_private.h" +#include "ksd.h" /*#define DEBUG_THREAD_KERN */ #ifdef DEBUG_THREAD_KERN @@ -478,7 +478,7 @@ { kse_critical_t crit; - crit = _ksd_readandclear_tmbx; + crit = _ksd_readandclear_tmbx(); return (crit); } @@ -1815,14 +1815,14 @@ struct pthread * _get_curthread(void) { - return (_ksd_curthread); + return (_ksd_curthread()); } /* This assumes the caller has disabled upcalls. */ struct kse * _get_curkse(void) { - return (_ksd_curkse); + return (_ksd_curkse()); } void ==== //depot/projects/ia64/lib/libpthread/thread/thr_private.h#14 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.89 2003/05/30 00:21:52 kan Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.90 2003/06/23 23:15:06 marcel Exp $ */ #ifndef _THR_PRIVATE_H @@ -54,7 +54,6 @@ #include #include -#include "ksd.h" #include "lock.h" #include "pthread_md.h" ==== //depot/projects/ia64/sbin/ipfw/ipfw2.c#17 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.27 2003/06/23 08:20:28 luigi Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.28 2003/06/23 22:32:14 luigi Exp $ */ #include @@ -1607,15 +1607,20 @@ if (*av == NULL) { warnx("missing keyword to enable/disable\n"); } else if (strncmp(*av, "firewall", strlen(*av)) == 0) { - sysctlbyname("net.inet.ip.fw.enable", NULL, 0, &which, sizeof(which)); + sysctlbyname("net.inet.ip.fw.enable", NULL, 0, + &which, sizeof(which)); } else if (strncmp(*av, "one_pass", strlen(*av)) == 0) { - sysctlbyname("net.inet.ip.fw.one_pass", NULL, 0, &which, sizeof(which)); + sysctlbyname("net.inet.ip.fw.one_pass", NULL, 0, + &which, sizeof(which)); } else if (strncmp(*av, "debug", strlen(*av)) == 0) { - sysctlbyname("net.inet.ip.fw.debug", NULL, 0, &which, sizeof(which)); + sysctlbyname("net.inet.ip.fw.debug", NULL, 0, + &which, sizeof(which)); } else if (strncmp(*av, "verbose", strlen(*av)) == 0) { - sysctlbyname("net.inet.ip.fw.verbose", NULL, 0, &which, sizeof(which)); + sysctlbyname("net.inet.ip.fw.verbose", NULL, 0, + &which, sizeof(which)); } else if (strncmp(*av, "dyn_keepalive", strlen(*av)) == 0) { - sysctlbyname("net.inet.ip.fw.dyn_keepalive", NULL, 0, &which, sizeof(which)); + sysctlbyname("net.inet.ip.fw.dyn_keepalive", NULL, 0, + &which, sizeof(which)); } else { warnx("unrecognize enable/disable keyword: %s\n", *av); } ==== //depot/projects/ia64/share/man/man4/Makefile#50 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.209 2003/06/17 16:14:31 harti Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.211 2003/06/23 20:54:39 sam Exp $ MAN= aac.4 \ acpi.4 \ @@ -19,6 +19,8 @@ atapicam.4 \ atkbd.4 \ atkbdc.4 \ + ath.4 \ + ath_hal.4 \ aue.4 \ awi.4 \ axe.4 \ @@ -53,6 +55,7 @@ exca.4 \ faith.4 \ fast_ipsec.4 \ + fatm.4 \ fd.4 \ fdc.4 \ firewire.4 \ @@ -291,6 +294,7 @@ MLINKS+=em.4 if_em.4 MLINKS+=en.4 if_en.4 MLINKS+=faith.4 if_faith.4 +MLINKS+=fatm.4 if_fatm.4 MLINKS+=fd.4 stderr.4 fd.4 stdin.4 fd.4 stdout.4 MLINKS+=fpa.4 fea.4 MLINKS+=fwe.4 if_fwp.4 ==== //depot/projects/ia64/share/man/man4/natm.4#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/share/man/man4/natm.4,v 1.12 2003/06/17 16:15:47 harti Exp $ +.\" $FreeBSD: src/share/man/man4/natm.4,v 1.13 2003/06/23 14:46:11 harti Exp $ .\" .Dd December 29, 1997 .Dt NATM 4 @@ -87,6 +87,7 @@ .Sh SEE ALSO .Xr en 4 , .Xr hatm 4 , +.Xr fatm 4 , .Xr natmip 4 .Sh AUTHORS .An Chuck Cranor ==== //depot/projects/ia64/share/man/man4/natmip.4#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/share/man/man4/natmip.4,v 1.2 2003/06/17 16:15:47 harti Exp $ +.\" $FreeBSD: src/share/man/man4/natmip.4,v 1.3 2003/06/23 14:46:11 harti Exp $ .\" .Dd June 13, 2003 .Dt NATMIP 4 @@ -106,6 +106,7 @@ .Sh SEE ALSO .Xr en 4 , .Xr hatm 4 , +.Xr fatm 4 , .Xr natm 4 .Sh AUTHORS .An Chuck Cranor ==== //depot/projects/ia64/share/man/man7/ports.7#8 (text+ko) ==== @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/ports.7,v 1.36 2003/02/22 11:57:09 brueffer Exp $ +.\" $FreeBSD: src/share/man/man7/ports.7,v 1.37 2003/06/23 20:01:58 ru Exp $ .\" .Dd January 25, 1998 .Dt PORTS 7 @@ -305,7 +305,7 @@ .Fx site for all files. .It Va MASTER_SITE_OVERRIDE -Try going to this site for all files and patches, first. +Try going to these sites for all files and patches, first. .It Va NOCLEANDEPENDS If defined, do not let .Cm clean ==== //depot/projects/ia64/share/syscons/keymaps/INDEX.keymaps#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/syscons/keymaps/INDEX.keymaps,v 1.49 2003/06/19 08:34:38 murray Exp $ +# $FreeBSD: src/share/syscons/keymaps/INDEX.keymaps,v 1.50 2003/06/23 21:01:57 ache Exp $ # # database for kbdmap(8) # @@ -211,9 +211,13 @@ jp.pc98.iso.kbd:en:Japanese PC-98x1 (ISO) -lat-amer.kbd:en:Latin American -lat-amer.kbd:de:Latein Amerikanisch -lat-amer.kbd:pt,es:AmИrica Latina +latinamerican.kbd:en:Latin American +latinamerican.kbd:de:Latein Amerikanisch +latinamerican.kbd:pt,es:AmИrica Latina + +latinamerican.iso.acc.kbd:en:Latin American (accent keys) +latinamerican.iso.acc.kbd:de:Latein Amerikanisch (mit Akzenten) +latinamerican.iso.acc.kbd:pt,es:AmИrica Latina (com acentos) lt.iso4.kbd:en:Lithuanian ISO-8859-4 lt.iso4.kbd:es:Lituano ISO-8859-4 ==== //depot/projects/ia64/share/syscons/keymaps/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/syscons/keymaps/Makefile,v 1.62 2003/06/19 08:34:38 murray Exp $ +# $FreeBSD: src/share/syscons/keymaps/Makefile,v 1.63 2003/06/23 21:01:57 ache Exp $ KEYMAPS= INDEX.keymaps KEYMAPS+= be.iso.kbd be.iso.acc.kbd @@ -21,7 +21,7 @@ KEYMAPS+= it.iso.kbd KEYMAPS+= iw.iso8.kbd KEYMAPS+= jp.106.kbd jp.106x.kbd jp.pc98.kbd jp.pc98.iso.kbd -KEYMAPS+= lat-amer.kbd +KEYMAPS+= latinamerican.kbd latinamerican.iso.acc.kbd KEYMAPS+= lt.iso4.kbd KEYMAPS+= norwegian.iso.kbd norwegian.dvorak.kbd KEYMAPS+= pl_PL.ISO8859-2.kbd ==== //depot/projects/ia64/sys/conf/NOTES#54 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1153 2003/06/18 09:29:27 phk Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1154 2003/06/23 14:46:11 harti Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1677,13 +1677,15 @@ # The `hatm' device provides support for Fore/Marconi HE155 and HE622 # ATM PCI cards. # +# The `fatm' device provides support for Fore PCA200E ATM PCI cards. +# # atm device provides generic atm functions and is required for # atm devices. # NATM enables the netnatm protocol family that can be used to # bypass TCP/IP. # -# utopia provides the access to the ATM PHY chips and is required for en -# and hatm +# utopia provides the access to the ATM PHY chips and is required for en, +# hatm and fatm. # # the current driver supports only PVC operations (no atm-arp, no multicast). # for more details, please read the original documents at @@ -1691,6 +1693,7 @@ # device atm device en +device fatm #Fore PCA200E device hatm #Fore/Marconi HE155/622 device utopia #ATM PHY driver options NATM #native ATM ==== //depot/projects/ia64/sys/conf/files#83 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.796 2003/06/22 02:18:31 iedowse Exp $ +# $FreeBSD: src/sys/conf/files,v 1.797 2003/06/23 14:46:11 harti Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -392,6 +392,7 @@ dev/ex/if_ex_pccard.c optional ex card #dev/ex/if_ex_pccard.c optional ex pccard dev/exca/exca.c optional cbb +dev/fatm/if_fatm.c optional fatm pci dev/fe/if_fe.c optional fe dev/fe/if_fe_pccard.c optional fe card dev/fe/if_fe_pccard.c optional fe pccard ==== //depot/projects/ia64/sys/contrib/dev/acpica/hwregs.c#7 (text+ko) ==== @@ -510,8 +510,8 @@ ACPI_REGISTER_INSERT_VALUE (RegisterValue, BitRegInfo->BitPosition, BitRegInfo->AccessBitMask, Value); - Status = AcpiHwRegisterWrite (ACPI_MTX_DO_NOT_LOCK, RegisterId, - (UINT16) RegisterValue); + Status = AcpiHwRegisterWrite (ACPI_MTX_DO_NOT_LOCK, + ACPI_REGISTER_PM1_CONTROL, (UINT16) RegisterValue); break; ==== //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.c#14 (text+ko) ==== @@ -37,9 +37,9 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#198 $ + * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#199 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.20 2003/06/06 23:53:39 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.21 2003/06/23 22:06:34 gibbs Exp $ */ #ifdef __linux__ @@ -378,7 +378,7 @@ * Wait for any inprogress DMA to complete and clear DMA state * if this if for an SCB in the qinfifo. */ - while ((ccscbctl = ahd_inb(ahd, CCSCBCTL) & (CCARREN|CCSCBEN)) != 0) { + while (((ccscbctl = ahd_inb(ahd, CCSCBCTL)) & (CCARREN|CCSCBEN)) != 0) { if ((ccscbctl & (CCSCBDIR|CCARREN)) == (CCSCBDIR|CCARREN)) { if ((ccscbctl & ARRDONE) != 0) ==== //depot/projects/ia64/sys/dev/fxp/if_fxp.c#35 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.183 2003/06/12 16:43:30 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.184 2003/06/23 23:23:49 njl Exp $"); #include #include @@ -1733,7 +1733,17 @@ m->m_pkthdr.len = m->m_len = total_len; m->m_pkthdr.rcvif = ifp; + /* + * Drop locks before calling if_input() since it + * may re-enter fxp_start() in the netisr case. + * This would result in a lock reversal. Better + * performance might be obtained by chaining all + * packets received, dropping the lock, and then + * calling if_input() on each one. + */ + FXP_UNLOCK(sc); (*ifp->if_input)(ifp, m); + FXP_LOCK(sc); } } if (rnr) { ==== //depot/projects/ia64/sys/dev/vinum/vinumio.c#18 (text+ko) ==== @@ -34,7 +34,7 @@ * advised of the possibility of such damage. * * $Id: vinumio.c,v 1.39 2003/05/23 00:59:53 grog Exp grog $ - * $FreeBSD: src/sys/dev/vinum/vinumio.c,v 1.89 2003/06/15 01:42:01 grog Exp $ + * $FreeBSD: src/sys/dev/vinum/vinumio.c,v 1.90 2003/06/23 14:49:57 harti Exp $ */ #include @@ -800,7 +800,6 @@ } } } -#ifdef __i386__ /* * This is a kludge. Probably none of this * should be here. @@ -828,7 +827,6 @@ } } } -#endif } Free(partname); ==== //depot/projects/ia64/sys/kern/kern_tc.c#23 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.149 2003/06/11 00:56:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.150 2003/06/23 20:14:08 imp Exp $"); #include "opt_ntp.h" @@ -308,7 +308,7 @@ } /* - * Step our concept of GMT. This is done by modifying our estimate of + * Step our concept of UTC. This is done by modifying our estimate of * when we booted. XXX: needs futher work. */ void @@ -423,7 +423,7 @@ scale /= th->th_counter->tc_frequency; th->th_scale = scale * 2; - /* Update the GMT timestamps used for the get*() functions. */ + /* Update the UTC timestamps used for the get*() functions. */ bt = th->th_offset; bintime_add(&bt, &boottimebin); bintime2timeval(&bt, &th->th_microtime); ==== //depot/projects/ia64/sys/modules/Makefile#54 (text+ko) ==== @@ -1,12 +1,14 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.330 2003/06/17 16:12:49 harti Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.333 2003/06/23 22:01:01 iedowse Exp $ -.if exists(${.CURDIR}/../opencrypto) && !defined(NOCRYPT) +.if !defined(NOCRYPT) || defined(ALL_MODULES) +.if exists(${.CURDIR}/../opencrypto) _crypto= crypto _cryptodev= cryptodev .endif -.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) +.if exists(${.CURDIR}/../crypto) _random= random .endif +.endif SUBDIR= accf_data \ accf_http \ @@ -30,6 +32,7 @@ digi \ dummynet \ en \ + fatm \ fdc \ fdescfs \ firewire \ @@ -99,6 +102,7 @@ rp \ rue \ sbsh \ + scd \ sf \ sis \ sk \ @@ -143,11 +147,11 @@ wlan \ xl -.if defined(WANT_EXT2FS_MODULE) +.if defined(WANT_EXT2FS_MODULE) || defined(ALL_MODULES) SUBDIR+=ext2fs .endif -.if !defined(NO_IPFILTER) +.if !defined(NO_IPFILTER) || defined(ALL_MODULES) SUBDIR+=ipfilter .endif @@ -292,6 +296,10 @@ SUBDIR+=hme .endif +.if defined(ALL_MODULES) +SUBDIR+=ufs +.endif + .if defined(MODULES_OVERRIDE) && !defined(ALL_MODULES) SUBDIR=${MODULES_OVERRIDE} .endif ==== //depot/projects/ia64/sys/modules/ufs/Makefile#2 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/sys/modules/ufs/Makefile,v 1.1 2002/06/30 02:23:12 iedowse Exp $ +# $FreeBSD: src/sys/modules/ufs/Makefile,v 1.2 2003/06/23 19:41:00 iedowse Exp $ .PATH: ${.CURDIR}/../../ufs/ufs ${.CURDIR}/../../ufs/ffs KMOD= ufs -SRCS= opt_ddb.h opt_ffs.h opt_ffs_broken_fixme.h opt_quota.h opt_suiddir.h \ - opt_ufs.h vnode_if.h ufs_acl.c ufs_bmap.c ufs_dirhash.c ufs_extattr.c \ +SRCS= opt_ddb.h opt_directio.h opt_ffs.h opt_ffs_broken_fixme.h opt_mac.h \ + opt_quota.h opt_suiddir.h opt_ufs.h \ + vnode_if.h ufs_acl.c ufs_bmap.c ufs_dirhash.c ufs_extattr.c \ ufs_ihash.c ufs_inode.c ufs_lookup.c ufs_quota.c ufs_vfsops.c \ ufs_vnops.c ffs_alloc.c ffs_balloc.c ffs_inode.c ffs_snapshot.c \ ffs_softdep.c ffs_subr.c ffs_tables.c ffs_vfsops.c ffs_vnops.c ==== //depot/projects/ia64/sys/net/if_atmsubr.c#12 (text+ko) ==== @@ -31,12 +31,11 @@ * (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/net/if_atmsubr.c,v 1.27 2003/05/31 20:07:16 phk Exp $ + * if_atmsubr.c */ -/* - * if_atmsubr.c - */ +#include +__FBSDID("$FreeBSD: src/sys/net/if_atmsubr.c,v 1.29 2003/06/23 16:53:28 harti Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -71,13 +70,37 @@ #include #endif +/* + * Netgraph interface functions. + * These need not be protected by a lock, because ng_atm nodes are persitent. + * The ng_atm module can be unloaded only if all ATM interfaces have been + * unloaded, so nobody should be in the code paths accessing these function + * pointers. + */ +void (*ng_atm_attach_p)(struct ifnet *); +void (*ng_atm_detach_p)(struct ifnet *); +int (*ng_atm_output_p)(struct ifnet *, struct mbuf **); +void (*ng_atm_input_p)(struct ifnet *, struct mbuf **, + struct atm_pseudohdr *, void *); +void (*ng_atm_input_orphan_p)(struct ifnet *, struct mbuf *, + struct atm_pseudohdr *, void *); +void (*ng_atm_message_p)(struct ifnet *, u_int32_t, u_int32_t); + +/* + * Harp pseudo interface hooks + */ +void (*atm_harp_input_p)(struct ifnet *ifp, struct mbuf **m, + struct atm_pseudohdr *ah, void *rxhand); +void (*atm_harp_attach_p)(struct ifnet *); +void (*atm_harp_detach_p)(struct ifnet *); + SYSCTL_NODE(_hw, OID_AUTO, atm, CTLFLAG_RW, 0, "ATM hardware"); #ifndef ETHERTYPE_IPV6 -#define ETHERTYPE_IPV6 0x86dd +#define ETHERTYPE_IPV6 0x86dd #endif -#define senderr(e) do { error = (e); goto bad;} while (0) +#define senderr(e) do { error = (e); goto bad; } while (0) /* * atm_output: ATM output routine @@ -93,13 +116,9 @@ * [for native mode ATM output] if dst is null, then * rt0 must also be NULL. */ - int -atm_output(ifp, m0, dst, rt0) - struct ifnet *ifp; - struct mbuf *m0; - struct sockaddr *dst; - struct rtentry *rt0; +atm_output(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst, + struct rtentry *rt0) { u_int16_t etype = 0; /* if using LLC/SNAP */ int error = 0, sz; @@ -116,7 +135,7 @@ senderr(error); #endif - if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING)) + if ((ifp->if_flags & (IFF_UP | IFF_RUNNING)) != (IFF_UP | IFF_RUNNING)) senderr(ENETDOWN); /* @@ -131,6 +150,7 @@ */ if (dst) { switch (dst->sa_family) { + #if defined(INET) || defined(INET6) case AF_INET: case AF_INET6: @@ -154,7 +174,8 @@ * (atm pseudo header (4) + LLC/SNAP (8)) */ bcopy(dst->sa_data, &atmdst, sizeof(atmdst)); - llc_hdr = (struct atmllc *)(dst->sa_data + sizeof(atmdst)); + llc_hdr = (struct atmllc *)(dst->sa_data + + sizeof(atmdst)); break; default: @@ -173,7 +194,8 @@ */ sz = sizeof(atmdst); atm_flags = ATM_PH_FLAGS(&atmdst); - if (atm_flags & ATM_PH_LLCSNAP) sz += 8; /* sizeof snap == 8 */ + if (atm_flags & ATM_PH_LLCSNAP) + sz += 8; /* sizeof snap == 8 */ M_PREPEND(m, sz, M_DONTWAIT); if (m == 0) senderr(ENOBUFS); @@ -184,19 +206,29 @@ if (llc_hdr == NULL) { bcopy(ATMLLC_HDR, atmllc->llchdr, sizeof(atmllc->llchdr)); + /* note: in host order */ ATM_LLC_SETTYPE(atmllc, etype); - /* note: in host order */ } else bcopy(llc_hdr, atmllc, sizeof(struct atmllc)); } } + if (ng_atm_output_p != NULL) { + if ((error = (*ng_atm_output_p)(ifp, &m)) != 0) { + if (m != NULL) + m_freem(m); + return (error); + } + if (m == NULL) + return (0); + } + /* * Queue message on interface, and start output if interface * not yet active. */ - if (! IF_HANDOFF(&ifp->if_snd, m, ifp)) + if (!IF_HANDOFF(&ifp->if_snd, m, ifp)) return (ENOBUFS); return (error); @@ -211,14 +243,11 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 24 12:28:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 234E437B404; Tue, 24 Jun 2003 12:28:49 -0700 (PDT) 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 BAFB237B401 for ; Tue, 24 Jun 2003 12:28:48 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7079C43F85 for ; Tue, 24 Jun 2003 12:28:46 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5OJSk0U092809 for ; Tue, 24 Jun 2003 12:28:46 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5OJSXX7092806 for perforce@freebsd.org; Tue, 24 Jun 2003 12:28:33 -0700 (PDT) Date: Tue, 24 Jun 2003 12:28:33 -0700 (PDT) Message-Id: <200306241928.h5OJSXX7092806@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 33616 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, 24 Jun 2003 19:28:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=33616 Change 33616 by rwatson@rwatson_tislabs on 2003/06/24 12:28:09 Integrate the TrustedBSD base branch; bring in BIND update, texinfo update, etc, etc. Loop back the sbuf API change for label externalization. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#17 integrate .. //depot/projects/trustedbsd/base/Makefile#23 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#40 integrate .. //depot/projects/trustedbsd/base/UPDATING#32 integrate .. //depot/projects/trustedbsd/base/bin/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/base/bin/cp/cp.1#6 integrate .. //depot/projects/trustedbsd/base/bin/cp/utils.c#9 integrate .. //depot/projects/trustedbsd/base/bin/csh/Makefile#7 integrate .. //depot/projects/trustedbsd/base/bin/date/Makefile#4 integrate .. //depot/projects/trustedbsd/base/bin/dd/Makefile#5 integrate .. //depot/projects/trustedbsd/base/bin/df/Makefile#4 integrate .. //depot/projects/trustedbsd/base/bin/ed/Makefile#6 integrate .. //depot/projects/trustedbsd/base/bin/expr/Makefile#4 integrate .. //depot/projects/trustedbsd/base/bin/kenv/Makefile#3 integrate .. //depot/projects/trustedbsd/base/bin/ls/Makefile#8 integrate .. //depot/projects/trustedbsd/base/bin/pax/Makefile#5 integrate .. //depot/projects/trustedbsd/base/bin/ps/Makefile#9 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.1#14 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/bind/CHANGES#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind/FREEBSD-Upgrade#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind/README#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind/Version#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/dig/dig.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/dnsquery/dnsquery.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/host/host.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named-xfer/named-xfer.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_defs.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_ixfr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_load.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_sec.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_config.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_ctl.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_defs.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_forw.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_func.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_glob.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_init.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_ixfr.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_lexer.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_main.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_maint.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_ncache.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_parser.y#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_req.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_resp.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_update.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/ndc/ndc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/getinfo.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/main.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/send.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/nsupdate/nsupdate.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/doc/html/options.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/dig.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/named-xfer.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/named.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/named.conf.5#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/resolver.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/include/arpa/nameser.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/include/arpa/nameser_compat.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/include/hesiod.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind/include/irp.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind/include/irs.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/include/isc/ctl.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/include/isc/dst.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind/include/isc/eventlib.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/include/isc/irpmarshall.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/include/isc/logging.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/include/isc/misc.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/include/isc/tree.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind/include/netgroup.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind/include/resolv.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/dst/bsafe_link.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/dst/cylink_link.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/dst/dst_api.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/dst/hmac_link.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/dns_gr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/dns_ho.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/dns_nw.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/gen_gr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/getaddrinfo.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/gethostent.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/getnameinfo.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/getnetgrent.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/getnetgrent_r.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/hesiod.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/irp_p.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/irs_data.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/nis_gr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/nis_ho.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/ctl_clnt.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/ctl_srvr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/ev_files.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/ev_timers.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/ev_waits.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/eventlib.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/eventlib_p.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/logging.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/nameser/ns_name.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/nameser/ns_parse.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/nameser/ns_print.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/nameser/ns_samedomain.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/nameser/ns_sign.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_comp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_debug.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_findzonecut.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_init.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_mkquery.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_mkupdate.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_private.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_query.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_send.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_update.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/port/freebsd/bin/probe_ipv6#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind/port/freebsd/include/port_after.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/gdtoaimp.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/nroff/nroff.sh#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/X.tmac#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/groff_mdoc.man#9 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/FreeBSD-patchset#1 branch .. //depot/projects/trustedbsd/base/contrib/lukemftp/diffout#1 branch .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/Makefile#1 branch .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/cmds.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/cmdtab.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/complete.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/domacro.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/extern.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/fetch.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp.cat1#2 delete .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp_var.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/main.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/progressbar.c#1 branch .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/progressbar.h#1 branch .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/ruserpass.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/util.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/version.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/nvi/catalog/ru_RU.KOI8-R#2 integrate .. //depot/projects/trustedbsd/base/contrib/nvi/catalog/ru_RU.KOI8-R.base#2 integrate .. //depot/projects/trustedbsd/base/contrib/nvi/catalog/ru_RU.KOI8-R.owner#2 integrate .. //depot/projects/trustedbsd/base/contrib/nvi/catalog/ru_SU.KOI8-R#3 delete .. //depot/projects/trustedbsd/base/contrib/nvi/catalog/ru_SU.KOI8-R.base#3 delete .. //depot/projects/trustedbsd/base/contrib/nvi/catalog/ru_SU.KOI8-R.check#2 delete .. //depot/projects/trustedbsd/base/contrib/nvi/catalog/ru_SU.KOI8-R.owner#2 delete .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_load.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_end.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_getenvlist.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/headers.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/AUTHORS#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/COPYING#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/COPYING.DOC#3 delete .. //depot/projects/trustedbsd/base/contrib/texinfo/ChangeLog#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/FREEBSD-upgrade#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/NEWS#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/TODO#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/config.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/config.h.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/fdl.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/info-stnd.texi#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/info.1#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/install-info.1#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/makeinfo.1#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/texindex.1#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/texinfo.txi#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/version-stnd.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/version.texi#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/display.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/indices.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/info-utils.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/info-utils.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/info.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/info.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/infodoc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/infokey.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/infomap.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/man.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/nodemenu.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/nodes.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/session.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/signals.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/window.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/system.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/xalloc.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/xexit.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/cmds.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/defun.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/files.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/files.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/html.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/index.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/insertion.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/lang.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/lang.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/macro.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/makeinfo.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/makeinfo.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/node.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/sectioning.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/xml.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/util/install-info.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/util/texindex.c#5 integrate .. //depot/projects/trustedbsd/base/etc/Makefile#31 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#27 integrate .. //depot/projects/trustedbsd/base/etc/inetd.conf#10 integrate .. //depot/projects/trustedbsd/base/etc/locale.alias#5 delete .. //depot/projects/trustedbsd/base/etc/locale.deprecated#6 delete .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#17 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#15 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#25 integrate .. //depot/projects/trustedbsd/base/etc/network.subr#3 integrate .. //depot/projects/trustedbsd/base/etc/nls.alias#4 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/Makefile#8 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/login#11 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/su#9 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/system#1 branch .. //depot/projects/trustedbsd/base/etc/pccard_ether#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#10 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/apm#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/apmd#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/devdb#3 delete .. //depot/projects/trustedbsd/base/etc/rc.d/dhclient#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/gbde#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/network1#10 integrate .. //depot/projects/trustedbsd/base/etc/rc.subr#11 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/Makefile#4 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#26 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes2-o#8 integrate .. //depot/projects/trustedbsd/base/games/grdc/grdc.c#3 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/dialog.3#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libgcc/Makefile#7 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libobjc/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libstdc++/Makefile#13 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/Makefile#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/freebsd-native.h#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cpp/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/f77/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/mdoc.local#14 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/send-pr/categories#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/send-pr/send-pr.1#6 integrate .. //depot/projects/trustedbsd/base/include/Makefile#29 integrate .. //depot/projects/trustedbsd/base/include/bitstring.h#2 integrate .. //depot/projects/trustedbsd/base/include/paths.h#8 integrate .. //depot/projects/trustedbsd/base/include/rpc/svc.h#6 integrate .. //depot/projects/trustedbsd/base/include/stdlib.h#17 integrate .. //depot/projects/trustedbsd/base/kerberos5/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/libhdb/Makefile#7 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/hpropd/Makefile#5 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-master/Makefile#6 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-slave/Makefile#6 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/kadmind/Makefile#2 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/kdc/Makefile#6 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/kpasswdd/Makefile#2 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/kadmin/Makefile#3 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.sbin/kstash/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libalias/alias.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libalias/libalias.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libbz2/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/alloca.S#3 delete .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/ldexp.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/sigpause.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gdtoa/glue.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/devname.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/devname.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/exec.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getpwent.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/popen.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sigsetops.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/statvfs.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/ttyname.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/tzset.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/gen/alloca.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_get_ldt.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/signalcontext.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/frune.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/ldpart.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/ldpart.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/lmessages.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/lmonetary.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/lnumeric.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/mbrune.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/nl_langinfo.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/setinvalidrune.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/utf2.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostbyname.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostnamadr.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_vc.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fflush.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdtime/timelocal.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/close.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getfsstat.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getsockname.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kse.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/ntp_adjtime.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/ntp_gettime.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sched_setparam.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sched_setscheduler.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sigpending.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sigprocmask.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sigsuspend.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/sem_post.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_close.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libcam/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libcompat/regexp/regexp.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libcrypt/crypt.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libdevstat/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/disk.c#24 integrate .. //depot/projects/trustedbsd/base/lib/libfetch/fetch.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libform/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libftpio/ftpio.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libgeom/libgeom.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libipx/ipx.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libisc/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_proc.c#15 integrate .. //depot/projects/trustedbsd/base/lib/libmd/md2c.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libmd/md4c.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libmd/md5c.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libmenu/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libncurses/Makefile#12 integrate .. //depot/projects/trustedbsd/base/lib/libnetgraph/netgraph.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_unix/pam_unix.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libpanel/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/alpha/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/arch/alpha/alpha/_atomic_lock.S#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/i386/ksd.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/include/ksd.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/ia64/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/arch/ia64/ia64/_atomic_lock.S#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/ia64/include/atomic_ops.h#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/arch/ia64/include/ksd.h#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/arch/ia64/include/pthread_md.h#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_attr.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_cancel.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_cleanup_pop.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_cleanup_push.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_cond_broadcast.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_cond_destroy.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_cond_init.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_cond_signal.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_cond_timedwait.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_cond_wait.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_condattr.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_create.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_detach.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/support/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/support/thr_support.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/sys/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kern.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_private.h#8 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sig.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigsuspend.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libradius/radlib.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_printf.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libufs/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libufs/block.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libufs/bread.3#1 branch .. //depot/projects/trustedbsd/base/lib/libufs/cgread.3#1 branch .. //depot/projects/trustedbsd/base/lib/libufs/cgroup.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libufs/getino.3#1 branch .. //depot/projects/trustedbsd/base/lib/libufs/inode.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libufs/libufs.3#1 branch .. //depot/projects/trustedbsd/base/lib/libufs/libufs.h#6 integrate .. //depot/projects/trustedbsd/base/lib/libufs/sblock.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libufs/sbread.3#1 branch .. //depot/projects/trustedbsd/base/lib/libufs/type.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libufs/ufs_disk_close.3#1 branch .. //depot/projects/trustedbsd/base/lib/libutil/auth.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login_auth.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login_cap.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login_class.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login_ok.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login_times.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login_tty.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libutil/logout.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libutil/property.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libutil/pty.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libutil/pw_util.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libutil/realhostname.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libutil/uucplock.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libxpg4/fakelib.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libypclnt/ypclnt_passwd.c#5 integrate .. //depot/projects/trustedbsd/base/libexec/bootpd/bootpd.c#5 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpcmd.y#15 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.8#12 integrate .. //depot/projects/trustedbsd/base/libexec/getty/gettytab.5#6 integrate .. //depot/projects/trustedbsd/base/libexec/getty/gettytab.h#3 integrate .. //depot/projects/trustedbsd/base/libexec/getty/init.c#3 integrate .. //depot/projects/trustedbsd/base/libexec/getty/main.c#6 integrate .. //depot/projects/trustedbsd/base/libexec/lukemftpd/Makefile#9 integrate .. //depot/projects/trustedbsd/base/libexec/named-xfer/Makefile#3 integrate .. //depot/projects/trustedbsd/base/libexec/rexecd/rexecd.8#3 integrate .. //depot/projects/trustedbsd/base/libexec/rshd/rshd.8#4 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/debug.c#2 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/ia64/reloc.c#10 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/libmap.c#3 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/map_object.c#7 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.1#10 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.c#16 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.h#4 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld_lock.h#2 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/xmalloc.c#2 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/errata/article.sgml#9 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#41 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#67 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/errata/article.sgml#9 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#11 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#23 integrate .. //depot/projects/trustedbsd/base/release/doc/share/sgml/release.ent#8 integrate .. //depot/projects/trustedbsd/base/release/pc98/dokern.sh#11 integrate .. //depot/projects/trustedbsd/base/release/picobsd/bridge/PICOBSD#4 integrate .. //depot/projects/trustedbsd/base/release/picobsd/bridge/crunch.conf#6 integrate .. //depot/projects/trustedbsd/base/sbin/Makefile#15 integrate .. //depot/projects/trustedbsd/base/sbin/badsect/badsect.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/bsdlabel.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/runtest.sh#4 integrate .. //depot/projects/trustedbsd/base/sbin/camcontrol/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sbin/ccdconfig/ccdconfig.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/devfs/devfs.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/dmesg/dmesg.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/dump/dump.8#15 integrate .. //depot/projects/trustedbsd/base/sbin/dumpfs/dumpfs.c#12 integrate .. //depot/projects/trustedbsd/base/sbin/ffsinfo/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_msdosfs/fsck_msdosfs.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/growfs/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/growfs/growfs.8#10 integrate .. //depot/projects/trustedbsd/base/sbin/init/init.8#7 integrate .. //depot/projects/trustedbsd/base/sbin/ipf/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sbin/ipfstat/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#23 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.c#7 delete .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#16 integrate .. //depot/projects/trustedbsd/base/sbin/ipmon/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sbin/ipnat/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sbin/mdconfig/mdconfig.8#7 integrate .. //depot/projects/trustedbsd/base/sbin/mdconfig/mdconfig.c#10 integrate .. //depot/projects/trustedbsd/base/sbin/natd/natd.8#8 integrate .. //depot/projects/trustedbsd/base/sbin/natd/natd.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/restore/restore.8#9 integrate .. //depot/projects/trustedbsd/base/sbin/routed/rtquery/rtquery.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/sysctl/sysctl.8#9 integrate .. //depot/projects/trustedbsd/base/sbin/sysctl/sysctl.c#13 integrate .. //depot/projects/trustedbsd/base/sbin/tunefs/tunefs.8#13 integrate .. //depot/projects/trustedbsd/base/sbin/vinum/commands.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/vinum/v.c#6 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/Makefile#6 integrate .. //depot/projects/trustedbsd/base/share/colldef/Makefile#12 integrate .. //depot/projects/trustedbsd/base/share/colldef/bg_BG.CP1251.src#2 integrate .. //depot/projects/trustedbsd/base/share/colldef/map.CP866#2 integrate .. //depot/projects/trustedbsd/base/share/colldef/map.KOI8-R#2 integrate .. //depot/projects/trustedbsd/base/share/colldef/map.KOI8-U#2 integrate .. //depot/projects/trustedbsd/base/share/colldef/ru_RU.CP1251.src#1 branch .. //depot/projects/trustedbsd/base/share/colldef/ru_RU.CP866.src#2 integrate .. //depot/projects/trustedbsd/base/share/colldef/ru_RU.ISO8859-5.src#2 integrate .. //depot/projects/trustedbsd/base/share/colldef/ru_RU.KOI8-R.src#2 integrate .. //depot/projects/trustedbsd/base/share/colldef/uk_UA.KOI8-U.src#2 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/timecounter/Makefile#1 branch .. //depot/projects/trustedbsd/base/share/doc/papers/timecounter/fig1.eps#1 branch .. //depot/projects/trustedbsd/base/share/doc/papers/timecounter/fig2.eps#1 branch .. //depot/projects/trustedbsd/base/share/doc/papers/timecounter/fig3.eps#1 branch .. //depot/projects/trustedbsd/base/share/doc/papers/timecounter/fig4.eps#1 branch .. //depot/projects/trustedbsd/base/share/doc/papers/timecounter/fig5.eps#1 branch .. //depot/projects/trustedbsd/base/share/doc/papers/timecounter/gps.ps#1 branch .. //depot/projects/trustedbsd/base/share/doc/papers/timecounter/intr.ps#1 branch .. //depot/projects/trustedbsd/base/share/doc/papers/timecounter/timecounter.ms#1 branch .. //depot/projects/trustedbsd/base/share/doc/papers/timecounter/tmac.usenix#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#33 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ath.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/ath_hal.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/en.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/exca.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/fatm.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/gem.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/hatm.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/hme.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/mac_lomac.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mac_seeotheruids.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mac_test.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/matcd.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/miibus.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/natm.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/natmip.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/ng_bridge.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/pccbb.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/pci.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/rp.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/utopia.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/wi.4#13 integrate .. //depot/projects/trustedbsd/base/share/man/man5/elf.5#3 integrate .. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#24 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#29 integrate .. //depot/projects/trustedbsd/base/share/man/man7/environ.7#4 integrate .. //depot/projects/trustedbsd/base/share/man/man7/hier.7#15 integrate .. //depot/projects/trustedbsd/base/share/man/man7/ports.7#8 integrate .. //depot/projects/trustedbsd/base/share/man/man7/security.7#7 integrate .. //depot/projects/trustedbsd/base/share/man/man8/yp.8#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/Makefile#29 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_GETEXTATTR.9#9 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_LISTEXTATTR.9#1 branch .. //depot/projects/trustedbsd/base/share/man/man9/VOP_SETEXTATTR.9#6 integrate .. //depot/projects/trustedbsd/base/share/man/man9/bus_dma.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/extattr.9#5 integrate .. //depot/projects/trustedbsd/base/share/man/man9/ifnet.9#9 integrate .. //depot/projects/trustedbsd/base/share/man/man9/malloc.9#10 integrate .. //depot/projects/trustedbsd/base/share/man/man9/mbuf.9#10 integrate .. //depot/projects/trustedbsd/base/share/man/man9/pci.9#1 branch .. //depot/projects/trustedbsd/base/share/man/man9/sx.9#6 integrate .. //depot/projects/trustedbsd/base/share/man/man9/utopia.9#1 branch .. //depot/projects/trustedbsd/base/share/mk/bsd.lib.mk#16 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.libnames.mk#16 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.sys.mk#12 integrate .. //depot/projects/trustedbsd/base/share/mklocale/Makefile#11 integrate .. //depot/projects/trustedbsd/base/share/monetdef/Makefile#11 integrate .. //depot/projects/trustedbsd/base/share/monetdef/ru_RU.CP1251.src#1 branch .. //depot/projects/trustedbsd/base/share/msgdef/Makefile#11 integrate .. //depot/projects/trustedbsd/base/share/msgdef/ru_RU.CP1251.src#1 branch .. //depot/projects/trustedbsd/base/share/numericdef/Makefile#11 integrate .. //depot/projects/trustedbsd/base/share/numericdef/ru_RU.CP866.src#2 delete .. //depot/projects/trustedbsd/base/share/numericdef/ru_RU.ISO8859-5.src#2 delete .. //depot/projects/trustedbsd/base/share/numericdef/uk_UA.ISO8859-5.src#2 delete .. //depot/projects/trustedbsd/base/share/syscons/keymaps/INDEX.keymaps#6 integrate .. //depot/projects/trustedbsd/base/share/syscons/keymaps/Makefile#9 integrate .. //depot/projects/trustedbsd/base/share/syscons/keymaps/german.iso.acc.kbd#1 branch .. //depot/projects/trustedbsd/base/share/syscons/keymaps/lat-amer.kbd#2 delete .. //depot/projects/trustedbsd/base/share/syscons/keymaps/latinamerican.iso.acc.kbd#1 branch .. //depot/projects/trustedbsd/base/share/syscons/keymaps/latinamerican.kbd#1 branch .. //depot/projects/trustedbsd/base/share/syscons/keymaps/us.iso.acc.kbd#1 branch .. //depot/projects/trustedbsd/base/share/termcap/termcap.5#3 integrate .. //depot/projects/trustedbsd/base/share/timedef/Makefile#10 integrate .. //depot/projects/trustedbsd/base/share/timedef/ru_RU.CP1251.src#1 branch .. //depot/projects/trustedbsd/base/sys/alpha/alpha/alpha-gdbstub.c#3 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/api_up1000.c#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/autoconf.c#7 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/busdma_machdep.c#10 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/busspace.c#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/clock.c#6 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/cpuconf.c#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/critical.c#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/db_disasm.c#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/db_interface.c#5 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_1000a.c#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_2100_a50.c#5 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_2100_a500.c#5 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_3000_300.c#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_3000_500.c#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_axppci_33.c#6 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_eb164.c#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_eb64plus.c#5 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_kn20aa.c#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_kn300.c#5 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_kn8ae.c#3 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_st550.c#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_st6600.c#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dump_machdep.c#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/elf_machdep.c#8 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/fp_emulate.c#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/genassym.c#9 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/ieee_float.c#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/in_cksum.c#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/interrupt.c#12 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/machdep.c#24 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/mem.c#7 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/mp_machdep.c#12 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/pmap.c#29 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/prom.c#8 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/promcons.c#6 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/sgmap.c#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/sys_machdep.c#9 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/trap.c#20 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/vm_machdep.c#18 integrate .. //depot/projects/trustedbsd/base/sys/alpha/conf/GENERIC#23 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/param.h#5 integrate .. //depot/projects/trustedbsd/base/sys/alpha/isa/isa.c#5 integrate .. //depot/projects/trustedbsd/base/sys/alpha/isa/isa_dma.c#3 integrate .. //depot/projects/trustedbsd/base/sys/alpha/isa/mcclock_isa.c#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_dummy.c#3 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_genassym.c#3 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_machdep.c#9 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_sysvec.c#10 integrate .. //depot/projects/trustedbsd/base/sys/alpha/mcbus/mcbus.c#3 integrate .. //depot/projects/trustedbsd/base/sys/alpha/mcbus/mcmem.c#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/mcbus/mcpcia.c#7 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/imgact_osf1.c#10 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_ioctl.c#3 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_misc.c#14 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_mount.c#8 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_signal.c#13 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_sysvec.c#5 integrate .. //depot/projects/trustedbsd/base/sys/alpha/pci/apecs.c#3 integrate .. //depot/projects/trustedbsd/base/sys/alpha/pci/apecs_pci.c#3 integrate .. //depot/projects/trustedbsd/base/sys/alpha/pci/bwx.c#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/pci/cia.c#5 integrate .. //depot/projects/trustedbsd/base/sys/alpha/pci/cia_pci.c#3 integrate .. //depot/projects/trustedbsd/base/sys/alpha/pci/irongate.c#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/pci/irongate_pci.c#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/pci/lca.c#3 integrate .. //depot/projects/trustedbsd/base/sys/alpha/pci/lca_pci.c#5 integrate .. //depot/projects/trustedbsd/base/sys/alpha/pci/pcibus.c#3 integrate .. //depot/projects/trustedbsd/base/sys/alpha/pci/swiz.c#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/pci/t2.c#5 integrate .. //depot/projects/trustedbsd/base/sys/alpha/pci/t2_pci.c#5 integrate .. //depot/projects/trustedbsd/base/sys/alpha/pci/tsunami.c#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/pci/tsunami_pci.c#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/dwlpx.c#6 integrate .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/gbus.c#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/kftxx.c#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/mcclock_tlsb.c#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/tlsb.c#3 integrate .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/tlsbcpu.c#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/tlsbmem.c#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/zs_tlsb.c#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/mem.c#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/param.h#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/ficl/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/ficl/loader.c#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/forth/beastie.4th#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/kgzldr/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/kgzldr/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/libpc98/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/pc98/loader/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/trustedbsd/base/sys/boot/sparc64/loader/main.c#11 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam.c#4 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_periph.c#11 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_queue.c#3 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_sim.c#3 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_xpt.c#14 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_all.c#13 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_cd.c#18 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_ch.c#8 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#32 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_low.c#9 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_low_pisa.c#3 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_pass.c#7 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_pt.c#7 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_sa.c#11 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_ses.c#7 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_targ_bh.c#5 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_target.c#7 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_fbsd.c#5 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_namecache.c#5 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_psdev.c#7 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_subr.c#6 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_venus.c#5 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_vfsops.c#8 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_vfsops.h#2 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_vnops.c#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/linprocfs/linprocfs.c#17 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_file.c#16 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_getcwd.c#10 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_ioctl.c#23 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_ipc.c#8 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_mib.c#8 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#22 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_signal.c#8 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_socket.c#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_stats.c#12 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_sysctl.c#8 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_uid16.c#6 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_util.c#6 integrate .. //depot/projects/trustedbsd/base/sys/compat/pecoff/imgact_pecoff.c#15 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/imgact_svr4.c#8 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_fcntl.c#10 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_filio.c#12 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_ioctl.c#7 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_ipc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_misc.c#18 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_resource.c#5 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_signal.c#7 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_socket.c#6 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_sockio.c#6 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_stat.c#8 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_stream.c#13 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_sysvec.c#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_termios.c#4 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_ttold.c#4 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#36 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#60 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.sparc64#24 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#26 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.pre.mk#17 integrate .. //depot/projects/trustedbsd/base/sys/conf/ldscript.sparc64#2 integrate .. //depot/projects/trustedbsd/base/sys/conf/majors#23 integrate .. //depot/projects/trustedbsd/base/sys/conf/newvers.sh#5 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#36 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.alpha#9 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.amd64#3 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.i386#16 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.ia64#10 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.pc98#17 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.sparc64#6 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/hwregs.c#7 integrate .. //depot/projects/trustedbsd/base/sys/crypto/blowfish/bf_enc.c#3 integrate .. //depot/projects/trustedbsd/base/sys/crypto/blowfish/bf_skey.c#3 integrate .. //depot/projects/trustedbsd/base/sys/crypto/cast128/cast128.c#3 integrate .. //depot/projects/trustedbsd/base/sys/crypto/md5.c#4 integrate .. //depot/projects/trustedbsd/base/sys/crypto/rc4/rc4.c#3 integrate .. //depot/projects/trustedbsd/base/sys/crypto/rijndael/rijndael-alg-fst.c#2 integrate .. //depot/projects/trustedbsd/base/sys/crypto/rijndael/rijndael-api-fst.c#4 integrate .. //depot/projects/trustedbsd/base/sys/crypto/sha1.c#3 integrate .. //depot/projects/trustedbsd/base/sys/crypto/sha2/sha2.c#5 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_access.c#2 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_break.c#5 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_command.c#11 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_elf.c#4 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_examine.c#5 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_expr.c#4 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_input.c#7 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_kld.c#3 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_lex.c#4 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_output.c#3 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_print.c#2 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_ps.c#15 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_run.c#4 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_sym.c#3 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_sysctl.c#2 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_trap.c#2 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_variables.c#3 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_watch.c#4 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_write_cmd.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac_disk.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/advansys.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/adwcam.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/ahb/ahb.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic/aic.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7770.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.reg#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_osm.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_osm.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_pci.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_pci.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/amd/amd.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr_cam.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-card.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cam.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath_pci.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athioctl.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athvar.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/bktr/bktr_card.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/bktr/bktr_core.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/ccd/ccd.c#19 delete .. //depot/projects/trustedbsd/base/sys/dev/dpt/dpt_scsi.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/README#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.h#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_hw.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_hw.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/en/if_en_pci.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/en/midway.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/en/midwayvar.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/exca/exca.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/exca/excareg.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/exca/excavar.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/fatm/firmware.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/fatm/if_fatm.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/fatm/if_fatm_rate.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/fatm/if_fatmreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/fatm/if_fatmvar.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/firewire/firewire.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/firewirereg.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwcrom.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/iec13213.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/if_fwe.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/sbp.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/hatm/if_hatm.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/hatm/if_hatm_intr.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/hatm/if_hatm_ioctl.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/hatm/if_hatm_rx.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/hatm/if_hatm_tx.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/hatm/if_hatmconf.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/hatm/if_hatmreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/hatm/if_hatmvar.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/iicbus/iicbb.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/iicbus/iiconf.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/matcd/creativeif.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/matcd/matcd.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/matcd/matcd_data.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/matcd/matcd_isa.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/matcd/matcddrv.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/matcd/options.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/md/md.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/brgphyreg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_freebsd.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ofw/openfirm.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ofw/openfirm.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ofw/openfirmio.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ofw/openfirmio.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ofw/openpromio.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ofw/openpromio.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccard.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccarddevs#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccarddevs.h#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbbvar.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pci_user.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/sio/sio.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/streams/streams.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/sym/sym_hipd.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/trm/trm.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci_pci.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci_pci.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ulpt.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs.h#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs_data.h#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uscanner.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/utopia/idtphy.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/utopia/suni.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/utopia/utopia.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/utopia/utopia.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumconfig.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumio.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumio.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumioctl.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumkw.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumparser.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumrequest.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumutil.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/vx/if_vx.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#34 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi_pccard.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi_pci.c#7 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vfsops.c#12 integrate .. //depot/projects/trustedbsd/base/sys/fs/fdescfs/fdesc_vfsops.c#8 integrate .. //depot/projects/trustedbsd/base/sys/fs/fdescfs/fdesc_vnops.c#11 integrate .. //depot/projects/trustedbsd/base/sys/fs/fifofs/fifo_vnops.c#26 integrate .. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_vfsops.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_vnops.c#17 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vfsops.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vnops.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_subr.c#9 integrate .. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_vfsops.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_vnops.c#11 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null.h#3 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_subr.c#7 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vfsops.c#8 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vnops.c#10 integrate .. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_io.c#6 integrate .. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_vfsops.c#9 integrate .. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_vnops.c#6 integrate .. //depot/projects/trustedbsd/base/sys/fs/portalfs/portal_vfsops.c#11 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_status.c#11 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs.h#12 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_vnops.c#18 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_io.c#10 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_node.c#11 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_node.h#5 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_smb.c#9 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_subr.c#4 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_vfsops.c#15 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_vnops.c#16 integrate .. //depot/projects/trustedbsd/base/sys/fs/specfs/spec_vnops.c#21 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vfsops.c#10 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vnops.c#15 integrate .. //depot/projects/trustedbsd/base/sys/fs/umapfs/umap_vfsops.c#11 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union.h#6 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_subr.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_vfsops.c#12 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_vnops.c#11 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom.h#28 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_aes.c#13 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_apple.c#7 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_bsd.c#25 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_bsd_enc.c#3 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_ctl.c#10 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_dev.c#29 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_disk.c#28 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_dump.c#19 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_event.c#12 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_fox.c#1 branch .. //depot/projects/trustedbsd/base/sys/geom/geom_gpt.c#13 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_io.c#16 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_kern.c#16 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_mbr.c#20 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_mbr_enc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_mirror.c#7 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_pc98.c#18 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_pc98_enc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_slice.c#21 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_subr.c#22 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_sunlabel.c#15 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_sunlabel_enc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_vol_ffs.c#6 integrate .. //depot/projects/trustedbsd/base/sys/gnu/dev/sound/pci/emu10k1-alsa.h#1 branch .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_vfsops.c#13 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_vnops.c#14 integrate .. //depot/projects/trustedbsd/base/sys/i386/bios/apm.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/bios/smapi.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/bios/smapi_bios.S#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#34 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/PAE#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/legacy.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#36 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/sys_machdep.c#13 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#26 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/vm_machdep.c#23 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_misc.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_stat.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/acpica_machdep.h#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/apic.h#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/legacyvar.h#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/param.h#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/apic_vector.s#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/pcf.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysvec.c#20 integrate .. //depot/projects/trustedbsd/base/sys/i386/pci/pci_bus.c#17 integrate .. //depot/projects/trustedbsd/base/sys/i386/svr4/svr4_genassym.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/svr4/svr4_machdep.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i4b/capi/capi_l4if.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i4b/capi/capi_llif.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/capi/capi_msgs.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/capi/iavc/iavc_card.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i4b/capi/iavc/iavc_isa.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i4b/capi/iavc/iavc_lli.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i4b/capi/iavc/iavc_pci.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i4b/driver/i4b_ctl.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i4b/driver/i4b_ing.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i4b/driver/i4b_ipr.c#10 integrate .. //depot/projects/trustedbsd/base/sys/i4b/driver/i4b_isppp.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i4b/driver/i4b_rbch.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i4b/driver/i4b_tel.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i4b/driver/i4b_trace.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/i4b_hdlc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/i4b_l1dmux.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/i4b_l1lib.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#10 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_asuscom_ipac.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_avm_a1.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_bchan.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_ctx_s0P.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_diva.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_drn_ngo.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_dynalink.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_elsa_qs1i.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_hscx.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_isac.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_isic.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_isic_isa.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_isic_pnp.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_itk_ix1.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_l1.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_l1fsm.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_siemens_isurf.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_sws.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_tel_s016.c#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 24 13:17:22 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB1D937B404; Tue, 24 Jun 2003 13:17:21 -0700 (PDT) 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 779AD37B401 for ; Tue, 24 Jun 2003 13:17:21 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A07943F85 for ; Tue, 24 Jun 2003 13:17:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5OKHI0U026579 for ; Tue, 24 Jun 2003 13:17:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5OKH4F5026575 for perforce@freebsd.org; Tue, 24 Jun 2003 13:17:04 -0700 (PDT) Date: Tue, 24 Jun 2003 13:17:04 -0700 (PDT) Message-Id: <200306242017.h5OKH4F5026575@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 33620 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, 24 Jun 2003 20:17:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=33620 Change 33620 by rwatson@rwatson_tislabs on 2003/06/24 13:16:43 Integrate the TrustedBSD base branch; bring in BIND update, texinfo update, etc, etc. Loop back the sbuf API change for label externalization. This includes the work-around to avoid a panic on a UFS2 EA operation on a device node. Also picks up the move to explicit EA listing operations (MAC Framework update to follow). Affected files ... .. //depot/projects/trustedbsd/mac/MAINTAINERS#17 integrate .. //depot/projects/trustedbsd/mac/Makefile#21 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#39 integrate .. //depot/projects/trustedbsd/mac/UPDATING#28 integrate .. //depot/projects/trustedbsd/mac/bin/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/mac/bin/cp/cp.1#7 integrate .. //depot/projects/trustedbsd/mac/bin/cp/utils.c#10 integrate .. //depot/projects/trustedbsd/mac/bin/csh/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/bin/date/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/bin/dd/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/bin/df/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/bin/df/df.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/df/df.c#15 integrate .. //depot/projects/trustedbsd/mac/bin/ed/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/bin/ed/cbc.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/ed/ed.h#6 integrate .. //depot/projects/trustedbsd/mac/bin/expr/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/bin/kenv/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/bin/ls/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/bin/pax/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/bin/ps/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.1#16 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.c#18 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/CHANGES#8 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/FREEBSD-Upgrade#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/README#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/Version#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/dig/dig.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/dnsquery/dnsquery.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/host/host.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named-xfer/named-xfer.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_defs.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_ixfr.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_load.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_sec.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_config.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_ctl.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_defs.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_forw.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_func.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_glob.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_init.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_ixfr.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_lexer.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_main.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_maint.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_ncache.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_parser.y#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_req.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_resp.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_update.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/ndc/ndc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/getinfo.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/main.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/send.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nsupdate/nsupdate.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/options.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/dig.1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/named-xfer.8#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/named.8#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/named.conf.5#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/resolver.3#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/include/arpa/nameser.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/include/arpa/nameser_compat.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/include/hesiod.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/include/irp.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/include/irs.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/include/isc/ctl.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/include/isc/dst.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/include/isc/eventlib.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/include/isc/irpmarshall.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/include/isc/logging.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/include/isc/misc.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/include/isc/tree.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/include/netgroup.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/include/resolv.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/dst/bsafe_link.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/dst/cylink_link.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/dst/dst_api.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/dst/hmac_link.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/dns_gr.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/dns_ho.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/dns_nw.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/gen_gr.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/getaddrinfo.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/gethostent.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/getnameinfo.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/getnetgrent.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/getnetgrent_r.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/hesiod.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/irp_p.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/irs_data.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/nis_gr.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/nis_ho.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/ctl_clnt.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/ctl_srvr.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/ev_files.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/ev_timers.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/ev_waits.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/eventlib.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/eventlib_p.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/logging.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_name.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_parse.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_print.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_samedomain.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_sign.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_comp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_debug.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_findzonecut.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_init.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_mkquery.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_mkupdate.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_private.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_query.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_send.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_update.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/port/freebsd/bin/probe_ipv6#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/port/freebsd/include/port_after.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/gdtoaimp.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/nroff/nroff.sh#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/X.tmac#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/groff_mdoc.man#9 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/FreeBSD-patchset#1 branch .. //depot/projects/trustedbsd/mac/contrib/lukemftp/diffout#1 branch .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/Makefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/cmds.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/cmdtab.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/complete.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/domacro.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/extern.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/fetch.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/ftp.1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/ftp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/ftp.cat1#3 delete .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/ftp_var.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/main.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/progressbar.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/progressbar.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/ruserpass.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/util.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/version.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/nvi/catalog/ru_RU.KOI8-R#2 integrate .. //depot/projects/trustedbsd/mac/contrib/nvi/catalog/ru_RU.KOI8-R.base#2 integrate .. //depot/projects/trustedbsd/mac/contrib/nvi/catalog/ru_RU.KOI8-R.owner#2 integrate .. //depot/projects/trustedbsd/mac/contrib/nvi/catalog/ru_SU.KOI8-R#3 delete .. //depot/projects/trustedbsd/mac/contrib/nvi/catalog/ru_SU.KOI8-R.base#3 delete .. //depot/projects/trustedbsd/mac/contrib/nvi/catalog/ru_SU.KOI8-R.check#2 delete .. //depot/projects/trustedbsd/mac/contrib/nvi/catalog/ru_SU.KOI8-R.owner#2 delete .. //depot/projects/trustedbsd/mac/contrib/openpam/CREDITS#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/HISTORY#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/LICENSE#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/MANIFEST#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/contrib/openpam/RELNOTES#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/bin/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/bin/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/contrib/openpam/bin/su/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/bin/su/su.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam.3#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_borrow_cred.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_free_data.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_get_option.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_log.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_nullconv.3#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_readline.3#1 branch .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_restore_cred.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_set_option.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_ttyconv.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_acct_mgmt.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_authenticate.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_chauthtok.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_close_session.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_conv.3#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_end.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_error.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_authtok.3#15 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_data.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_item.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_user.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenv.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenvlist.3#15 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_info.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_open_session.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_prompt.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_putenv.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_data.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_item.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setcred.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setenv.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_authenticate.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_chauthtok.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_close_session.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_open_session.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_setcred.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_start.3#15 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_strerror.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_verror.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vinfo.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vprompt.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/openpam.h#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/openpam_version.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_appl.h#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_constants.h#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_modules.h#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_types.h#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_borrow_cred.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_configure.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_dispatch.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_dynamic.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_findenv.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_free_data.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_get_option.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_impl.h#13 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_load.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_log.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_nullconv.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_readline.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_restore_cred.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_set_option.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_static.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_ttyconv.c#15 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_acct_mgmt.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_authenticate.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_authenticate_secondary.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_chauthtok.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_close_session.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_end.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_error.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_authtok.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_data.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_item.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_mapped_authtok.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_mapped_username.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_user.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_getenv.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_getenvlist.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_info.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_open_session.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_prompt.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_putenv.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_data.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_item.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_mapped_authtok.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_mapped_username.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_setcred.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_setenv.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_acct_mgmt.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_authenticate.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_authenticate_secondary.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_chauthtok.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_close_session.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_get_mapped_username.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_open_session.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_set_mapped_username.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_setcred.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_start.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_strerror.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_verror.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_vinfo.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_vprompt.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/misc/gendoc.pl#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_deny/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_deny/pam_deny.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_permit/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_permit/pam_permit.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_unix/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_unix/pam_unix.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/conf.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/headers.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/AUTHORS#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/COPYING#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/COPYING.DOC#3 delete .. //depot/projects/trustedbsd/mac/contrib/texinfo/ChangeLog#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/FREEBSD-upgrade#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/NEWS#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/TODO#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/config.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/config.h.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/fdl.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/info-stnd.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/info.1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/install-info.1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/makeinfo.1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/texindex.1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/texinfo.txi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/version-stnd.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/version.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/display.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/indices.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/info-utils.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/info-utils.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/info.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/info.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/infodoc.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/infokey.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/infomap.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/man.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/nodemenu.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/nodes.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/session.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/signals.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/window.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/system.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/xalloc.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/xexit.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/cmds.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/defun.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/files.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/files.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/html.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/index.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/insertion.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/lang.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/lang.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/macro.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/makeinfo.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/makeinfo.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/node.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/sectioning.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/xml.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/util/install-info.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/util/texindex.c#5 integrate .. //depot/projects/trustedbsd/mac/etc/Makefile#30 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#26 integrate .. //depot/projects/trustedbsd/mac/etc/inetd.conf#10 integrate .. //depot/projects/trustedbsd/mac/etc/locale.alias#4 delete .. //depot/projects/trustedbsd/mac/etc/locale.deprecated#4 delete .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#24 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.local.dist#12 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.usr.dist#22 integrate .. //depot/projects/trustedbsd/mac/etc/network.subr#3 integrate .. //depot/projects/trustedbsd/mac/etc/nls.alias#3 integrate .. //depot/projects/trustedbsd/mac/etc/pam.d/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/etc/pam.d/login#11 integrate .. //depot/projects/trustedbsd/mac/etc/pam.d/su#9 integrate .. //depot/projects/trustedbsd/mac/etc/pam.d/system#1 branch .. //depot/projects/trustedbsd/mac/etc/pccard_ether#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/apm#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/apmd#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/devdb#3 delete .. //depot/projects/trustedbsd/mac/etc/rc.d/dhclient#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/gbde#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/mountcritlocal#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/mountcritremote#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/network1#10 integrate .. //depot/projects/trustedbsd/mac/etc/rc.subr#11 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#25 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2-o#8 integrate .. //depot/projects/trustedbsd/mac/games/grdc/grdc.c#3 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/csu/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libdialog/dialog.3#2 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libgcc/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libobjc/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libstdc++/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc_tools/freebsd-native.h#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cpp/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/f77/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/mdoc.local#13 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/send-pr/categories#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/send-pr/send-pr.1#6 integrate .. //depot/projects/trustedbsd/mac/include/Makefile#32 integrate .. //depot/projects/trustedbsd/mac/include/bitstring.h#2 integrate .. //depot/projects/trustedbsd/mac/include/paths.h#8 integrate .. //depot/projects/trustedbsd/mac/include/rpc/svc.h#6 integrate .. //depot/projects/trustedbsd/mac/include/stdlib.h#16 integrate .. //depot/projects/trustedbsd/mac/kerberos5/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/mac/kerberos5/lib/libhdb/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/hpropd/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/ipropd-master/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/ipropd-slave/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/kadmind/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/kdc/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/kpasswdd/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/kadmin/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.sbin/kstash/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/Makefile#21 integrate .. //depot/projects/trustedbsd/mac/lib/csu/i386-elf/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/lib/libalias/alias.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libalias/alias.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libalias/alias_db.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libalias/libalias.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libbz2/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/amd64/gen/_setjmp.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/amd64/gen/alloca.S#3 delete .. //depot/projects/trustedbsd/mac/lib/libc/amd64/gen/ldexp.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/amd64/gen/setjmp.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/amd64/gen/sigsetjmp.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/compat-43/sigpause.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gdtoa/glue.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/devname.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/devname.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/dlinfo.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/exec.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/fpclassify.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/fts.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getpwent.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/isgreater.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/popen.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/sigsetops.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/statvfs.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/ttyname.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/tzset.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/wordexp.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gmon/gmon.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/gen/alloca.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/gen/ldexp.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_get_ldt.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/makecontext.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/signalcontext.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/Makefile.inc#12 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/frune.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/gbk.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/ldpart.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/ldpart.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/lmessages.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/lmonetary.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/lnumeric.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/mbrune.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/nl_langinfo.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/setinvalidrune.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/setrunelocale.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/utf2.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/gethostbyname.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/gethostnamadr.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_vc.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fflush.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/grantpt.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/malloc.c#12 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdtime/timelocal.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/close.2#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/extattr_get_file.2#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/getfsstat.2#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/getsockname.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/kldload.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/kse.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/lio_listio.2#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/ntp_adjtime.2#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/ntp_gettime.2#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/sched_setparam.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/sched_setscheduler.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/sigpending.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/sigprocmask.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/sigsuspend.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/arch/amd64/_atomic_lock.S#1 branch .. //depot/projects/trustedbsd/mac/lib/libc_r/man/sem_post.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/test/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/test/guard_b.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/test/join_leak_d.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/test/mutex_d.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/pthread_private.h#14 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_close.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libcam/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/libcompat/regexp/regexp.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libcrypt/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/libcrypt/crypt-md5.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libcrypt/crypt-nthash.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libcrypt/crypt.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libcrypt/crypt.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libcrypt/crypt.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libdevstat/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/disk.c#25 integrate .. //depot/projects/trustedbsd/mac/lib/libfetch/fetch.3#8 integrate .. //depot/projects/trustedbsd/mac/lib/libform/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/libftpio/ftpio.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libgeom/geom_ctl.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libgeom/libgeom.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libgeom/libgeom.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libipx/ipx.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libisc/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/lib/libkvm/kvm_proc.c#14 integrate .. //depot/projects/trustedbsd/mac/lib/libmd/md2c.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libmd/md4c.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libmd/md5c.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libmenu/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/libncurses/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/lib/libnetgraph/netgraph.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/libpam/Makefile#19 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_ftp/Makefile#5 delete .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_ftp/pam_ftp.8#3 delete .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_ftp/pam_ftp.c#8 delete .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_unix/pam_unix.c#13 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_wheel/Makefile#5 delete .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_wheel/pam_wheel.8#4 delete .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_wheel/pam_wheel.c#9 delete .. //depot/projects/trustedbsd/mac/lib/libpanel/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/alpha/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/alpha/alpha/_atomic_lock.S#2 delete .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/i386/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/i386/i386/ksd.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/i386/include/ksd.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/ia64/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/ia64/ia64/_atomic_lock.S#2 delete .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/ia64/include/atomic_ops.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/ia64/include/ksd.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/ia64/include/pthread_md.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_attr.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_cancel.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_cleanup_pop.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_cleanup_push.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_cond_broadcast.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_cond_destroy.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_cond_init.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_cond_signal.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_cond_timedwait.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_cond_wait.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_condattr.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_create.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_detach.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/support/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/support/thr_support.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/sys/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_cond.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_create.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_init.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_kern.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_mutex.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_private.h#7 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sig.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sigprocmask.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sigsuspend.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libradius/radlib.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/arch/i386/i386/_curthread.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_detach.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_init.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_mutex.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_printf.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_private.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libufs/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/lib/libufs/block.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libufs/bread.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libufs/cgread.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libufs/cgroup.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libufs/getino.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libufs/inode.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libufs/libufs.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libufs/libufs.h#6 integrate .. //depot/projects/trustedbsd/mac/lib/libufs/sblock.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libufs/sbread.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libufs/type.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libufs/ufs_disk_close.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libugidfw/bsde_get_rule.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/bsde_get_rule_count.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/bsde_parse_rule.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/bsde_rule_to_string.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/libugidfw.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/auth.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/login_auth.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/login_cap.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/login_class.c#12 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/login_ok.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/login_times.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/login_tty.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/logout.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/property.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/pty.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/pw_util.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/realhostname.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/uucplock.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libwrap/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/lib/libxpg4/fakelib.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libypclnt/ypclnt_passwd.c#5 integrate .. //depot/projects/trustedbsd/mac/libexec/bootpd/bootpd.c#5 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpchroot.5#2 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpcmd.y#14 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.8#11 integrate .. //depot/projects/trustedbsd/mac/libexec/getty/gettytab.5#5 integrate .. //depot/projects/trustedbsd/mac/libexec/getty/gettytab.h#3 integrate .. //depot/projects/trustedbsd/mac/libexec/getty/init.c#3 integrate .. //depot/projects/trustedbsd/mac/libexec/getty/main.c#11 integrate .. //depot/projects/trustedbsd/mac/libexec/lukemftpd/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/libexec/named-xfer/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/libexec/rexecd/rexecd.8#3 integrate .. //depot/projects/trustedbsd/mac/libexec/rpc.rstatd/rstat_proc.c#8 integrate .. //depot/projects/trustedbsd/mac/libexec/rpc.rusersd/rusers_proc.c#4 integrate .. //depot/projects/trustedbsd/mac/libexec/rshd/rshd.8#4 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/debug.c#2 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/ia64/reloc.c#10 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/libmap.c#3 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/map_object.c#7 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/rtld.1#9 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/rtld.c#15 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/rtld.h#4 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/rtld_lock.h#2 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/xmalloc.c#2 integrate .. //depot/projects/trustedbsd/mac/libexec/tcpd/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#45 integrate .. //depot/projects/trustedbsd/mac/release/alpha/drivers.conf#13 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/errata/article.sgml#9 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#37 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#58 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/errata/article.sgml#9 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#11 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#21 integrate .. //depot/projects/trustedbsd/mac/release/doc/share/sgml/release.ent#8 integrate .. //depot/projects/trustedbsd/mac/release/i386/drivers.conf#15 integrate .. //depot/projects/trustedbsd/mac/release/pc98/dokern.sh#11 integrate .. //depot/projects/trustedbsd/mac/release/pc98/drivers.conf#11 integrate .. //depot/projects/trustedbsd/mac/release/picobsd/bridge/PICOBSD#4 integrate .. //depot/projects/trustedbsd/mac/release/picobsd/bridge/crunch.conf#6 integrate .. //depot/projects/trustedbsd/mac/sbin/Makefile#18 integrate .. //depot/projects/trustedbsd/mac/sbin/badsect/badsect.8#5 integrate .. //depot/projects/trustedbsd/mac/sbin/bsdlabel/bsdlabel.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/bsdlabel/runtest.sh#2 integrate .. //depot/projects/trustedbsd/mac/sbin/camcontrol/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sbin/ccdconfig/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sbin/ccdconfig/ccdconfig.c#6 integrate .. //depot/projects/trustedbsd/mac/sbin/devfs/devfs.8#4 integrate .. //depot/projects/trustedbsd/mac/sbin/dmesg/dmesg.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/dump/dump.8#14 integrate .. //depot/projects/trustedbsd/mac/sbin/dumpfs/dumpfs.c#12 integrate .. //depot/projects/trustedbsd/mac/sbin/ffsinfo/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_msdosfs/fsck_msdosfs.8#6 integrate .. //depot/projects/trustedbsd/mac/sbin/gbde/gbde.c#8 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.8#2 integrate .. //depot/projects/trustedbsd/mac/sbin/growfs/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sbin/growfs/growfs.8#10 integrate .. //depot/projects/trustedbsd/mac/sbin/init/init.8#7 integrate .. //depot/projects/trustedbsd/mac/sbin/ipf/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfstat/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#21 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.c#9 delete .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#14 integrate .. //depot/projects/trustedbsd/mac/sbin/ipmon/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sbin/ipnat/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sbin/mdconfig/mdconfig.8#7 integrate .. //depot/projects/trustedbsd/mac/sbin/mdconfig/mdconfig.c#10 integrate .. //depot/projects/trustedbsd/mac/sbin/natd/natd.8#8 integrate .. //depot/projects/trustedbsd/mac/sbin/natd/natd.c#6 integrate .. //depot/projects/trustedbsd/mac/sbin/ping/ping.c#17 integrate .. //depot/projects/trustedbsd/mac/sbin/restore/restore.8#8 integrate .. //depot/projects/trustedbsd/mac/sbin/routed/rtquery/rtquery.8#5 integrate .. //depot/projects/trustedbsd/mac/sbin/sunlabel/sunlabel.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/sysctl/sysctl.8#9 integrate .. //depot/projects/trustedbsd/mac/sbin/sysctl/sysctl.c#13 integrate .. //depot/projects/trustedbsd/mac/sbin/tunefs/tunefs.8#15 integrate .. //depot/projects/trustedbsd/mac/sbin/vinum/commands.c#10 integrate .. //depot/projects/trustedbsd/mac/sbin/vinum/v.c#6 integrate .. //depot/projects/trustedbsd/mac/secure/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/secure/lib/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcipher/Makefile#3 delete .. //depot/projects/trustedbsd/mac/secure/lib/libcipher/README#2 delete .. //depot/projects/trustedbsd/mac/secure/lib/libcipher/README.FreeBSD#2 delete .. //depot/projects/trustedbsd/mac/secure/lib/libcipher/cipher.3#2 delete .. //depot/projects/trustedbsd/mac/secure/lib/libcipher/crypt.c#4 delete .. //depot/projects/trustedbsd/mac/secure/lib/libcipher/test/Makefile#2 delete .. //depot/projects/trustedbsd/mac/secure/lib/libcipher/test/README#2 delete .. //depot/projects/trustedbsd/mac/secure/lib/libcipher/test/cert.c#2 delete .. //depot/projects/trustedbsd/mac/secure/lib/libcipher/test/cert.input#2 delete .. //depot/projects/trustedbsd/mac/secure/lib/libcipher/test/speedcrypt.c#2 delete .. //depot/projects/trustedbsd/mac/secure/lib/libcipher/test/speeddes.c#2 delete .. //depot/projects/trustedbsd/mac/secure/lib/libcrypt/blowfish.c#3 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypt/blowfish.h#3 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypt/crypt-blowfish.c#3 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile#16 integrate .. //depot/projects/trustedbsd/mac/secure/usr.bin/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/secure/usr.bin/bdes/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/secure/usr.bin/bdes/bdes.1#3 integrate .. //depot/projects/trustedbsd/mac/secure/usr.bin/bdes/bdes.c#3 integrate .. //depot/projects/trustedbsd/mac/share/colldef/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/share/colldef/bg_BG.CP1251.src#2 integrate .. //depot/projects/trustedbsd/mac/share/colldef/map.CP866#2 integrate .. //depot/projects/trustedbsd/mac/share/colldef/map.KOI8-R#2 integrate .. //depot/projects/trustedbsd/mac/share/colldef/map.KOI8-U#2 integrate .. //depot/projects/trustedbsd/mac/share/colldef/ru_RU.CP1251.src#1 branch .. //depot/projects/trustedbsd/mac/share/colldef/ru_RU.CP866.src#2 integrate .. //depot/projects/trustedbsd/mac/share/colldef/ru_RU.ISO8859-5.src#2 integrate .. //depot/projects/trustedbsd/mac/share/colldef/ru_RU.KOI8-R.src#2 integrate .. //depot/projects/trustedbsd/mac/share/colldef/uk_UA.KOI8-U.src#2 integrate .. //depot/projects/trustedbsd/mac/share/doc/papers/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/papers/timecounter/Makefile#1 branch .. //depot/projects/trustedbsd/mac/share/doc/papers/timecounter/fig1.eps#1 branch .. //depot/projects/trustedbsd/mac/share/doc/papers/timecounter/fig2.eps#1 branch .. //depot/projects/trustedbsd/mac/share/doc/papers/timecounter/fig3.eps#1 branch .. //depot/projects/trustedbsd/mac/share/doc/papers/timecounter/fig4.eps#1 branch .. //depot/projects/trustedbsd/mac/share/doc/papers/timecounter/fig5.eps#1 branch .. //depot/projects/trustedbsd/mac/share/doc/papers/timecounter/gps.ps#1 branch .. //depot/projects/trustedbsd/mac/share/doc/papers/timecounter/intr.ps#1 branch .. //depot/projects/trustedbsd/mac/share/doc/papers/timecounter/timecounter.ms#1 branch .. //depot/projects/trustedbsd/mac/share/doc/papers/timecounter/tmac.usenix#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#30 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/acpi.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ath.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/ath_hal.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/cd.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/en.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/exca.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/fatm.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/gem.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/hatm.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/hme.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/mac.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/mac_biba.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/mac_bsdextended.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/mac_ifoff.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/mac_lomac.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/mac_mls.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/mac_none.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/mac_partition.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/mac_seeotheruids.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/mac_test.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/en.4#3 delete .. //depot/projects/trustedbsd/mac/share/man/man4/matcd.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/miibus.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/natm.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/natmip.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/ng_bridge.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/pccbb.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/pci.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/raid.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/rp.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/sem.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/utopia.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/wi.4#13 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/elf.5#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/make.conf.5#22 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/rc.conf.5#24 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/environ.7#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/hier.7#14 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/maclabel.7#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/ports.7#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/security.7#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man8/yp.8#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/Makefile#29 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/VFS_SET.9#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/VFS_VGET.9#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/VOP_GETEXTATTR.9#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/VOP_LISTEXTATTR.9#1 branch .. //depot/projects/trustedbsd/mac/share/man/man9/VOP_SETEXTATTR.9#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/bus_dma.9#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/devclass.9#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/devclass_find.9#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/extattr.9#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/ifnet.9#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/ktr.9#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/malloc.9#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/mbuf.9#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/namei.9#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/pci.9#1 branch .. //depot/projects/trustedbsd/mac/share/man/man9/rtalloc.9#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/sx.9#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/utopia.9#1 branch .. //depot/projects/trustedbsd/mac/share/mk/bsd.lib.mk#15 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.libnames.mk#14 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.sys.mk#11 integrate .. //depot/projects/trustedbsd/mac/share/mk/sys.mk#8 integrate .. //depot/projects/trustedbsd/mac/share/mklocale/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/share/mklocale/zh_CN.GBK.src#1 branch .. //depot/projects/trustedbsd/mac/share/monetdef/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/share/monetdef/ru_RU.CP1251.src#1 branch .. //depot/projects/trustedbsd/mac/share/msgdef/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/share/msgdef/ru_RU.CP1251.src#1 branch .. //depot/projects/trustedbsd/mac/share/numericdef/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/share/numericdef/ru_RU.CP866.src#2 delete .. //depot/projects/trustedbsd/mac/share/numericdef/ru_RU.ISO8859-5.src#2 delete .. //depot/projects/trustedbsd/mac/share/numericdef/uk_UA.ISO8859-5.src#2 delete .. //depot/projects/trustedbsd/mac/share/syscons/keymaps/INDEX.keymaps#6 integrate .. //depot/projects/trustedbsd/mac/share/syscons/keymaps/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/share/syscons/keymaps/german.iso.acc.kbd#1 branch .. //depot/projects/trustedbsd/mac/share/syscons/keymaps/lat-amer.kbd#2 delete .. //depot/projects/trustedbsd/mac/share/syscons/keymaps/latinamerican.iso.acc.kbd#1 branch .. //depot/projects/trustedbsd/mac/share/syscons/keymaps/latinamerican.kbd#1 branch .. //depot/projects/trustedbsd/mac/share/syscons/keymaps/us.iso.acc.kbd#1 branch .. //depot/projects/trustedbsd/mac/share/termcap/termcap.5#3 integrate .. //depot/projects/trustedbsd/mac/share/timedef/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/share/timedef/ru_RU.CP1251.src#1 branch .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/alpha-gdbstub.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/api_up1000.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/autoconf.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/busdma_machdep.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/busspace.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/clock.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/cpuconf.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/critical.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/db_disasm.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/db_interface.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_1000a.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_2100_a50.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_2100_a500.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_3000_300.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_3000_500.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_axppci_33.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_eb164.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_eb64plus.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_kn20aa.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_kn300.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_kn8ae.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_st550.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_st6600.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dump_machdep.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/elf_machdep.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/fp_emulate.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/genassym.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/ieee_float.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/in_cksum.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/interrupt.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/machdep.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/mem.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/mp_machdep.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/pmap.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/prom.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/promcons.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/sgmap.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/sys_machdep.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/trap.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/vm_machdep.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/conf/GENERIC#23 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/param.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/isa/isa.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/isa/isa_dma.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/isa/mcclock_isa.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_dummy.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_genassym.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_machdep.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_sysvec.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/mcbus/mcbus.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/mcbus/mcmem.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/mcbus/mcpcia.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/imgact_osf1.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_ioctl.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_misc.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_mount.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_signal.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_sysvec.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/pci/apecs.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/pci/apecs_pci.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/pci/bwx.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/pci/cia.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/pci/cia_pci.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/pci/irongate.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/pci/irongate_pci.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/pci/lca.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/pci/lca_pci.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/pci/pcibus.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/pci/swiz.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/pci/t2.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/pci/t2_pci.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/pci/tsunami.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/pci/tsunami_pci.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/dwlpx.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/gbus.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/kftxx.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/mcclock_tlsb.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/tlsb.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/tlsbcpu.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/tlsbmem.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/zs_tlsb.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/mem.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/asm.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/param.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/profile.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/setjmp.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/boot/ficl/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/boot/ficl/loader.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/boot/forth/beastie.4th#2 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/boot0/boot0.s#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/kgzldr/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/pxe.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/kgzldr/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/libpc98/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/pc98/loader/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/sparc64/loader/main.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/cam/cam.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/cam/cam_periph.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/cam/cam_queue.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/cam/cam_sim.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/cam/cam_xpt.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_all.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_cd.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_ch.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_da.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_low.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_low_pisa.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_pass.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_pt.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_sa.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_ses.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_targ_bh.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_target.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_fbsd.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_namecache.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_psdev.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_subr.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_venus.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_vfsops.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_vfsops.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_vnops.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linprocfs/linprocfs.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_file.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_getcwd.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_ioctl.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_ipc.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_mib.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_misc.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_signal.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_socket.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_stats.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_sysctl.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_uid16.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_util.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/compat/pecoff/imgact_pecoff.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/imgact_svr4.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_fcntl.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_filio.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_ioctl.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_ipc.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_misc.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_resource.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_signal.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_socket.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_sockio.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_stat.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_stream.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_sysvec.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_termios.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_ttold.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#41 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#81 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.sparc64#21 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kern.post.mk#22 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kern.pre.mk#16 integrate .. //depot/projects/trustedbsd/mac/sys/conf/ldscript.sparc64#2 integrate .. //depot/projects/trustedbsd/mac/sys/conf/majors#22 integrate .. //depot/projects/trustedbsd/mac/sys/conf/newvers.sh#6 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#50 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.alpha#9 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.amd64#3 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.i386#15 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.ia64#10 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.pc98#16 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.sparc64#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/hwregs.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/crypto/blowfish/bf_enc.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/crypto/blowfish/bf_skey.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/crypto/cast128/cast128.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/crypto/md5.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/crypto/rc4/rc4.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/crypto/rijndael/rijndael-alg-fst.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/crypto/rijndael/rijndael-api-fst.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/crypto/sha1.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/crypto/sha2/sha2.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_access.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_break.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_command.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_elf.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_examine.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_expr.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_input.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_kld.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_lex.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_output.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_print.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_ps.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_run.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_sym.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_sysctl.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_trap.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_variables.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_watch.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_write_cmd.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aac/aac.c#20 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 25 05:15:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3F0D37B401; Wed, 25 Jun 2003 05:15:41 -0700 (PDT) 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 3FD4F37B404 for ; Wed, 25 Jun 2003 05:15:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B43A43FEC for ; Wed, 25 Jun 2003 05:15:40 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5PCFe0U061435 for ; Wed, 25 Jun 2003 05:15:40 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5PCFe46061432 for perforce@freebsd.org; Wed, 25 Jun 2003 05:15:40 -0700 (PDT) Date: Wed, 25 Jun 2003 05:15:40 -0700 (PDT) Message-Id: <200306251215.h5PCFe46061432@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 33633 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, 25 Jun 2003 12:15:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=33633 Change 33633 by cvance@cvance_korben on 2003/06/25 05:14:48 Remove outdated todo file, update READM Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/README#3 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/TODO#2 delete Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/README#3 (text+ko) ==== @@ -20,6 +20,3 @@ Or send email to: cboss@nailabs.com - -For more information on the current status of SEBSD, please refer to -the STATUS file in this directory. From owner-p4-projects@FreeBSD.ORG Wed Jun 25 08:54:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A246937B404; Wed, 25 Jun 2003 08:54:58 -0700 (PDT) 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 52A0E37B401 for ; Wed, 25 Jun 2003 08:54:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F1B5043FEC for ; Wed, 25 Jun 2003 08:54:57 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5PFsv0U035583 for ; Wed, 25 Jun 2003 08:54:57 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5PFsvx8035580 for perforce@freebsd.org; Wed, 25 Jun 2003 08:54:57 -0700 (PDT) Date: Wed, 25 Jun 2003 08:54:57 -0700 (PDT) Message-Id: <200306251554.h5PFsvx8035580@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 33644 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, 25 Jun 2003 15:54:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=33644 Change 33644 by cvance@cvance_release on 2003/06/25 08:54:03 Remove debug statement (overkill for initial labeling of a fs) Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#7 (text+ko) ==== @@ -433,9 +433,11 @@ vsec->sid = SECINITSID_UNLABELED; /* Use the default label */ struct vattr va; + /* (void)VOP_GETATTR(vp, &va, curthread->td_ucred, curthread); printf("sebsd_update_vnode_from_extattr: no label for " "inode=%ld, fsid=%d\n", va.va_fileid, va.va_fsid); + */ goto dosclass; } if (error) { From owner-p4-projects@FreeBSD.ORG Wed Jun 25 14:19:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46B3437B404; Wed, 25 Jun 2003 14:19:51 -0700 (PDT) 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 D0AF137B401 for ; Wed, 25 Jun 2003 14:19:50 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C213744013 for ; Wed, 25 Jun 2003 14:19:48 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5PLJm0U041737 for ; Wed, 25 Jun 2003 14:19:48 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5PLJdGP041734 for perforce@freebsd.org; Wed, 25 Jun 2003 14:19:39 -0700 (PDT) Date: Wed, 25 Jun 2003 14:19:39 -0700 (PDT) Message-Id: <200306252119.h5PLJdGP041734@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 33658 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, 25 Jun 2003 21:19:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=33658 Change 33658 by peter@peter_daintree on 2003/06/25 14:18:58 IFC @33653 Affected files ... .. //depot/projects/hammer/MAINTAINERS#9 integrate .. //depot/projects/hammer/Makefile#9 integrate .. //depot/projects/hammer/Makefile.inc1#19 integrate .. //depot/projects/hammer/UPDATING#12 integrate .. //depot/projects/hammer/bin/Makefile.inc#2 integrate .. //depot/projects/hammer/bin/cp/cp.1#4 integrate .. //depot/projects/hammer/bin/cp/utils.c#4 integrate .. //depot/projects/hammer/bin/csh/Makefile#3 integrate .. //depot/projects/hammer/bin/date/Makefile#2 integrate .. //depot/projects/hammer/bin/dd/Makefile#3 integrate .. //depot/projects/hammer/bin/df/Makefile#2 integrate .. //depot/projects/hammer/bin/ed/Makefile#4 integrate .. //depot/projects/hammer/bin/expr/Makefile#2 integrate .. //depot/projects/hammer/bin/kenv/Makefile#3 integrate .. //depot/projects/hammer/bin/ls/Makefile#4 integrate .. //depot/projects/hammer/bin/pax/Makefile#3 integrate .. //depot/projects/hammer/bin/ps/Makefile#4 integrate .. //depot/projects/hammer/bin/ps/ps.1#7 integrate .. //depot/projects/hammer/bin/ps/ps.c#5 integrate .. //depot/projects/hammer/contrib/bind/CHANGES#4 integrate .. //depot/projects/hammer/contrib/bind/FREEBSD-Upgrade#2 integrate .. //depot/projects/hammer/contrib/bind/README#3 integrate .. //depot/projects/hammer/contrib/bind/Version#3 integrate .. //depot/projects/hammer/contrib/bind/bin/dig/dig.c#2 integrate .. //depot/projects/hammer/contrib/bind/bin/dnsquery/dnsquery.c#2 integrate .. //depot/projects/hammer/contrib/bind/bin/host/host.c#2 integrate .. //depot/projects/hammer/contrib/bind/bin/named-xfer/named-xfer.c#2 integrate .. //depot/projects/hammer/contrib/bind/bin/named/db_defs.h#4 integrate .. //depot/projects/hammer/contrib/bind/bin/named/db_ixfr.c#2 integrate .. //depot/projects/hammer/contrib/bind/bin/named/db_load.c#2 integrate .. //depot/projects/hammer/contrib/bind/bin/named/db_sec.c#4 integrate .. //depot/projects/hammer/contrib/bind/bin/named/ns_config.c#2 integrate .. //depot/projects/hammer/contrib/bind/bin/named/ns_ctl.c#2 integrate .. //depot/projects/hammer/contrib/bind/bin/named/ns_defs.h#4 integrate .. //depot/projects/hammer/contrib/bind/bin/named/ns_forw.c#2 integrate .. //depot/projects/hammer/contrib/bind/bin/named/ns_func.h#2 integrate .. //depot/projects/hammer/contrib/bind/bin/named/ns_glob.h#2 integrate .. //depot/projects/hammer/contrib/bind/bin/named/ns_init.c#2 integrate .. //depot/projects/hammer/contrib/bind/bin/named/ns_ixfr.c#2 integrate .. //depot/projects/hammer/contrib/bind/bin/named/ns_lexer.c#2 integrate .. //depot/projects/hammer/contrib/bind/bin/named/ns_main.c#2 integrate .. //depot/projects/hammer/contrib/bind/bin/named/ns_maint.c#2 integrate .. //depot/projects/hammer/contrib/bind/bin/named/ns_ncache.c#4 integrate .. //depot/projects/hammer/contrib/bind/bin/named/ns_parser.y#2 integrate .. //depot/projects/hammer/contrib/bind/bin/named/ns_req.c#4 integrate .. //depot/projects/hammer/contrib/bind/bin/named/ns_resp.c#4 integrate .. //depot/projects/hammer/contrib/bind/bin/named/ns_update.c#2 integrate .. //depot/projects/hammer/contrib/bind/bin/ndc/ndc.c#2 integrate .. //depot/projects/hammer/contrib/bind/bin/nslookup/getinfo.c#2 integrate .. //depot/projects/hammer/contrib/bind/bin/nslookup/main.c#2 integrate .. //depot/projects/hammer/contrib/bind/bin/nslookup/send.c#2 integrate .. //depot/projects/hammer/contrib/bind/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/hammer/contrib/bind/doc/html/options.html#3 integrate .. //depot/projects/hammer/contrib/bind/doc/man/dig.1#2 integrate .. //depot/projects/hammer/contrib/bind/doc/man/named-xfer.8#2 integrate .. //depot/projects/hammer/contrib/bind/doc/man/named.8#2 integrate .. //depot/projects/hammer/contrib/bind/doc/man/named.conf.5#3 integrate .. //depot/projects/hammer/contrib/bind/doc/man/resolver.3#3 integrate .. //depot/projects/hammer/contrib/bind/include/arpa/nameser.h#2 integrate .. //depot/projects/hammer/contrib/bind/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/hammer/contrib/bind/include/hesiod.h#2 integrate .. //depot/projects/hammer/contrib/bind/include/irp.h#2 integrate .. //depot/projects/hammer/contrib/bind/include/irs.h#2 integrate .. //depot/projects/hammer/contrib/bind/include/isc/ctl.h#2 integrate .. //depot/projects/hammer/contrib/bind/include/isc/dst.h#2 integrate .. //depot/projects/hammer/contrib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/hammer/contrib/bind/include/isc/irpmarshall.h#2 integrate .. //depot/projects/hammer/contrib/bind/include/isc/logging.h#2 integrate .. //depot/projects/hammer/contrib/bind/include/isc/misc.h#2 integrate .. //depot/projects/hammer/contrib/bind/include/isc/tree.h#2 integrate .. //depot/projects/hammer/contrib/bind/include/netgroup.h#2 integrate .. //depot/projects/hammer/contrib/bind/include/resolv.h#2 integrate .. //depot/projects/hammer/contrib/bind/lib/dst/bsafe_link.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/dst/cylink_link.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/dst/dst_api.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/dst/hmac_link.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/irs/dns_gr.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/irs/dns_ho.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/irs/dns_nw.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/irs/gen_gr.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/irs/getaddrinfo.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/irs/gethostent.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/irs/getnameinfo.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/irs/getnetgrent.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/irs/getnetgrent_r.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/irs/hesiod.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/irs/irp_p.h#2 integrate .. //depot/projects/hammer/contrib/bind/lib/irs/irs_data.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/irs/nis_gr.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/irs/nis_ho.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/isc/ctl_clnt.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/isc/ctl_srvr.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/isc/ev_files.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/isc/ev_timers.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/isc/ev_waits.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/isc/eventlib.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/isc/eventlib_p.h#2 integrate .. //depot/projects/hammer/contrib/bind/lib/isc/logging.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/nameser/ns_name.c#4 integrate .. //depot/projects/hammer/contrib/bind/lib/nameser/ns_parse.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/nameser/ns_print.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/nameser/ns_samedomain.c#4 integrate .. //depot/projects/hammer/contrib/bind/lib/nameser/ns_sign.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/resolv/res_comp.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/resolv/res_debug.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/resolv/res_findzonecut.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/resolv/res_init.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/resolv/res_mkquery.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/resolv/res_mkupdate.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/resolv/res_private.h#2 integrate .. //depot/projects/hammer/contrib/bind/lib/resolv/res_query.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/resolv/res_send.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/resolv/res_update.c#2 integrate .. //depot/projects/hammer/contrib/bind/port/freebsd/bin/probe_ipv6#2 integrate .. //depot/projects/hammer/contrib/bind/port/freebsd/include/port_after.h#3 integrate .. //depot/projects/hammer/contrib/gcc/gcc.1#3 integrate .. //depot/projects/hammer/contrib/gdtoa/gdtoaimp.h#5 integrate .. //depot/projects/hammer/contrib/groff/src/roff/nroff/nroff.sh#4 integrate .. //depot/projects/hammer/contrib/groff/tmac/X.tmac#4 integrate .. //depot/projects/hammer/contrib/groff/tmac/groff_mdoc.man#4 integrate .. //depot/projects/hammer/contrib/lukemftp/FreeBSD-patchset#1 branch .. //depot/projects/hammer/contrib/lukemftp/diffout#1 branch .. //depot/projects/hammer/contrib/lukemftp/src/Makefile#1 branch .. //depot/projects/hammer/contrib/lukemftp/src/cmds.c#2 integrate .. //depot/projects/hammer/contrib/lukemftp/src/cmdtab.c#2 integrate .. //depot/projects/hammer/contrib/lukemftp/src/complete.c#2 integrate .. //depot/projects/hammer/contrib/lukemftp/src/domacro.c#2 integrate .. //depot/projects/hammer/contrib/lukemftp/src/extern.h#2 integrate .. //depot/projects/hammer/contrib/lukemftp/src/fetch.c#2 integrate .. //depot/projects/hammer/contrib/lukemftp/src/ftp.1#2 integrate .. //depot/projects/hammer/contrib/lukemftp/src/ftp.c#2 integrate .. //depot/projects/hammer/contrib/lukemftp/src/ftp.cat1#2 delete .. //depot/projects/hammer/contrib/lukemftp/src/ftp_var.h#2 integrate .. //depot/projects/hammer/contrib/lukemftp/src/main.c#2 integrate .. //depot/projects/hammer/contrib/lukemftp/src/progressbar.c#1 branch .. //depot/projects/hammer/contrib/lukemftp/src/progressbar.h#1 branch .. //depot/projects/hammer/contrib/lukemftp/src/ruserpass.c#2 integrate .. //depot/projects/hammer/contrib/lukemftp/src/util.c#2 integrate .. //depot/projects/hammer/contrib/lukemftp/src/version.h#2 integrate .. //depot/projects/hammer/contrib/nvi/catalog/ru_RU.KOI8-R#2 integrate .. //depot/projects/hammer/contrib/nvi/catalog/ru_RU.KOI8-R.base#2 integrate .. //depot/projects/hammer/contrib/nvi/catalog/ru_RU.KOI8-R.owner#2 integrate .. //depot/projects/hammer/contrib/nvi/catalog/ru_SU.KOI8-R#3 delete .. //depot/projects/hammer/contrib/nvi/catalog/ru_SU.KOI8-R.base#3 delete .. //depot/projects/hammer/contrib/nvi/catalog/ru_SU.KOI8-R.check#2 delete .. //depot/projects/hammer/contrib/nvi/catalog/ru_SU.KOI8-R.owner#2 delete .. //depot/projects/hammer/contrib/openpam/lib/openpam_load.c#5 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_end.c#5 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_getenvlist.c#5 integrate .. //depot/projects/hammer/contrib/sendmail/src/conf.c#5 integrate .. //depot/projects/hammer/contrib/sendmail/src/headers.c#5 integrate .. //depot/projects/hammer/contrib/texinfo/AUTHORS#3 integrate .. //depot/projects/hammer/contrib/texinfo/COPYING#3 integrate .. //depot/projects/hammer/contrib/texinfo/COPYING.DOC#3 delete .. //depot/projects/hammer/contrib/texinfo/ChangeLog#3 integrate .. //depot/projects/hammer/contrib/texinfo/FREEBSD-upgrade#3 integrate .. //depot/projects/hammer/contrib/texinfo/NEWS#3 integrate .. //depot/projects/hammer/contrib/texinfo/TODO#3 integrate .. //depot/projects/hammer/contrib/texinfo/config.h#3 integrate .. //depot/projects/hammer/contrib/texinfo/config.h.in#3 integrate .. //depot/projects/hammer/contrib/texinfo/doc/fdl.texi#3 integrate .. //depot/projects/hammer/contrib/texinfo/doc/info-stnd.texi#3 integrate .. //depot/projects/hammer/contrib/texinfo/doc/info.1#3 integrate .. //depot/projects/hammer/contrib/texinfo/doc/install-info.1#3 integrate .. //depot/projects/hammer/contrib/texinfo/doc/makeinfo.1#3 integrate .. //depot/projects/hammer/contrib/texinfo/doc/texindex.1#3 integrate .. //depot/projects/hammer/contrib/texinfo/doc/texinfo.txi#3 integrate .. //depot/projects/hammer/contrib/texinfo/doc/version-stnd.texi#3 integrate .. //depot/projects/hammer/contrib/texinfo/doc/version.texi#3 integrate .. //depot/projects/hammer/contrib/texinfo/info/display.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/info/indices.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/info/info-utils.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/info/info-utils.h#3 integrate .. //depot/projects/hammer/contrib/texinfo/info/info.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/info/info.h#3 integrate .. //depot/projects/hammer/contrib/texinfo/info/infodoc.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/info/infokey.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/info/infomap.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/info/man.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/info/nodemenu.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/info/nodes.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/info/session.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/info/signals.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/info/window.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/lib/system.h#3 integrate .. //depot/projects/hammer/contrib/texinfo/lib/xalloc.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/lib/xexit.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/cmds.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/defun.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/files.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/files.h#3 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/html.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/index.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/insertion.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/lang.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/lang.h#3 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/macro.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/makeinfo.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/makeinfo.h#3 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/node.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/sectioning.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/xml.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/util/install-info.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/util/texindex.c#3 integrate .. //depot/projects/hammer/crypto/openssh/packet.c#4 integrate .. //depot/projects/hammer/etc/Makefile#13 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#12 integrate .. //depot/projects/hammer/etc/inetd.conf#4 integrate .. //depot/projects/hammer/etc/locale.alias#3 delete .. //depot/projects/hammer/etc/locale.deprecated#2 delete .. //depot/projects/hammer/etc/mtree/BSD.include.dist#6 integrate .. //depot/projects/hammer/etc/mtree/BSD.local.dist#7 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#7 integrate .. //depot/projects/hammer/etc/network.subr#3 integrate .. //depot/projects/hammer/etc/nls.alias#2 integrate .. //depot/projects/hammer/etc/pam.d/Makefile#4 integrate .. //depot/projects/hammer/etc/pam.d/login#4 integrate .. //depot/projects/hammer/etc/pam.d/su#5 integrate .. //depot/projects/hammer/etc/pam.d/system#1 branch .. //depot/projects/hammer/etc/pccard_ether#5 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#9 integrate .. //depot/projects/hammer/etc/rc.d/apm#4 integrate .. //depot/projects/hammer/etc/rc.d/apmd#6 integrate .. //depot/projects/hammer/etc/rc.d/devdb#3 delete .. //depot/projects/hammer/etc/rc.d/dhclient#3 integrate .. //depot/projects/hammer/etc/rc.d/gbde#1 branch .. //depot/projects/hammer/etc/rc.d/netoptions#1 branch .. //depot/projects/hammer/etc/rc.d/network1#6 integrate .. //depot/projects/hammer/etc/rc.d/routing#1 branch .. //depot/projects/hammer/etc/rc.subr#7 integrate .. //depot/projects/hammer/games/fortune/datfiles/Makefile#3 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#9 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes2-o#4 integrate .. //depot/projects/hammer/games/grdc/grdc.c#3 integrate .. //depot/projects/hammer/gnu/lib/libdialog/dialog.3#2 integrate .. //depot/projects/hammer/gnu/lib/libgcc/Makefile#7 integrate .. //depot/projects/hammer/gnu/lib/libobjc/Makefile#5 integrate .. //depot/projects/hammer/gnu/lib/libstdc++/Makefile#12 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/Makefile#5 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/freebsd-native.h#3 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cpp/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/f77/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#7 integrate .. //depot/projects/hammer/gnu/usr.bin/send-pr/categories#2 integrate .. //depot/projects/hammer/gnu/usr.bin/send-pr/send-pr.1#4 integrate .. //depot/projects/hammer/include/Makefile#11 integrate .. //depot/projects/hammer/include/bitstring.h#2 integrate .. //depot/projects/hammer/include/paths.h#4 integrate .. //depot/projects/hammer/include/rpc/svc.h#3 integrate .. //depot/projects/hammer/include/stdlib.h#8 integrate .. //depot/projects/hammer/kerberos5/Makefile.inc#5 integrate .. //depot/projects/hammer/kerberos5/lib/libhdb/Makefile#5 integrate .. //depot/projects/hammer/kerberos5/libexec/hpropd/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/libexec/ipropd-master/Makefile#4 integrate .. //depot/projects/hammer/kerberos5/libexec/ipropd-slave/Makefile#4 integrate .. //depot/projects/hammer/kerberos5/libexec/kadmind/Makefile#2 integrate .. //depot/projects/hammer/kerberos5/libexec/kdc/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/libexec/kpasswdd/Makefile#2 integrate .. //depot/projects/hammer/kerberos5/usr.bin/kadmin/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/usr.sbin/kstash/Makefile#2 integrate .. //depot/projects/hammer/lib/libalias/alias.c#2 integrate .. //depot/projects/hammer/lib/libalias/libalias.3#3 integrate .. //depot/projects/hammer/lib/libbz2/Makefile#3 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/alloca.S#12 delete .. //depot/projects/hammer/lib/libc/amd64/gen/ldexp.c#6 integrate .. //depot/projects/hammer/lib/libc/compat-43/sigpause.2#3 integrate .. //depot/projects/hammer/lib/libc/gdtoa/glue.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/devname.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/devname.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/exec.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/getpwent.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/popen.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/sigsetops.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/statvfs.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/ttyname.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/tzset.3#2 integrate .. //depot/projects/hammer/lib/libc/i386/gen/alloca.S#2 integrate .. //depot/projects/hammer/lib/libc/i386/sys/i386_get_ldt.2#3 integrate .. //depot/projects/hammer/lib/libc/ia64/gen/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/libc/ia64/gen/signalcontext.c#1 branch .. //depot/projects/hammer/lib/libc/locale/frune.c#3 integrate .. //depot/projects/hammer/lib/libc/locale/ldpart.c#3 integrate .. //depot/projects/hammer/lib/libc/locale/ldpart.h#2 integrate .. //depot/projects/hammer/lib/libc/locale/lmessages.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/lmonetary.c#3 integrate .. //depot/projects/hammer/lib/libc/locale/lnumeric.c#3 integrate .. //depot/projects/hammer/lib/libc/locale/mbrune.c#3 integrate .. //depot/projects/hammer/lib/libc/locale/nl_langinfo.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/setinvalidrune.c#3 integrate .. //depot/projects/hammer/lib/libc/locale/utf2.c#2 integrate .. //depot/projects/hammer/lib/libc/net/gethostbyname.3#3 integrate .. //depot/projects/hammer/lib/libc/net/gethostnamadr.c#3 integrate .. //depot/projects/hammer/lib/libc/rpc/svc_vc.c#5 integrate .. //depot/projects/hammer/lib/libc/stdio/fflush.3#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/alloca.3#2 integrate .. //depot/projects/hammer/lib/libc/stdtime/timelocal.c#2 integrate .. //depot/projects/hammer/lib/libc/sys/close.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/getfsstat.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/getsockname.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/kse.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/ntp_adjtime.2#2 integrate .. //depot/projects/hammer/lib/libc/sys/ntp_gettime.2#2 integrate .. //depot/projects/hammer/lib/libc/sys/sched_setparam.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/sched_setscheduler.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/sigpending.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/sigprocmask.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/sigsuspend.2#3 integrate .. //depot/projects/hammer/lib/libc_r/man/sem_post.3#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_close.c#4 integrate .. //depot/projects/hammer/lib/libcam/Makefile#2 integrate .. //depot/projects/hammer/lib/libcompat/regexp/regexp.3#2 integrate .. //depot/projects/hammer/lib/libcrypt/crypt.3#4 integrate .. //depot/projects/hammer/lib/libdevstat/Makefile#4 integrate .. //depot/projects/hammer/lib/libdisk/disk.c#13 integrate .. //depot/projects/hammer/lib/libfetch/fetch.3#5 integrate .. //depot/projects/hammer/lib/libform/Makefile#2 integrate .. //depot/projects/hammer/lib/libftpio/ftpio.3#3 integrate .. //depot/projects/hammer/lib/libgeom/libgeom.3#2 integrate .. //depot/projects/hammer/lib/libipx/ipx.3#2 integrate .. //depot/projects/hammer/lib/libisc/Makefile#3 integrate .. //depot/projects/hammer/lib/libkvm/kvm_proc.c#12 integrate .. //depot/projects/hammer/lib/libmd/md2c.c#2 integrate .. //depot/projects/hammer/lib/libmd/md4c.c#2 integrate .. //depot/projects/hammer/lib/libmd/md5c.c#2 integrate .. //depot/projects/hammer/lib/libmenu/Makefile#2 integrate .. //depot/projects/hammer/lib/libncurses/Makefile#11 integrate .. //depot/projects/hammer/lib/libnetgraph/netgraph.3#3 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_unix/pam_unix.c#5 integrate .. //depot/projects/hammer/lib/libpanel/Makefile#2 integrate .. //depot/projects/hammer/lib/libpthread/Makefile#8 integrate .. //depot/projects/hammer/lib/libpthread/arch/alpha/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libpthread/arch/alpha/alpha/_atomic_lock.S#2 delete .. //depot/projects/hammer/lib/libpthread/arch/i386/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/ksd.c#3 integrate .. //depot/projects/hammer/lib/libpthread/arch/i386/include/ksd.h#3 integrate .. //depot/projects/hammer/lib/libpthread/arch/i386/include/pthread_md.h#3 integrate .. //depot/projects/hammer/lib/libpthread/arch/ia64/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libpthread/arch/ia64/ia64/_atomic_lock.S#2 delete .. //depot/projects/hammer/lib/libpthread/arch/ia64/include/atomic_ops.h#1 branch .. //depot/projects/hammer/lib/libpthread/arch/ia64/include/ksd.h#1 branch .. //depot/projects/hammer/lib/libpthread/arch/ia64/include/pthread_md.h#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_attr.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_cancel.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_cleanup_pop.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_cleanup_push.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_cond_broadcast.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_cond_destroy.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_cond_init.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_cond_signal.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_cond_timedwait.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_cond_wait.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_condattr.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_create.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_detach.3#2 integrate .. //depot/projects/hammer/lib/libpthread/support/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libpthread/support/thr_support.c#2 integrate .. //depot/projects/hammer/lib/libpthread/sys/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#13 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#11 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#11 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigsuspend.c#5 integrate .. //depot/projects/hammer/lib/libradius/radlib.h#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_printf.c#3 integrate .. //depot/projects/hammer/lib/libufs/Makefile#4 integrate .. //depot/projects/hammer/lib/libufs/block.c#5 integrate .. //depot/projects/hammer/lib/libufs/bread.3#1 branch .. //depot/projects/hammer/lib/libufs/cgread.3#1 branch .. //depot/projects/hammer/lib/libufs/cgroup.c#2 integrate .. //depot/projects/hammer/lib/libufs/getino.3#1 branch .. //depot/projects/hammer/lib/libufs/inode.c#3 integrate .. //depot/projects/hammer/lib/libufs/libufs.3#1 branch .. //depot/projects/hammer/lib/libufs/libufs.h#5 integrate .. //depot/projects/hammer/lib/libufs/sblock.c#4 integrate .. //depot/projects/hammer/lib/libufs/sbread.3#1 branch .. //depot/projects/hammer/lib/libufs/type.c#6 integrate .. //depot/projects/hammer/lib/libufs/ufs_disk_close.3#1 branch .. //depot/projects/hammer/lib/libutil/auth.c#2 integrate .. //depot/projects/hammer/lib/libutil/login_auth.c#2 integrate .. //depot/projects/hammer/lib/libutil/login_cap.c#3 integrate .. //depot/projects/hammer/lib/libutil/login_class.c#4 integrate .. //depot/projects/hammer/lib/libutil/login_ok.c#2 integrate .. //depot/projects/hammer/lib/libutil/login_times.c#2 integrate .. //depot/projects/hammer/lib/libutil/login_tty.c#2 integrate .. //depot/projects/hammer/lib/libutil/logout.c#3 integrate .. //depot/projects/hammer/lib/libutil/property.c#4 integrate .. //depot/projects/hammer/lib/libutil/pty.c#2 integrate .. //depot/projects/hammer/lib/libutil/pw_util.c#6 integrate .. //depot/projects/hammer/lib/libutil/realhostname.c#2 integrate .. //depot/projects/hammer/lib/libutil/uucplock.c#2 integrate .. //depot/projects/hammer/lib/libxpg4/fakelib.c#2 integrate .. //depot/projects/hammer/lib/libypclnt/ypclnt_passwd.c#3 integrate .. //depot/projects/hammer/libexec/bootpd/bootpd.c#3 integrate .. //depot/projects/hammer/libexec/ftpd/ftpcmd.y#5 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.8#6 integrate .. //depot/projects/hammer/libexec/getty/gettytab.5#4 integrate .. //depot/projects/hammer/libexec/getty/gettytab.h#3 integrate .. //depot/projects/hammer/libexec/getty/init.c#3 integrate .. //depot/projects/hammer/libexec/getty/main.c#3 integrate .. //depot/projects/hammer/libexec/lukemftpd/Makefile#6 integrate .. //depot/projects/hammer/libexec/named-xfer/Makefile#2 integrate .. //depot/projects/hammer/libexec/rexecd/rexecd.8#2 integrate .. //depot/projects/hammer/libexec/rshd/rshd.8#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/debug.c#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/ia64/reloc.c#6 integrate .. //depot/projects/hammer/libexec/rtld-elf/libmap.c#8 integrate .. //depot/projects/hammer/libexec/rtld-elf/map_object.c#7 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.1#7 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#10 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.h#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld_lock.h#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/xmalloc.c#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/errata/article.sgml#6 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#25 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#30 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/errata/article.sgml#6 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#7 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#7 integrate .. //depot/projects/hammer/release/doc/share/sgml/release.ent#5 integrate .. //depot/projects/hammer/release/pc98/dokern.sh#10 integrate .. //depot/projects/hammer/release/picobsd/bridge/PICOBSD#2 integrate .. //depot/projects/hammer/release/picobsd/bridge/crunch.conf#3 integrate .. //depot/projects/hammer/sbin/Makefile#12 integrate .. //depot/projects/hammer/sbin/badsect/badsect.8#3 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#10 integrate .. //depot/projects/hammer/sbin/bsdlabel/runtest.sh#4 integrate .. //depot/projects/hammer/sbin/camcontrol/Makefile#4 integrate .. //depot/projects/hammer/sbin/ccdconfig/ccdconfig.c#5 integrate .. //depot/projects/hammer/sbin/devfs/devfs.8#4 integrate .. //depot/projects/hammer/sbin/dmesg/dmesg.c#4 integrate .. //depot/projects/hammer/sbin/dump/dump.8#5 integrate .. //depot/projects/hammer/sbin/dumpfs/dumpfs.c#7 integrate .. //depot/projects/hammer/sbin/ffsinfo/Makefile#2 integrate .. //depot/projects/hammer/sbin/fsck_msdosfs/fsck_msdosfs.8#3 integrate .. //depot/projects/hammer/sbin/growfs/Makefile#2 integrate .. //depot/projects/hammer/sbin/growfs/growfs.8#4 integrate .. //depot/projects/hammer/sbin/ifconfig/ifmedia.c#4 integrate .. //depot/projects/hammer/sbin/init/init.8#5 integrate .. //depot/projects/hammer/sbin/ipf/Makefile#2 integrate .. //depot/projects/hammer/sbin/ipfstat/Makefile#2 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#8 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.c#4 delete .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#9 integrate .. //depot/projects/hammer/sbin/ipmon/Makefile#3 integrate .. //depot/projects/hammer/sbin/ipnat/Makefile#2 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.8#6 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#7 integrate .. //depot/projects/hammer/sbin/natd/natd.8#4 integrate .. //depot/projects/hammer/sbin/natd/natd.c#3 integrate .. //depot/projects/hammer/sbin/ping/ping.8#5 integrate .. //depot/projects/hammer/sbin/restore/restore.8#5 integrate .. //depot/projects/hammer/sbin/routed/rtquery/rtquery.8#4 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.8#3 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.c#6 integrate .. //depot/projects/hammer/sbin/tunefs/tunefs.8#5 integrate .. //depot/projects/hammer/sbin/vinum/commands.c#8 integrate .. //depot/projects/hammer/sbin/vinum/v.c#5 integrate .. //depot/projects/hammer/secure/usr.bin/Makefile#5 integrate .. //depot/projects/hammer/share/colldef/Makefile#5 integrate .. //depot/projects/hammer/share/colldef/bg_BG.CP1251.src#2 integrate .. //depot/projects/hammer/share/colldef/map.CP866#2 integrate .. //depot/projects/hammer/share/colldef/map.KOI8-R#2 integrate .. //depot/projects/hammer/share/colldef/map.KOI8-U#2 integrate .. //depot/projects/hammer/share/colldef/ru_RU.CP1251.src#1 branch .. //depot/projects/hammer/share/colldef/ru_RU.CP866.src#2 integrate .. //depot/projects/hammer/share/colldef/ru_RU.ISO8859-5.src#2 integrate .. //depot/projects/hammer/share/colldef/ru_RU.KOI8-R.src#2 integrate .. //depot/projects/hammer/share/colldef/uk_UA.KOI8-U.src#2 integrate .. //depot/projects/hammer/share/doc/papers/Makefile#2 integrate .. //depot/projects/hammer/share/doc/papers/timecounter/Makefile#1 branch .. //depot/projects/hammer/share/doc/papers/timecounter/fig1.eps#1 branch .. //depot/projects/hammer/share/doc/papers/timecounter/fig2.eps#1 branch .. //depot/projects/hammer/share/doc/papers/timecounter/fig3.eps#1 branch .. //depot/projects/hammer/share/doc/papers/timecounter/fig4.eps#1 branch .. //depot/projects/hammer/share/doc/papers/timecounter/fig5.eps#1 branch .. //depot/projects/hammer/share/doc/papers/timecounter/gps.ps#1 branch .. //depot/projects/hammer/share/doc/papers/timecounter/intr.ps#1 branch .. //depot/projects/hammer/share/doc/papers/timecounter/timecounter.ms#1 branch .. //depot/projects/hammer/share/doc/papers/timecounter/tmac.usenix#1 branch .. //depot/projects/hammer/share/man/man4/Makefile#15 integrate .. //depot/projects/hammer/share/man/man4/ath.4#1 branch .. //depot/projects/hammer/share/man/man4/ath_hal.4#1 branch .. //depot/projects/hammer/share/man/man4/en.4#3 integrate .. //depot/projects/hammer/share/man/man4/exca.4#2 integrate .. //depot/projects/hammer/share/man/man4/fatm.4#1 branch .. //depot/projects/hammer/share/man/man4/gem.4#1 branch .. //depot/projects/hammer/share/man/man4/hatm.4#1 branch .. //depot/projects/hammer/share/man/man4/hme.4#1 branch .. //depot/projects/hammer/share/man/man4/mac_lomac.4#5 integrate .. //depot/projects/hammer/share/man/man4/mac_seeotheruids.4#5 integrate .. //depot/projects/hammer/share/man/man4/mac_test.4#5 integrate .. //depot/projects/hammer/share/man/man4/matcd.4#1 branch .. //depot/projects/hammer/share/man/man4/miibus.4#2 integrate .. //depot/projects/hammer/share/man/man4/natm.4#2 integrate .. //depot/projects/hammer/share/man/man4/natmip.4#1 branch .. //depot/projects/hammer/share/man/man4/ng_atm.4#1 branch .. //depot/projects/hammer/share/man/man4/ng_bridge.4#2 integrate .. //depot/projects/hammer/share/man/man4/pccbb.4#3 integrate .. //depot/projects/hammer/share/man/man4/pci.4#2 integrate .. //depot/projects/hammer/share/man/man4/rp.4#2 integrate .. //depot/projects/hammer/share/man/man4/utopia.4#1 branch .. //depot/projects/hammer/share/man/man4/wi.4#9 integrate .. //depot/projects/hammer/share/man/man5/elf.5#3 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#10 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#13 integrate .. //depot/projects/hammer/share/man/man7/environ.7#3 integrate .. //depot/projects/hammer/share/man/man7/hier.7#5 integrate .. //depot/projects/hammer/share/man/man7/ports.7#4 integrate .. //depot/projects/hammer/share/man/man7/security.7#3 integrate .. //depot/projects/hammer/share/man/man8/yp.8#4 integrate .. //depot/projects/hammer/share/man/man9/Makefile#13 integrate .. //depot/projects/hammer/share/man/man9/VOP_GETEXTATTR.9#6 integrate .. //depot/projects/hammer/share/man/man9/VOP_LISTEXTATTR.9#1 branch .. //depot/projects/hammer/share/man/man9/VOP_SETEXTATTR.9#4 integrate .. //depot/projects/hammer/share/man/man9/bus_dma.9#2 integrate .. //depot/projects/hammer/share/man/man9/extattr.9#4 integrate .. //depot/projects/hammer/share/man/man9/ifnet.9#6 integrate .. //depot/projects/hammer/share/man/man9/malloc.9#6 integrate .. //depot/projects/hammer/share/man/man9/mbuf.9#7 integrate .. //depot/projects/hammer/share/man/man9/pci.9#1 branch .. //depot/projects/hammer/share/man/man9/sx.9#2 integrate .. //depot/projects/hammer/share/man/man9/utopia.9#1 branch .. //depot/projects/hammer/share/mk/bsd.lib.mk#6 integrate .. //depot/projects/hammer/share/mk/bsd.libnames.mk#13 integrate .. //depot/projects/hammer/share/mk/bsd.sys.mk#9 integrate .. //depot/projects/hammer/share/mklocale/Makefile#5 integrate .. //depot/projects/hammer/share/monetdef/Makefile#4 integrate .. //depot/projects/hammer/share/monetdef/ru_RU.CP1251.src#1 branch .. //depot/projects/hammer/share/msgdef/Makefile#4 integrate .. //depot/projects/hammer/share/msgdef/ru_RU.CP1251.src#1 branch .. //depot/projects/hammer/share/numericdef/Makefile#4 integrate .. //depot/projects/hammer/share/numericdef/ru_RU.CP866.src#2 delete .. //depot/projects/hammer/share/numericdef/ru_RU.ISO8859-5.src#2 delete .. //depot/projects/hammer/share/numericdef/uk_UA.ISO8859-5.src#2 delete .. //depot/projects/hammer/share/syscons/keymaps/INDEX.keymaps#4 integrate .. //depot/projects/hammer/share/syscons/keymaps/Makefile#5 integrate .. //depot/projects/hammer/share/syscons/keymaps/german.iso.acc.kbd#1 branch .. //depot/projects/hammer/share/syscons/keymaps/lat-amer.kbd#2 delete .. //depot/projects/hammer/share/syscons/keymaps/latinamerican.iso.acc.kbd#1 branch .. //depot/projects/hammer/share/syscons/keymaps/latinamerican.kbd#1 branch .. //depot/projects/hammer/share/syscons/keymaps/us.iso.acc.kbd#1 branch .. //depot/projects/hammer/share/termcap/termcap.5#3 integrate .. //depot/projects/hammer/share/timedef/Makefile#4 integrate .. //depot/projects/hammer/share/timedef/ru_RU.CP1251.src#1 branch .. //depot/projects/hammer/sys/alpha/alpha/alpha-gdbstub.c#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/api_up1000.c#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/autoconf.c#4 integrate .. //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#8 integrate .. //depot/projects/hammer/sys/alpha/alpha/busspace.c#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/clock.c#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/cpuconf.c#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/critical.c#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/db_disasm.c#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/db_interface.c#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_1000a.c#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_2100_a50.c#4 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_2100_a500.c#4 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_3000_300.c#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_3000_500.c#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_axppci_33.c#4 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_eb164.c#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_eb64plus.c#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_kn20aa.c#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_kn300.c#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_kn8ae.c#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_st550.c#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_st6600.c#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/dump_machdep.c#4 integrate .. //depot/projects/hammer/sys/alpha/alpha/elf_machdep.c#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/fp_emulate.c#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/genassym.c#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/ieee_float.c#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/in_cksum.c#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/interrupt.c#4 integrate .. //depot/projects/hammer/sys/alpha/alpha/machdep.c#12 integrate .. //depot/projects/hammer/sys/alpha/alpha/mem.c#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/mp_machdep.c#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#11 integrate .. //depot/projects/hammer/sys/alpha/alpha/prom.c#4 integrate .. //depot/projects/hammer/sys/alpha/alpha/promcons.c#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/sgmap.c#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/sys_machdep.c#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/trap.c#9 integrate .. //depot/projects/hammer/sys/alpha/alpha/vm_machdep.c#8 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC#10 integrate .. //depot/projects/hammer/sys/alpha/include/param.h#4 integrate .. //depot/projects/hammer/sys/alpha/isa/isa.c#3 integrate .. //depot/projects/hammer/sys/alpha/isa/isa_dma.c#2 integrate .. //depot/projects/hammer/sys/alpha/isa/mcclock_isa.c#2 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_dummy.c#2 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_genassym.c#3 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_machdep.c#6 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_sysvec.c#4 integrate .. //depot/projects/hammer/sys/alpha/mcbus/mcbus.c#2 integrate .. //depot/projects/hammer/sys/alpha/mcbus/mcmem.c#2 integrate .. //depot/projects/hammer/sys/alpha/mcbus/mcpcia.c#3 integrate .. //depot/projects/hammer/sys/alpha/osf1/imgact_osf1.c#6 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_ioctl.c#2 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_misc.c#5 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_mount.c#5 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_signal.c#10 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_sysvec.c#3 integrate .. //depot/projects/hammer/sys/alpha/pci/apecs.c#2 integrate .. //depot/projects/hammer/sys/alpha/pci/apecs_pci.c#2 integrate .. //depot/projects/hammer/sys/alpha/pci/bwx.c#2 integrate .. //depot/projects/hammer/sys/alpha/pci/cia.c#2 integrate .. //depot/projects/hammer/sys/alpha/pci/cia_pci.c#2 integrate .. //depot/projects/hammer/sys/alpha/pci/irongate.c#2 integrate .. //depot/projects/hammer/sys/alpha/pci/irongate_pci.c#2 integrate .. //depot/projects/hammer/sys/alpha/pci/lca.c#2 integrate .. //depot/projects/hammer/sys/alpha/pci/lca_pci.c#2 integrate .. //depot/projects/hammer/sys/alpha/pci/pcibus.c#2 integrate .. //depot/projects/hammer/sys/alpha/pci/swiz.c#2 integrate .. //depot/projects/hammer/sys/alpha/pci/t2.c#2 integrate .. //depot/projects/hammer/sys/alpha/pci/t2_pci.c#2 integrate .. //depot/projects/hammer/sys/alpha/pci/tsunami.c#2 integrate .. //depot/projects/hammer/sys/alpha/pci/tsunami_pci.c#2 integrate .. //depot/projects/hammer/sys/alpha/tlsb/dwlpx.c#4 integrate .. //depot/projects/hammer/sys/alpha/tlsb/gbus.c#2 integrate .. //depot/projects/hammer/sys/alpha/tlsb/kftxx.c#2 integrate .. //depot/projects/hammer/sys/alpha/tlsb/mcclock_tlsb.c#2 integrate .. //depot/projects/hammer/sys/alpha/tlsb/tlsb.c#3 integrate .. //depot/projects/hammer/sys/alpha/tlsb/tlsbcpu.c#2 integrate .. //depot/projects/hammer/sys/alpha/tlsb/tlsbmem.c#2 integrate .. //depot/projects/hammer/sys/alpha/tlsb/zs_tlsb.c#3 integrate .. //depot/projects/hammer/sys/amd64/amd64/mem.c#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#17 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#24 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#11 integrate .. //depot/projects/hammer/sys/amd64/include/param.h#8 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#15 integrate .. //depot/projects/hammer/sys/boot/ficl/Makefile#4 integrate .. //depot/projects/hammer/sys/boot/ficl/loader.c#3 integrate .. //depot/projects/hammer/sys/boot/forth/beastie.4th#3 integrate .. //depot/projects/hammer/sys/boot/i386/kgzldr/Makefile#4 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/Makefile#11 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/hammer/sys/boot/pc98/kgzldr/Makefile#4 integrate .. //depot/projects/hammer/sys/boot/pc98/libpc98/Makefile#4 integrate .. //depot/projects/hammer/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/hammer/sys/boot/pc98/loader/Makefile#4 integrate .. //depot/projects/hammer/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/hammer/sys/boot/sparc64/loader/main.c#7 integrate .. //depot/projects/hammer/sys/cam/cam.c#3 integrate .. //depot/projects/hammer/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/hammer/sys/cam/cam_periph.c#9 integrate .. //depot/projects/hammer/sys/cam/cam_queue.c#3 integrate .. //depot/projects/hammer/sys/cam/cam_sim.c#3 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.c#6 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_all.c#7 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_cd.c#10 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_ch.c#6 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#15 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_low.c#5 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_low_pisa.c#2 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_pass.c#4 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_pt.c#6 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_sa.c#8 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_ses.c#6 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_targ_bh.c#5 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_target.c#4 integrate .. //depot/projects/hammer/sys/coda/coda_fbsd.c#4 integrate .. //depot/projects/hammer/sys/coda/coda_namecache.c#3 integrate .. //depot/projects/hammer/sys/coda/coda_psdev.c#4 integrate .. //depot/projects/hammer/sys/coda/coda_subr.c#3 integrate .. //depot/projects/hammer/sys/coda/coda_venus.c#3 integrate .. //depot/projects/hammer/sys/coda/coda_vfsops.c#3 integrate .. //depot/projects/hammer/sys/coda/coda_vfsops.h#2 integrate .. //depot/projects/hammer/sys/coda/coda_vnops.c#5 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#10 integrate .. //depot/projects/hammer/sys/compat/linux/linux_file.c#6 integrate .. //depot/projects/hammer/sys/compat/linux/linux_getcwd.c#5 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#10 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ipc.c#6 integrate .. //depot/projects/hammer/sys/compat/linux/linux_mib.c#4 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#11 integrate .. //depot/projects/hammer/sys/compat/linux/linux_signal.c#8 integrate .. //depot/projects/hammer/sys/compat/linux/linux_socket.c#6 integrate .. //depot/projects/hammer/sys/compat/linux/linux_stats.c#6 integrate .. //depot/projects/hammer/sys/compat/linux/linux_sysctl.c#6 integrate .. //depot/projects/hammer/sys/compat/linux/linux_uid16.c#4 integrate .. //depot/projects/hammer/sys/compat/linux/linux_util.c#4 integrate .. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#6 integrate .. //depot/projects/hammer/sys/compat/svr4/imgact_svr4.c#4 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_fcntl.c#4 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_filio.c#7 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_ioctl.c#3 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_ipc.c#3 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#6 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_resource.c#4 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_signal.c#6 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_socket.c#4 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sockio.c#5 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_stat.c#5 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_stream.c#7 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#6 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_termios.c#3 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_ttold.c#3 integrate .. //depot/projects/hammer/sys/conf/NOTES#18 integrate .. //depot/projects/hammer/sys/conf/files#20 integrate .. //depot/projects/hammer/sys/conf/files.i386#14 integrate .. //depot/projects/hammer/sys/conf/files.pc98#15 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#9 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#10 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#8 integrate .. //depot/projects/hammer/sys/conf/ldscript.sparc64#2 integrate .. //depot/projects/hammer/sys/conf/majors#11 integrate .. //depot/projects/hammer/sys/conf/newvers.sh#5 integrate .. //depot/projects/hammer/sys/conf/options#16 integrate .. //depot/projects/hammer/sys/conf/options.alpha#5 integrate .. //depot/projects/hammer/sys/conf/options.amd64#12 integrate .. //depot/projects/hammer/sys/conf/options.i386#9 integrate .. //depot/projects/hammer/sys/conf/options.ia64#8 integrate .. //depot/projects/hammer/sys/conf/options.pc98#9 integrate .. //depot/projects/hammer/sys/conf/options.sparc64#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwregs.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/COPYRIGHT#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/README#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/ah_desc.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/ah_devid.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/ah_if.m#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/ah_osdep.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/ah_osdep.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/version.h#1 branch .. //depot/projects/hammer/sys/crypto/blowfish/bf_enc.c#2 integrate .. //depot/projects/hammer/sys/crypto/blowfish/bf_skey.c#2 integrate .. //depot/projects/hammer/sys/crypto/cast128/cast128.c#2 integrate .. //depot/projects/hammer/sys/crypto/md5.c#3 integrate .. //depot/projects/hammer/sys/crypto/rc4/rc4.c#3 integrate .. //depot/projects/hammer/sys/crypto/rijndael/rijndael-alg-fst.c#2 integrate .. //depot/projects/hammer/sys/crypto/rijndael/rijndael-api-fst.c#3 integrate .. //depot/projects/hammer/sys/crypto/sha1.c#2 integrate .. //depot/projects/hammer/sys/crypto/sha2/sha2.c#3 integrate .. //depot/projects/hammer/sys/ddb/db_access.c#2 integrate .. //depot/projects/hammer/sys/ddb/db_break.c#4 integrate .. //depot/projects/hammer/sys/ddb/db_command.c#6 integrate .. //depot/projects/hammer/sys/ddb/db_elf.c#3 integrate .. //depot/projects/hammer/sys/ddb/db_examine.c#3 integrate .. //depot/projects/hammer/sys/ddb/db_expr.c#2 integrate .. //depot/projects/hammer/sys/ddb/db_input.c#5 integrate .. //depot/projects/hammer/sys/ddb/db_kld.c#2 integrate .. //depot/projects/hammer/sys/ddb/db_lex.c#2 integrate .. //depot/projects/hammer/sys/ddb/db_output.c#2 integrate .. //depot/projects/hammer/sys/ddb/db_print.c#2 integrate .. //depot/projects/hammer/sys/ddb/db_ps.c#9 integrate .. //depot/projects/hammer/sys/ddb/db_run.c#2 integrate .. //depot/projects/hammer/sys/ddb/db_sym.c#2 integrate .. //depot/projects/hammer/sys/ddb/db_sysctl.c#2 integrate .. //depot/projects/hammer/sys/ddb/db_trap.c#2 integrate .. //depot/projects/hammer/sys/ddb/db_variables.c#2 integrate .. //depot/projects/hammer/sys/ddb/db_watch.c#3 integrate .. //depot/projects/hammer/sys/ddb/db_write_cmd.c#2 integrate .. //depot/projects/hammer/sys/dev/aac/aac_disk.c#4 integrate .. //depot/projects/hammer/sys/dev/advansys/advansys.c#6 integrate .. //depot/projects/hammer/sys/dev/advansys/adwcam.c#6 integrate .. //depot/projects/hammer/sys/dev/ahb/ahb.c#6 integrate .. //depot/projects/hammer/sys/dev/aic/aic.c#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7770.c#6 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.c#9 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.h#8 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.reg#9 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_osm.c#7 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_osm.h#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.c#8 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.h#6 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.c#10 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.h#7 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/amd/amd.c#5 integrate .. //depot/projects/hammer/sys/dev/amr/amr_cam.c#6 integrate .. //depot/projects/hammer/sys/dev/ata/ata-card.c#8 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#12 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#10 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cam.c#8 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#1 branch .. //depot/projects/hammer/sys/dev/ath/if_ath_pci.c#1 branch .. //depot/projects/hammer/sys/dev/ath/if_athioctl.h#1 branch .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#1 branch .. //depot/projects/hammer/sys/dev/bktr/bktr_card.c#3 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_core.c#5 integrate .. //depot/projects/hammer/sys/dev/ccd/ccd.c#9 delete .. //depot/projects/hammer/sys/dev/dpt/dpt_scsi.c#7 integrate .. //depot/projects/hammer/sys/dev/em/README#6 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#12 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#10 integrate .. //depot/projects/hammer/sys/dev/em/if_em_hw.c#8 integrate .. //depot/projects/hammer/sys/dev/em/if_em_hw.h#8 integrate .. //depot/projects/hammer/sys/dev/en/if_en_pci.c#1 branch .. //depot/projects/hammer/sys/dev/en/midway.c#11 integrate .. //depot/projects/hammer/sys/dev/en/midwayvar.h#5 integrate .. //depot/projects/hammer/sys/dev/exca/exca.c#5 integrate .. //depot/projects/hammer/sys/dev/exca/excareg.h#3 integrate .. //depot/projects/hammer/sys/dev/exca/excavar.h#3 integrate .. //depot/projects/hammer/sys/dev/fatm/firmware.h#1 branch .. //depot/projects/hammer/sys/dev/fatm/if_fatm.c#1 branch .. //depot/projects/hammer/sys/dev/fatm/if_fatm_rate.h#1 branch .. //depot/projects/hammer/sys/dev/fatm/if_fatmreg.h#1 branch .. //depot/projects/hammer/sys/dev/fatm/if_fatmvar.h#1 branch .. //depot/projects/hammer/sys/dev/firewire/firewire.c#13 integrate .. //depot/projects/hammer/sys/dev/firewire/firewirereg.h#7 integrate .. //depot/projects/hammer/sys/dev/firewire/fwcrom.c#4 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci.c#9 integrate .. //depot/projects/hammer/sys/dev/firewire/iec13213.h#6 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwe.c#6 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#15 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#18 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm.c#1 branch .. //depot/projects/hammer/sys/dev/hatm/if_hatm_intr.c#1 branch .. //depot/projects/hammer/sys/dev/hatm/if_hatm_ioctl.c#1 branch .. //depot/projects/hammer/sys/dev/hatm/if_hatm_rx.c#1 branch .. //depot/projects/hammer/sys/dev/hatm/if_hatm_tx.c#1 branch .. //depot/projects/hammer/sys/dev/hatm/if_hatmconf.h#1 branch .. //depot/projects/hammer/sys/dev/hatm/if_hatmreg.h#1 branch .. //depot/projects/hammer/sys/dev/hatm/if_hatmvar.h#1 branch .. //depot/projects/hammer/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/hammer/sys/dev/iicbus/iiconf.h#2 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.c#6 integrate .. //depot/projects/hammer/sys/dev/matcd/creativeif.h#1 branch .. //depot/projects/hammer/sys/dev/matcd/matcd.c#1 branch .. //depot/projects/hammer/sys/dev/matcd/matcd_data.h#1 branch .. //depot/projects/hammer/sys/dev/matcd/matcd_isa.c#1 branch .. //depot/projects/hammer/sys/dev/matcd/matcddrv.h#1 branch .. //depot/projects/hammer/sys/dev/matcd/options.h#1 branch .. //depot/projects/hammer/sys/dev/md/md.c#14 integrate .. //depot/projects/hammer/sys/dev/mii/brgphyreg.h#2 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_freebsd.c#8 integrate .. //depot/projects/hammer/sys/dev/null/null.c#4 integrate .. //depot/projects/hammer/sys/dev/ofw/openfirm.c#3 integrate .. //depot/projects/hammer/sys/dev/ofw/openfirm.h#3 integrate .. //depot/projects/hammer/sys/dev/ofw/openfirmio.c#3 integrate .. //depot/projects/hammer/sys/dev/ofw/openfirmio.h#2 integrate .. //depot/projects/hammer/sys/dev/ofw/openpromio.c#1 branch .. //depot/projects/hammer/sys/dev/ofw/openpromio.h#1 branch .. //depot/projects/hammer/sys/dev/pccard/pccard.c#11 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#10 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs.h#10 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#14 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbbvar.h#4 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#10 integrate .. //depot/projects/hammer/sys/dev/pci/pci_user.c#3 integrate .. //depot/projects/hammer/sys/dev/rndtest/rndtest.c#2 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#16 integrate .. //depot/projects/hammer/sys/dev/streams/streams.c#4 integrate .. //depot/projects/hammer/sys/dev/sym/sym_hipd.c#5 integrate .. //depot/projects/hammer/sys/dev/trm/trm.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/usb/uhid.c#4 integrate .. //depot/projects/hammer/sys/dev/usb/ulpt.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#11 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#11 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#11 integrate .. //depot/projects/hammer/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/hammer/sys/dev/utopia/idtphy.h#1 branch .. //depot/projects/hammer/sys/dev/utopia/suni.h#1 branch .. //depot/projects/hammer/sys/dev/utopia/utopia.c#1 branch .. //depot/projects/hammer/sys/dev/utopia/utopia.h#1 branch .. //depot/projects/hammer/sys/dev/vinum/vinumconfig.c#7 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumio.c#9 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumio.h#3 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumioctl.c#9 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumkw.h#4 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumparser.c#5 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumrequest.c#6 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumutil.c#3 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx.c#7 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#11 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi_pccard.c#9 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi_pci.c#5 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vfsops.c#5 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#6 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#11 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#6 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vnops.c#7 integrate .. //depot/projects/hammer/sys/fs/msdosfs/denode.h#3 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#8 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_subr.c#4 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#7 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vnops.c#5 integrate .. //depot/projects/hammer/sys/fs/nullfs/null.h#2 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_subr.c#6 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vfsops.c#5 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#5 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_io.c#3 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vfsops.c#5 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vnops.c#4 integrate .. //depot/projects/hammer/sys/fs/portalfs/portal_vfsops.c#5 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_status.c#6 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs.h#4 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#6 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_io.c#5 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.c#6 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.h#4 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_smb.c#5 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_subr.c#3 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#5 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#7 integrate .. //depot/projects/hammer/sys/fs/specfs/spec_vnops.c#11 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#6 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#9 integrate .. //depot/projects/hammer/sys/fs/umapfs/umap_vfsops.c#6 integrate .. //depot/projects/hammer/sys/fs/unionfs/union.h#3 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#7 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vfsops.c#5 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#7 integrate .. //depot/projects/hammer/sys/geom/geom.h#19 integrate .. //depot/projects/hammer/sys/geom/geom_aes.c#12 integrate .. //depot/projects/hammer/sys/geom/geom_apple.c#7 integrate .. //depot/projects/hammer/sys/geom/geom_bsd.c#20 integrate .. //depot/projects/hammer/sys/geom/geom_bsd_enc.c#5 integrate .. //depot/projects/hammer/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/hammer/sys/geom/geom_ctl.c#12 integrate .. //depot/projects/hammer/sys/geom/geom_dev.c#17 integrate .. //depot/projects/hammer/sys/geom/geom_disk.c#15 integrate .. //depot/projects/hammer/sys/geom/geom_dump.c#13 integrate .. //depot/projects/hammer/sys/geom/geom_event.c#11 integrate .. //depot/projects/hammer/sys/geom/geom_fox.c#1 branch .. //depot/projects/hammer/sys/geom/geom_gpt.c#15 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#13 integrate .. //depot/projects/hammer/sys/geom/geom_kern.c#13 integrate .. //depot/projects/hammer/sys/geom/geom_mbr.c#14 integrate .. //depot/projects/hammer/sys/geom/geom_mbr_enc.c#2 integrate .. //depot/projects/hammer/sys/geom/geom_mirror.c#6 integrate .. //depot/projects/hammer/sys/geom/geom_pc98.c#16 integrate .. //depot/projects/hammer/sys/geom/geom_pc98_enc.c#2 integrate .. //depot/projects/hammer/sys/geom/geom_slice.c#13 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#16 integrate .. //depot/projects/hammer/sys/geom/geom_sunlabel.c#15 integrate .. //depot/projects/hammer/sys/geom/geom_sunlabel_enc.c#2 integrate .. //depot/projects/hammer/sys/geom/geom_vol_ffs.c#6 integrate .. //depot/projects/hammer/sys/gnu/dev/sound/pci/emu10k1-alsa.h#1 branch .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vfsops.c#6 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vnops.c#7 integrate .. //depot/projects/hammer/sys/i386/bios/apm.c#3 integrate .. //depot/projects/hammer/sys/i386/bios/smapi.c#3 integrate .. //depot/projects/hammer/sys/i386/bios/smapi_bios.S#3 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#13 integrate .. //depot/projects/hammer/sys/i386/conf/PAE#5 integrate .. //depot/projects/hammer/sys/i386/i386/legacy.c#5 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#10 integrate .. //depot/projects/hammer/sys/i386/i386/sys_machdep.c#8 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#15 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#11 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#5 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_stat.c#4 integrate .. //depot/projects/hammer/sys/i386/include/acpica_machdep.h#3 integrate .. //depot/projects/hammer/sys/i386/include/apic.h#4 integrate .. //depot/projects/hammer/sys/i386/include/legacyvar.h#3 integrate .. //depot/projects/hammer/sys/i386/include/param.h#6 integrate .. //depot/projects/hammer/sys/i386/isa/apic_vector.s#5 integrate .. //depot/projects/hammer/sys/i386/isa/pcf.c#4 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#11 integrate .. //depot/projects/hammer/sys/i386/pci/pci_bus.c#11 integrate .. //depot/projects/hammer/sys/i386/svr4/svr4_genassym.c#3 integrate .. //depot/projects/hammer/sys/i386/svr4/svr4_machdep.c#6 integrate .. //depot/projects/hammer/sys/i4b/capi/capi_l4if.c#3 integrate .. //depot/projects/hammer/sys/i4b/capi/capi_llif.c#3 integrate .. //depot/projects/hammer/sys/i4b/capi/capi_msgs.c#3 integrate .. //depot/projects/hammer/sys/i4b/capi/iavc/iavc_card.c#3 integrate .. //depot/projects/hammer/sys/i4b/capi/iavc/iavc_isa.c#3 integrate .. //depot/projects/hammer/sys/i4b/capi/iavc/iavc_lli.c#3 integrate .. //depot/projects/hammer/sys/i4b/capi/iavc/iavc_pci.c#3 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_ctl.c#4 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_ing.c#3 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_ipr.c#6 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_isppp.c#6 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_rbch.c#4 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_tel.c#4 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_trace.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/i4b_hdlc.c#2 integrate .. //depot/projects/hammer/sys/i4b/layer1/i4b_l1dmux.c#4 integrate .. //depot/projects/hammer/sys/i4b/layer1/i4b_l1lib.c#2 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#3 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#3 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#3 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#4 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#3 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#3 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#3 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#4 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#4 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c#3 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c#3 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c#3 integrate .. //depot/projects/hammer/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 25 14:22:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 644EF37B404; Wed, 25 Jun 2003 14:22:54 -0700 (PDT) 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 F204B37B401 for ; Wed, 25 Jun 2003 14:22:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4681344014 for ; Wed, 25 Jun 2003 14:22:53 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5PLMr0U043742 for ; Wed, 25 Jun 2003 14:22:53 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5PLMq1S043733 for perforce@freebsd.org; Wed, 25 Jun 2003 14:22:52 -0700 (PDT) Date: Wed, 25 Jun 2003 14:22:52 -0700 (PDT) Message-Id: <200306252122.h5PLMq1S043733@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 33659 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, 25 Jun 2003 21:22:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=33659 Change 33659 by peter@peter_daintree on 2003/06/25 14:21:53 IFC @33657 Affected files ... .. //depot/projects/hammer/include/Makefile#12 integrate .. //depot/projects/hammer/sys/kern/kern_ntptime.c#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_tee.c#3 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#13 integrate .. //depot/projects/hammer/sys/vm/uma_int.h#5 integrate Differences ... ==== //depot/projects/hammer/include/Makefile#12 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.201 2003/06/25 14:59:17 sam Exp $ +# $FreeBSD: src/include/Makefile,v 1.202 2003/06/25 19:39:03 sam Exp $ # # Doing a "make install" builds /usr/include. @@ -27,8 +27,8 @@ LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdint.h syslog.h \ termios.h ucontext.h -LDIRS= cam geom net net80211 netatalk netatm netgraph netinet netinet6 \ - netipsec netipx netkey netnatm netncp netsmb nfs nfsclient nfsserver \ +LDIRS= cam geom net netatalk netatm netgraph netinet netinet6 netipsec \ + netipx netkey netnatm netncp netsmb nfs nfsclient nfsserver \ pccard posix4 sys vm LSUBDIRS= cam/scsi dev/an dev/ic dev/iicbus dev/firewire dev/ofw \ ==== //depot/projects/hammer/sys/kern/kern_ntptime.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_ntptime.c,v 1.51 2003/06/11 00:56:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_ntptime.c,v 1.52 2003/06/25 20:56:40 imp Exp $"); #include "opt_ntp.h" @@ -480,6 +480,7 @@ else if ((*newsec) % 86400 == 0) { (*newsec)--; time_state = TIME_OOP; + time_tai++; } break; @@ -500,7 +501,6 @@ * Insert second in progress. */ case TIME_OOP: - time_tai++; time_state = TIME_WAIT; break; ==== //depot/projects/hammer/sys/netgraph/ng_tee.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ * * Author: Julian Elischer * - * $FreeBSD: src/sys/netgraph/ng_tee.c,v 1.23 2003/02/19 05:47:32 imp Exp $ + * $FreeBSD: src/sys/netgraph/ng_tee.c,v 1.24 2003/06/25 20:58:35 julian Exp $ * $Whistle: ng_tee.c,v 1.18 1999/11/01 09:24:52 julian Exp $ */ @@ -46,7 +46,7 @@ * entering from the right is passed to the left and duplicated on * right2left, and data entering from the left is passed to the right * and duplicated on left2right. Data entering from left2right is - * sent to right, and data from right2left to left. + * sent to left, and data from right2left to right. */ #include ==== //depot/projects/hammer/sys/vm/uma_core.c#13 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.59 2003/06/25 17:25:45 bmilekic Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.60 2003/06/25 20:49:48 bmilekic Exp $"); /* I should really use ktr.. */ /* @@ -115,6 +115,9 @@ /* This mutex protects the zone list */ static struct mtx uma_mtx; +/* These are the pcpu cache locks */ +static struct mtx uma_pcpu_mtx[MAXCPU]; + /* Linked list of boot time pages */ static LIST_HEAD(,uma_slab) uma_boot_pages = LIST_HEAD_INITIALIZER(&uma_boot_pages); @@ -249,7 +252,7 @@ for (cpu = 0; cpu < maxcpu; cpu++) { if (CPU_ABSENT(cpu)) continue; - CPU_LOCK(zone, cpu); + CPU_LOCK(cpu); cache = &zone->uz_cpu[cpu]; /* Add them up, and reset */ alloc += cache->uc_allocs; @@ -258,7 +261,7 @@ free += cache->uc_allocbucket->ub_ptr + 1; if (cache->uc_freebucket) free += cache->uc_freebucket->ub_ptr + 1; - CPU_UNLOCK(zone, cpu); + CPU_UNLOCK(cpu); } } @@ -514,7 +517,7 @@ for (cpu = 0; cpu < maxcpu; cpu++) { if (CPU_ABSENT(cpu)) continue; - CPU_LOCK(zone, cpu); + CPU_LOCK(cpu); cache = &zone->uz_cpu[cpu]; bucket_drain(zone, cache->uc_allocbucket); bucket_drain(zone, cache->uc_freebucket); @@ -543,7 +546,7 @@ for (cpu = 0; cpu < maxcpu; cpu++) { if (CPU_ABSENT(cpu)) continue; - CPU_UNLOCK(zone, cpu); + CPU_UNLOCK(cpu); } zone->uz_cachefree = 0; @@ -985,8 +988,6 @@ struct uma_zctor_args *arg = udata; uma_zone_t zone = mem; int privlc; - int cplen; - int cpu; bzero(zone, size); zone->uz_name = arg->name; @@ -1033,12 +1034,6 @@ else privlc = 0; - /* We do this so that the per cpu lock name is unique for each zone */ - memcpy(zone->uz_lname, "PCPU ", 5); - cplen = min(strlen(zone->uz_name) + 1, LOCKNAME_LEN - 6); - memcpy(zone->uz_lname+5, zone->uz_name, cplen); - zone->uz_lname[LOCKNAME_LEN - 1] = '\0'; - /* * If we're putting the slab header in the actual page we need to * figure out where in each page it goes. This calculates a right @@ -1107,9 +1102,6 @@ zone->uz_count = zone->uz_ipers - 1; else zone->uz_count = UMA_BUCKET_SIZE - 1; - - for (cpu = 0; cpu < maxcpu; cpu++) - CPU_LOCK_INIT(zone, cpu, privlc); } /* @@ -1124,10 +1116,8 @@ zone_dtor(void *arg, int size, void *udata) { uma_zone_t zone; - int cpu; zone = (uma_zone_t)arg; - ZONE_LOCK(zone); zone->uz_wssize = 0; ZONE_UNLOCK(zone); @@ -1142,10 +1132,6 @@ printf("Zone %s was not empty (%d items). Lost %d pages of memory.\n", zone->uz_name, zone->uz_free, zone->uz_pages); - if ((zone->uz_flags & UMA_ZFLAG_INTERNAL) == 0) - for (cpu = 0; cpu < maxcpu; cpu++) - CPU_LOCK_FINI(zone, cpu); - ZONE_UNLOCK(zone); if ((zone->uz_flags & UMA_ZFLAG_OFFPAGE) != 0) hash_free(&zone->uz_hash); @@ -1210,6 +1196,10 @@ /* The initial zone has no Per cpu queues so it's smaller */ zone_ctor(zones, sizeof(struct uma_zone), &args); + /* Initialize the pcpu cache lock set once and for all */ + for (i = 0; i < maxcpu; i++) + CPU_LOCK_INIT(i); + #ifdef UMA_DEBUG printf("Filling boot free list.\n"); #endif @@ -1339,7 +1329,7 @@ zalloc_restart: cpu = PCPU_GET(cpuid); - CPU_LOCK(zone, cpu); + CPU_LOCK(cpu); cache = &zone->uz_cpu[cpu]; zalloc_start: @@ -1360,7 +1350,7 @@ uma_dbg_alloc(zone, NULL, item); ZONE_UNLOCK(zone); #endif - CPU_UNLOCK(zone, cpu); + CPU_UNLOCK(cpu); if (zone->uz_ctor) zone->uz_ctor(item, zone->uz_size, udata); if (flags & M_ZERO) @@ -1410,7 +1400,7 @@ goto zalloc_start; } /* We are no longer associated with this cpu!!! */ - CPU_UNLOCK(zone, cpu); + CPU_UNLOCK(cpu); /* Bump up our uz_count so we get here less */ if (zone->uz_count < UMA_BUCKET_SIZE - 1) @@ -1655,7 +1645,7 @@ ZONE_UNLOCK(zone); - if (zone->uz_ctor != NULL) + if (zone->uz_ctor != NULL) zone->uz_ctor(item, zone->uz_size, udata); if (flags & M_ZERO) bzero(item, zone->uz_size); @@ -1693,7 +1683,7 @@ zfree_restart: cpu = PCPU_GET(cpuid); - CPU_LOCK(zone, cpu); + CPU_LOCK(cpu); cache = &zone->uz_cpu[cpu]; zfree_start: @@ -1718,7 +1708,7 @@ uma_dbg_free(zone, NULL, item); ZONE_UNLOCK(zone); #endif - CPU_UNLOCK(zone, cpu); + CPU_UNLOCK(cpu); return; } else if (cache->uc_allocbucket) { #ifdef UMA_DEBUG_ALLOC @@ -1772,7 +1762,7 @@ goto zfree_start; } /* We're done with this CPU now */ - CPU_UNLOCK(zone, cpu); + CPU_UNLOCK(cpu); /* And the zone.. */ ZONE_UNLOCK(zone); ==== //depot/projects/hammer/sys/vm/uma_int.h#5 (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/sys/vm/uma_int.h,v 1.14 2003/05/31 19:52:15 phk Exp $ + * $FreeBSD: src/sys/vm/uma_int.h,v 1.15 2003/06/25 20:49:48 bmilekic Exp $ * */ @@ -190,7 +190,6 @@ typedef struct uma_bucket * uma_bucket_t; struct uma_cache { - struct mtx uc_lock; /* Spin lock on this cpu's bucket */ uma_bucket_t uc_freebucket; /* Bucket we're freeing to */ uma_bucket_t uc_allocbucket; /* Bucket to allocate from */ u_int64_t uc_allocs; /* Count of allocations */ @@ -198,8 +197,6 @@ typedef struct uma_cache * uma_cache_t; -#define LOCKNAME_LEN 16 /* Length of the name for cpu locks */ - /* * Zone management structure * @@ -207,7 +204,6 @@ * */ struct uma_zone { - char uz_lname[LOCKNAME_LEN]; /* Text name for the cpu lock */ char *uz_name; /* Text name of the zone */ LIST_ENTRY(uma_zone) uz_link; /* List of all zones */ u_int32_t uz_align; /* Alignment mask */ @@ -292,26 +288,15 @@ #define ZONE_LOCK(z) mtx_lock(&(z)->uz_lock) #define ZONE_UNLOCK(z) mtx_unlock(&(z)->uz_lock) -#define CPU_LOCK_INIT(z, cpu, lc) \ - do { \ - if ((lc)) \ - mtx_init(&(z)->uz_cpu[(cpu)].uc_lock, \ - (z)->uz_lname, (z)->uz_lname, \ - MTX_DEF | MTX_DUPOK); \ - else \ - mtx_init(&(z)->uz_cpu[(cpu)].uc_lock, \ - (z)->uz_lname, "UMA cpu", \ - MTX_DEF | MTX_DUPOK); \ - } while (0) +#define CPU_LOCK_INIT(cpu) \ + mtx_init(&uma_pcpu_mtx[(cpu)], "UMA pcpu", "UMA pcpu", \ + MTX_DEF | MTX_DUPOK) -#define CPU_LOCK_FINI(z, cpu) \ - mtx_destroy(&(z)->uz_cpu[(cpu)].uc_lock) +#define CPU_LOCK(cpu) \ + mtx_lock(&uma_pcpu_mtx[(cpu)]) -#define CPU_LOCK(z, cpu) \ - mtx_lock(&(z)->uz_cpu[(cpu)].uc_lock) - -#define CPU_UNLOCK(z, cpu) \ - mtx_unlock(&(z)->uz_cpu[(cpu)].uc_lock) +#define CPU_UNLOCK(cpu) \ + mtx_unlock(&uma_pcpu_mtx[(cpu)]) /* * Find a slab within a hash table. This is used for OFFPAGE zones to lookup From owner-p4-projects@FreeBSD.ORG Wed Jun 25 15:05:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9E4E37B404; Wed, 25 Jun 2003 15:05:48 -0700 (PDT) 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 8A34037B401 for ; Wed, 25 Jun 2003 15:05:48 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E9BD43FEA for ; Wed, 25 Jun 2003 15:05:48 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5PM5l0U058120 for ; Wed, 25 Jun 2003 15:05:47 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5PM5lga058117 for perforce@freebsd.org; Wed, 25 Jun 2003 15:05:47 -0700 (PDT) Date: Wed, 25 Jun 2003 15:05:47 -0700 (PDT) Message-Id: <200306252205.h5PM5lga058117@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 33663 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, 25 Jun 2003 22:05:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=33663 Change 33663 by peter@peter_hammer on 2003/06/25 15:05:09 Port sym to amd64 Affected files ... .. //depot/projects/hammer/sys/dev/sym/sym_hipd.c#6 edit Differences ... ==== //depot/projects/hammer/sys/dev/sym/sym_hipd.c#6 (text+ko) ==== @@ -162,7 +162,7 @@ * make sense) to be used. */ -#if defined __i386__ +#if defined __i386__ || defined __amd64__ #define MEMORY_BARRIER() do { ; } while(0) #elif defined __alpha__ #define MEMORY_BARRIER() alpha_mb() From owner-p4-projects@FreeBSD.ORG Wed Jun 25 17:22:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 120AF37B404; Wed, 25 Jun 2003 17:22:50 -0700 (PDT) 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 BB91D37B401 for ; Wed, 25 Jun 2003 17:22:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C96743FEA for ; Wed, 25 Jun 2003 17:22:49 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5Q0Mn0U007711 for ; Wed, 25 Jun 2003 17:22:49 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5Q0MmrC007705 for perforce@freebsd.org; Wed, 25 Jun 2003 17:22:48 -0700 (PDT) Date: Wed, 25 Jun 2003 17:22:48 -0700 (PDT) Message-Id: <200306260022.h5Q0MmrC007705@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 33672 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, 26 Jun 2003 00:22:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=33672 Change 33672 by peter@peter_hammer on 2003/06/25 17:21:49 Do a minimum of 4GB of direct map area so that we cover the top of the 32 bit pci map space. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#18 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#18 (text+ko) ==== @@ -367,8 +367,8 @@ KPDphys = allocpages(NKPDPE); ndmpdp = (ptoa(Maxmem) + NBPDP - 1) >> PDPSHIFT; - if (ndmpdp < 1) - ndmpdp = 1; + if (ndmpdp < 4) /* Minimum 4GB of dirmap */ + ndmpdp = 4; DMPDPphys = allocpages(NDMPML4E); DMPDphys = allocpages(ndmpdp); From owner-p4-projects@FreeBSD.ORG Wed Jun 25 17:41:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E7F537B404; Wed, 25 Jun 2003 17:41:13 -0700 (PDT) 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 3476537B401 for ; Wed, 25 Jun 2003 17:41:13 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B68243FFB for ; Wed, 25 Jun 2003 17:41:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5Q0fC0U012894 for ; Wed, 25 Jun 2003 17:41:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5Q0fBUE012888 for perforce@freebsd.org; Wed, 25 Jun 2003 17:41:11 -0700 (PDT) Date: Wed, 25 Jun 2003 17:41:11 -0700 (PDT) Message-Id: <200306260041.h5Q0fBUE012888@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 33673 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, 26 Jun 2003 00:41:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=33673 Change 33673 by peter@peter_hammer on 2003/06/25 17:40:15 We can only use the direct map region for pmap_mapdev() if the region we are trying to map is within the window. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#19 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#19 (text+ko) ==== @@ -169,6 +169,7 @@ static int nkpt; static int ndmpdp; +static vm_paddr_t dmaplimit; vm_offset_t kernel_vm_end; static u_int64_t KPTphys; /* phys addr of kernel level 1 */ @@ -371,6 +372,7 @@ ndmpdp = 4; DMPDPphys = allocpages(NDMPML4E); DMPDphys = allocpages(ndmpdp); + dmaplimit = (vm_paddr_t)ndmpdp << PDPSHIFT; /* Fill in the underlying page table pages */ /* Read-only from zero to physfree */ @@ -2868,7 +2870,25 @@ vm_paddr_t pa; vm_size_t size; { - return (void *)PHYS_TO_DMAP(pa); + vm_offset_t va, tmpva, offset; + + /* If this fits within the direct map window, use it */ + if (pa < dmaplimit && (pa + size) < dmaplimit) + return ((void *)PHYS_TO_DMAP(pa)); + offset = pa & PAGE_MASK; + size = roundup(offset + size, PAGE_SIZE); + va = kmem_alloc_pageable(kernel_map, size); + if (!va) + panic("pmap_mapdev: Couldn't alloc kernel virtual memory"); + pa = pa & PG_FRAME; + for (tmpva = va; size > 0; ) { + pmap_kenter(tmpva, pa); + size -= PAGE_SIZE; + tmpva += PAGE_SIZE; + pa += PAGE_SIZE; + } + pmap_invalidate_range(kernel_pmap, va, tmpva); + return ((void *)(va + offset)); } void @@ -2876,6 +2896,21 @@ vm_offset_t va; vm_size_t size; { + vm_offset_t base, offset, tmpva; + pt_entry_t *pte; + + /* If we gave a direct map region in pmap_mapdev, do nothing */ + if (va >= DMAP_MIN_ADDRESS && va < DMAP_MAX_ADDRESS) + return; + base = va & PG_FRAME; + offset = va & PAGE_MASK; + size = roundup(offset + size, PAGE_SIZE); + for (tmpva = base; tmpva < (base + size); tmpva += PAGE_SIZE) { + pte = vtopte(tmpva); + pte_clear(pte); + } + pmap_invalidate_range(kernel_pmap, va, tmpva); + kmem_free(kernel_map, base, size); } /* From owner-p4-projects@FreeBSD.ORG Wed Jun 25 18:23:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F380C37B404; Wed, 25 Jun 2003 18:23:08 -0700 (PDT) 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 8F81637B401 for ; Wed, 25 Jun 2003 18:23:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 326AE43FE3 for ; Wed, 25 Jun 2003 18:23:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5Q1N50U027354 for ; Wed, 25 Jun 2003 18:23:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5Q1N43l027348 for perforce@freebsd.org; Wed, 25 Jun 2003 18:23:04 -0700 (PDT) Date: Wed, 25 Jun 2003 18:23:04 -0700 (PDT) Message-Id: <200306260123.h5Q1N43l027348@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 33676 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, 26 Jun 2003 01:23:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=33676 Change 33676 by peter@peter_hammer on 2003/06/25 18:22:37 IFC @33675 Affected files ... .. //depot/projects/hammer/include/paths.h#5 integrate .. //depot/projects/hammer/include/rune.h#3 integrate .. //depot/projects/hammer/lib/libc/locale/setlocale.c#4 integrate .. //depot/projects/hammer/lib/libc/locale/setlocale.h#2 integrate .. //depot/projects/hammer/lib/libc/locale/setrunelocale.c#4 integrate .. //depot/projects/hammer/lib/libc/locale/table.c#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/alloca.3#3 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#20 integrate .. //depot/projects/hammer/sys/dev/ips/ips.c#3 integrate .. //depot/projects/hammer/sys/dev/ips/ips.h#2 integrate .. //depot/projects/hammer/sys/dev/ips/ips_commands.c#3 integrate .. //depot/projects/hammer/sys/dev/ips/ips_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/sym/sym_hipd.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#12 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#12 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#12 integrate .. //depot/projects/hammer/sys/kern/kern_tc.c#8 integrate .. //depot/projects/hammer/usr.bin/locale/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/locale/locale.c#3 integrate Differences ... ==== //depot/projects/hammer/include/paths.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)paths.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/paths.h,v 1.20 2003/06/20 22:50:33 phk Exp $ + * $FreeBSD: src/include/paths.h,v 1.21 2003/06/25 22:28:33 phantom Exp $ */ #ifndef _PATHS_H_ @@ -62,6 +62,7 @@ #define _PATH_IFCONFIG "/sbin/ifconfig" #define _PATH_KMEM "/dev/kmem" #define _PATH_LIBMAP_CONF "/etc/libmap.conf" +#define _PATH_LOCALE "/usr/share/locale" #define _PATH_LOGIN "/usr/bin/login" #define _PATH_MAILDIR "/var/mail" #define _PATH_MAN "/usr/share/man" ==== //depot/projects/hammer/include/rune.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)rune.h 8.1 (Berkeley) 6/27/93 - * $FreeBSD: src/include/rune.h,v 1.3 2002/09/06 04:22:54 mike Exp $ + * $FreeBSD: src/include/rune.h,v 1.4 2003/06/25 22:28:33 phantom Exp $ */ #ifndef _RUNE_H_ @@ -48,8 +48,6 @@ typedef __rune_t rune_t; #endif -#define _PATH_LOCALE "/usr/share/locale" - #define _INVALID_RUNE _CurrentRuneLocale->invalid_rune #define __sgetrune _CurrentRuneLocale->sgetrune ==== //depot/projects/hammer/lib/libc/locale/setlocale.c#4 (text+ko) ==== @@ -39,14 +39,14 @@ static char sccsid[] = "@(#)setlocale.c 8.1 (Berkeley) 7/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/setlocale.c,v 1.43 2003/05/01 19:03:13 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/setlocale.c,v 1.46 2003/06/25 22:42:33 phantom Exp $"); #include #include #include #include #include -#include +#include /* for _PATH_LOCALE */ #include #include #include @@ -85,6 +85,11 @@ }; /* + * Path to locale storage directory + */ +char *_PathLocale; + +/* * The locales we are going to try and load */ static char new_categories[_LC_LAST][ENCODING_LEN + 1]; @@ -257,6 +262,7 @@ char *new = new_categories[category]; char *old = current_categories[category]; int (*func)(const char *); + int saved_errno; if ((new[0] == '.' && (new[1] == '\0' || (new[1] == '.' && new[2] == '\0'))) || @@ -265,27 +271,11 @@ return (NULL); } - if (_PathLocale == NULL) { - char *p = getenv("PATH_LOCALE"); - - if (p != NULL -#ifndef __NETBSD_SYSCALLS - && !issetugid() -#endif - ) { - if (strlen(p) + 1/*"/"*/ + ENCODING_LEN + - 1/*"/"*/ + CATEGORY_LEN >= PATH_MAX) { - errno = ENAMETOOLONG; - return (NULL); - } - _PathLocale = strdup(p); - if (_PathLocale == NULL) { - errno = ENOMEM; - return (NULL); - } - } else - _PathLocale = _PATH_LOCALE; - } + saved_errno = errno; + errno = __detect_path_locale(); + if (errno != 0) + return (NULL); + errno = saved_errno; switch (category) { case LC_CTYPE: @@ -322,3 +312,29 @@ return (NULL); } +/* + * Detect locale storage location and store its value to _PathLocale variable + */ +int +__detect_path_locale(void) +{ + if (_PathLocale == NULL) { + char *p = getenv("PATH_LOCALE"); + + if (p != NULL +#ifndef __NETBSD_SYSCALLS + && !issetugid() +#endif + ) { + if (strlen(p) + 1/*"/"*/ + ENCODING_LEN + + 1/*"/"*/ + CATEGORY_LEN >= PATH_MAX) + return (ENAMETOOLONG); + _PathLocale = strdup(p); + if (_PathLocale == NULL) + return (errno == 0 ? ENOMEM : errno); + } else + _PathLocale = _PATH_LOCALE; + } + return (0); +} + ==== //depot/projects/hammer/lib/libc/locale/setlocale.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/locale/setlocale.h,v 1.4 2001/12/20 18:28:52 phantom Exp $ + * $FreeBSD: src/lib/libc/locale/setlocale.h,v 1.5 2003/06/25 22:42:33 phantom Exp $ */ #ifndef _SETLOCALE_H_ @@ -34,4 +34,6 @@ extern char *_PathLocale; +int __detect_path_locale(void); + #endif /* !_SETLOCALE_H_ */ ==== //depot/projects/hammer/lib/libc/locale/setrunelocale.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/setrunelocale.c,v 1.27 2003/06/01 15:30:56 ache Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/setrunelocale.c,v 1.28 2003/06/25 22:42:33 phantom Exp $"); #include #include @@ -95,23 +95,10 @@ /* * Slurp the locale file into the cache. */ - if (_PathLocale == NULL) { - char *p = getenv("PATH_LOCALE"); + ret = __detect_path_locale(); + if (ret != 0) + return (ret); - if (p != NULL -#ifndef __NETBSD_SYSCALLS - && !issetugid() -#endif - ) { - if (strlen(p) + 1/*"/"*/ + ENCODING_LEN + - 1/*"/"*/ + CATEGORY_LEN >= PATH_MAX) - return (ENAMETOOLONG); - _PathLocale = strdup(p); - if (_PathLocale == NULL) - return (errno == 0 ? ENOMEM : errno); - } else - _PathLocale = _PATH_LOCALE; - } /* Range checking not needed, encoding length already checked above */ (void) strcpy(name, _PathLocale); (void) strcat(name, "/"); ==== //depot/projects/hammer/lib/libc/locale/table.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)table.c 8.1 (Berkeley) 6/27/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/table.c,v 1.16 2002/03/22 21:52:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/table.c,v 1.17 2003/06/25 22:34:13 phantom Exp $"); #include #include @@ -255,4 +255,3 @@ int __mb_cur_max = 1; -char *_PathLocale; ==== //depot/projects/hammer/lib/libc/stdlib/alloca.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)alloca.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdlib/alloca.3,v 1.9 2003/06/25 19:18:44 obrien Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/alloca.3,v 1.10 2003/06/25 21:31:43 obrien Exp $ .\" .Dd June 4, 1993 .Dt ALLOCA 3 @@ -66,12 +66,6 @@ .Xr getpagesize 3 , .Xr malloc 3 , .Xr realloc 3 -.Sh BUGS -The -.Fn alloca -function -is machine and compiler dependent; -its use is discouraged. .Sh HISTORY The .Fn alloca @@ -81,3 +75,9 @@ .\" The function appeared in 32v, pwb and pwb.2 and in 3bsd 4bsd .\" The first man page (or link to a man page that I can find at the .\" moment is 4.3... +.Sh BUGS +The +.Fn alloca +function +is machine and compiler dependent; +its use is discouraged. ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#20 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.416 2003/06/23 06:10:52 alc Exp $ + * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.417 2003/06/26 01:04:31 peter Exp $ */ /*- * Copyright (c) 2003 Networks Associates Technology, Inc. @@ -492,7 +492,7 @@ va = virtual_avail; pte = vtopte(va); - /* + /* * CMAP1 is only used for the memory test. */ SYSMAP(caddr_t, CMAP1, CADDR1, 1) @@ -2900,7 +2900,7 @@ pt_entry_t *pte; /* If we gave a direct map region in pmap_mapdev, do nothing */ - if (va >= DMAP_MIN_ADDRESS && va < DMAP_MAX_ADDRESS) + if (va >= DMAP_MIN_ADDRESS && va < DMAP_MAX_ADDRESS) return; base = va & PG_FRAME; offset = va & PAGE_MASK; ==== //depot/projects/hammer/sys/dev/ips/ips.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ips/ips.c,v 1.1 2003/05/11 06:36:49 scottl Exp $ + * $FreeBSD: src/sys/dev/ips/ips.c,v 1.2 2003/06/26 00:03:58 scottl Exp $ */ @@ -322,6 +322,7 @@ /* check card and initialize it */ int ips_adapter_init(ips_softc_t *sc) { + int i; DEVICE_PRINTF(1,sc->dev, "initializing\n"); if (bus_dma_tag_create( /* parent */ sc->adapter_dmatag, /* alignemnt */ 1, @@ -359,13 +360,18 @@ can handle */ sc->max_cmds = 1; ips_cmdqueue_init(sc); + callout_handle_init(&sc->timer); if(sc->ips_adapter_reinit(sc, 0)) goto error; mtx_init(&sc->cmd_mtx, "ips command mutex", NULL, MTX_DEF); - if(ips_get_adapter_info(sc) || ips_get_drive_info(sc)){ - device_printf(sc->dev, "failed to get configuration data from device\n"); + if ((i = ips_get_adapter_info(sc)) != 0) { + device_printf(sc->dev, "failed to get adapter configuration data from device (%d)\n", i); + goto error; + } + if ((i = ips_get_drive_info(sc)) != 0) { + device_printf(sc->dev, "failed to get drive configuration data from device (%d)\n", i); goto error; } ips_update_nvram(sc); /* no error check as failure doesn't matter */ ==== //depot/projects/hammer/sys/dev/ips/ips.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ips/ips.h,v 1.1 2003/05/11 06:36:49 scottl Exp $ + * $FreeBSD: src/sys/dev/ips/ips.h,v 1.2 2003/06/26 00:03:59 scottl Exp $ */ @@ -343,7 +343,8 @@ typedef struct ips_softc{ struct resource * iores; struct resource * irqres; - int state; + int configured; + int state; int iotype; int rid; int irqrid; ==== //depot/projects/hammer/sys/dev/ips/ips_commands.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ips/ips_commands.c,v 1.1 2003/05/11 06:36:49 scottl Exp $ + * $FreeBSD: src/sys/dev/ips/ips_commands.c,v 1.2 2003/06/26 00:03:59 scottl Exp $ */ @@ -266,7 +266,7 @@ { int error = 0; ips_cmd_status_t *status; - status = malloc(sizeof(ips_cmd_status_t), M_DEVBUF, M_NOWAIT); + status = malloc(sizeof(ips_cmd_status_t), M_DEVBUF, M_NOWAIT|M_ZERO); if(!status) return ENOMEM; if(ips_get_free_cmd(sc, ips_send_adapter_info_cmd, status, @@ -275,7 +275,7 @@ free(status, M_DEVBUF); return ENXIO; } - if(COMMAND_ERROR(status)){ + if (COMMAND_ERROR(status)){ error = ENXIO; } free(status, M_DEVBUF); @@ -372,7 +372,7 @@ { int error = 0; ips_cmd_status_t *status; - status = malloc(sizeof(ips_cmd_status_t), M_DEVBUF, M_NOWAIT); + status = malloc(sizeof(ips_cmd_status_t), M_DEVBUF, M_NOWAIT|M_ZERO); if(!status) return ENOMEM; if(ips_get_free_cmd(sc, ips_send_drive_info_cmd, status, @@ -415,7 +415,7 @@ int ips_flush_cache(ips_softc_t *sc) { ips_cmd_status_t *status; - status = malloc(sizeof(ips_cmd_status_t), M_DEVBUF, M_NOWAIT); + status = malloc(sizeof(ips_cmd_status_t), M_DEVBUF, M_NOWAIT|M_ZERO); if(!status) return ENOMEM; device_printf(sc->dev, "flushing cache\n"); @@ -534,7 +534,7 @@ int ips_update_nvram(ips_softc_t *sc) { ips_cmd_status_t *status; - status = malloc(sizeof(ips_cmd_status_t), M_DEVBUF, M_NOWAIT); + status = malloc(sizeof(ips_cmd_status_t), M_DEVBUF, M_NOWAIT|M_ZERO); if(!status) return ENOMEM; if(ips_get_free_cmd(sc, ips_read_nvram, status, IPS_NOWAIT_FLAG)){ @@ -602,7 +602,7 @@ int ips_clear_adapter(ips_softc_t *sc) { ips_cmd_status_t *status; - status = malloc(sizeof(ips_cmd_status_t), M_DEVBUF, M_NOWAIT); + status = malloc(sizeof(ips_cmd_status_t), M_DEVBUF, M_NOWAIT|M_ZERO); if(!status) return ENOMEM; device_printf(sc->dev, "syncing config\n"); ==== //depot/projects/hammer/sys/dev/ips/ips_pci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ips/ips_pci.c,v 1.1 2003/05/11 06:36:49 scottl Exp $ + * $FreeBSD: src/sys/dev/ips/ips_pci.c,v 1.2 2003/06/26 00:03:59 scottl Exp $ */ @@ -50,8 +50,17 @@ static int ips_pci_attach(device_t dev) { u_int32_t command; + int tval; ips_softc_t *sc; + + tval = 0; + if (resource_int_value(device_get_name(dev), device_get_unit(dev), + "disable", &tval) == 0 && tval) { + device_printf(dev, "device is disabled\n"); + /* but return 0 so the !$)$)*!$*) unit isn't reused */ + return (0); + } DEVICE_PRINTF(1, dev, "in attach.\n"); sc = (ips_softc_t *)device_get_softc(dev); if(!sc){ @@ -125,6 +134,7 @@ } if(ips_adapter_init(sc)) goto error; + sc->configured = 1; return 0; error: ips_pci_free(sc); @@ -141,6 +151,7 @@ bus_release_resource(sc->dev, SYS_RES_IRQ, sc->irqrid, sc->irqres); if(sc->iores) bus_release_resource(sc->dev, sc->iotype, sc->rid, sc->iores); + sc->configured = 0; return 0; } @@ -149,18 +160,23 @@ ips_softc_t *sc; DEVICE_PRINTF(1, dev, "detaching ServeRaid\n"); sc = (ips_softc_t *) device_get_softc(dev); - ips_flush_cache(sc); - if(ips_adapter_free(sc)) - return EBUSY; - ips_pci_free(sc); - mtx_destroy(&sc->cmd_mtx); + if (sc->configured) { + sc->configured = 0; + ips_flush_cache(sc); + if(ips_adapter_free(sc)) + return EBUSY; + ips_pci_free(sc); + mtx_destroy(&sc->cmd_mtx); + } return 0; } static int ips_pci_shutdown(device_t dev) { ips_softc_t *sc = (ips_softc_t *) device_get_softc(dev); - ips_flush_cache(sc); + if (sc->configured) { + ips_flush_cache(sc); + } return 0; } ==== //depot/projects/hammer/sys/dev/sym/sym_hipd.c#7 (text+ko) ==== @@ -55,7 +55,7 @@ * SUCH DAMAGE. */ -/* $FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.41 2003/06/14 22:17:41 njl Exp $ */ +/* $FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.42 2003/06/26 01:10:24 peter Exp $ */ #define SYM_DRIVER_NAME "sym-1.6.5-20000902" ==== //depot/projects/hammer/sys/dev/usb/usbdevs#12 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.126 2003/06/13 11:20:26 joe Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.127 2003/06/25 22:50:57 joe Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -267,6 +267,7 @@ vendor COREGA 0x07aa Corega vendor FREECOM 0x07ab Freecom vendor MICROTECH 0x07af Microtech +vendor GENERALINSTMNTS 0x07b2 General Instruments (Motorola) vendor OLYMPUS 0x07b4 Olympus vendor ABOCOM 0x07b8 AboCom Systems vendor KEISOKUGIKEN 0x07c1 Keisokugiken @@ -494,9 +495,11 @@ product BTC BTC7932 0x6782 Keyboard with mouse port /* Canon, Inc. products */ -product CANON N656U 0x2206 CANOSCAN N656U +product CANON N656U 0x2206 CanoScan N656U +product CANON N1240U 0x220e CanoScan N1240U product CANON S10 0x3041 PowerShot S10 product CANON S100 0x3045 PowerShot S100 +product CANON S200 0x3065 PowerShot S200 /* CATC products */ product CATC NETMATE 0x000a Netmate ethernet adapter @@ -607,8 +610,8 @@ product EPSON 1600 0x0107 Expression 1600 scanner product EPSON 1640 0x010a Perfection 1640SU scanner product EPSON 1240 0x010b Perfection 1240U / 1240Photo scanner +product EPSON 640U 0x010c Perfection 640U scanner product EPSON 1250 0x010f Perfection 1250U / 1250Photo scanner -product EPSON 640U 0x010c Perfection 640U scanner product EPSON 1650 0x0110 Perfection 1650 scanner product EPSON GT9700F 0x0112 GT-9700F scanner product EPSON 1260 0x011d Perfection 1260 scanner @@ -645,6 +648,9 @@ /* Fujitsu protducts */ product FUJITSU AH_F401U 0x105b AH-F401U Air H device +/* General Instruments (Motorola) products */ +product GENERALINSTMNTS SB5100 0x5100 SURFboard SB5100 Cable modem + /* Genesys Logic products */ product GENESYS GL650 0x0604 GL650 Hub product GENESYS GL641USB 0x0700 GL641USB CompactFlash Card Reader @@ -815,6 +821,7 @@ product LOGITECH WMJOY 0xc281 WingMan Force joystick product LOGITECH RK53 0xc501 Cordless mouse product LOGITECH RB6 0xc503 Cordless keyboard +product LOGITECH MX700 0xc506 Cordless optical mouse product LOGITECH QUICKCAMPRO2 0xd001 QuickCam Pro /* Lucent products */ @@ -848,8 +855,9 @@ product MICROSOFT NATURALKBD 0x000b Natural Keyboard Elite product MICROSOFT DDS80 0x0014 Digital Sound System 80 product MICROSOFT SIDEWINDER 0x001a Sidewinder Precision Racing Wheel +product MICROSOFT INETPRO 0x001c Internet Keyboard Pro product MICROSOFT INTELLIEYE 0x0025 IntelliEye mouse -product MICROSOFT INETPRO 0x002b Internet Keyboard Pro +product MICROSOFT INETPRO2 0x002b Internet Keyboard Pro /* Microtech products */ product MICROTECH SCSIDB25 0x0004 USB-SCSI-DB25 @@ -1039,6 +1047,7 @@ product SHUTTLE EUSCSI_B 0x000b eUSCSI Bridge product SHUTTLE EUSCSI_C 0x000c eUSCSI Bridge product SHUTTLE CDRW 0x0101 CD-RW Device +product SHUTTLE EUSBORCA 0x0325 eUSB ORCA Quad Reader /* Siemens products */ product SIEMENS SPEEDSTREAM 0x1001 SpeedStream USB @@ -1156,6 +1165,7 @@ product WACOM CT0405U 0x0000 CT-0405-U Tablet product WACOM GRAPHIRE 0x0010 Graphire product WACOM INTUOSA5 0x0021 Intuos A5 +product WACOM GD0912U 0x0022 Intuos 9x12 Graphics Tablet /* Xirlink products */ product XIRLINK PCCAM 0x8080 IBM PC Camera ==== //depot/projects/hammer/sys/dev/usb/usbdevs.h#12 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.135 2003/06/13 11:24:45 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.136 2003/06/25 22:53:46 joe Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.126 2003/06/13 11:20:26 joe Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.127 2003/06/25 22:50:57 joe Exp */ /* @@ -274,6 +274,7 @@ #define USB_VENDOR_COREGA 0x07aa /* Corega */ #define USB_VENDOR_FREECOM 0x07ab /* Freecom */ #define USB_VENDOR_MICROTECH 0x07af /* Microtech */ +#define USB_VENDOR_GENERALINSTMNTS 0x07b2 /* General Instruments (Motorola) */ #define USB_VENDOR_OLYMPUS 0x07b4 /* Olympus */ #define USB_VENDOR_ABOCOM 0x07b8 /* AboCom Systems */ #define USB_VENDOR_KEISOKUGIKEN 0x07c1 /* Keisokugiken */ @@ -501,9 +502,11 @@ #define USB_PRODUCT_BTC_BTC7932 0x6782 /* Keyboard with mouse port */ /* Canon, Inc. products */ -#define USB_PRODUCT_CANON_N656U 0x2206 /* CANOSCAN N656U */ +#define USB_PRODUCT_CANON_N656U 0x2206 /* CanoScan N656U */ +#define USB_PRODUCT_CANON_N1240U 0x220e /* CanoScan N1240U */ #define USB_PRODUCT_CANON_S10 0x3041 /* PowerShot S10 */ #define USB_PRODUCT_CANON_S100 0x3045 /* PowerShot S100 */ +#define USB_PRODUCT_CANON_S200 0x3065 /* PowerShot S200 */ /* CATC products */ #define USB_PRODUCT_CATC_NETMATE 0x000a /* Netmate ethernet adapter */ @@ -614,8 +617,8 @@ #define USB_PRODUCT_EPSON_1600 0x0107 /* Expression 1600 scanner */ #define USB_PRODUCT_EPSON_1640 0x010a /* Perfection 1640SU scanner */ #define USB_PRODUCT_EPSON_1240 0x010b /* Perfection 1240U / 1240Photo scanner */ +#define USB_PRODUCT_EPSON_640U 0x010c /* Perfection 640U scanner */ #define USB_PRODUCT_EPSON_1250 0x010f /* Perfection 1250U / 1250Photo scanner */ -#define USB_PRODUCT_EPSON_640U 0x010c /* Perfection 640U scanner */ #define USB_PRODUCT_EPSON_1650 0x0110 /* Perfection 1650 scanner */ #define USB_PRODUCT_EPSON_GT9700F 0x0112 /* GT-9700F scanner */ #define USB_PRODUCT_EPSON_1260 0x011d /* Perfection 1260 scanner */ @@ -652,6 +655,9 @@ /* Fujitsu protducts */ #define USB_PRODUCT_FUJITSU_AH_F401U 0x105b /* AH-F401U Air H device */ +/* General Instruments (Motorola) products */ +#define USB_PRODUCT_GENERALINSTMNTS_SB5100 0x5100 /* SURFboard SB5100 Cable modem */ + /* Genesys Logic products */ #define USB_PRODUCT_GENESYS_GL650 0x0604 /* GL650 Hub */ #define USB_PRODUCT_GENESYS_GL641USB 0x0700 /* GL641USB CompactFlash Card Reader */ @@ -822,6 +828,7 @@ #define USB_PRODUCT_LOGITECH_WMJOY 0xc281 /* WingMan Force joystick */ #define USB_PRODUCT_LOGITECH_RK53 0xc501 /* Cordless mouse */ #define USB_PRODUCT_LOGITECH_RB6 0xc503 /* Cordless keyboard */ +#define USB_PRODUCT_LOGITECH_MX700 0xc506 /* Cordless optical mouse */ #define USB_PRODUCT_LOGITECH_QUICKCAMPRO2 0xd001 /* QuickCam Pro */ /* Lucent products */ @@ -855,8 +862,9 @@ #define USB_PRODUCT_MICROSOFT_NATURALKBD 0x000b /* Natural Keyboard Elite */ #define USB_PRODUCT_MICROSOFT_DDS80 0x0014 /* Digital Sound System 80 */ #define USB_PRODUCT_MICROSOFT_SIDEWINDER 0x001a /* Sidewinder Precision Racing Wheel */ +#define USB_PRODUCT_MICROSOFT_INETPRO 0x001c /* Internet Keyboard Pro */ #define USB_PRODUCT_MICROSOFT_INTELLIEYE 0x0025 /* IntelliEye mouse */ -#define USB_PRODUCT_MICROSOFT_INETPRO 0x002b /* Internet Keyboard Pro */ +#define USB_PRODUCT_MICROSOFT_INETPRO2 0x002b /* Internet Keyboard Pro */ /* Microtech products */ #define USB_PRODUCT_MICROTECH_SCSIDB25 0x0004 /* USB-SCSI-DB25 */ @@ -1046,6 +1054,7 @@ #define USB_PRODUCT_SHUTTLE_EUSCSI_B 0x000b /* eUSCSI Bridge */ #define USB_PRODUCT_SHUTTLE_EUSCSI_C 0x000c /* eUSCSI Bridge */ #define USB_PRODUCT_SHUTTLE_CDRW 0x0101 /* CD-RW Device */ +#define USB_PRODUCT_SHUTTLE_EUSBORCA 0x0325 /* eUSB ORCA Quad Reader */ /* Siemens products */ #define USB_PRODUCT_SIEMENS_SPEEDSTREAM 0x1001 /* SpeedStream USB */ @@ -1163,6 +1172,7 @@ #define USB_PRODUCT_WACOM_CT0405U 0x0000 /* CT-0405-U Tablet */ #define USB_PRODUCT_WACOM_GRAPHIRE 0x0010 /* Graphire */ #define USB_PRODUCT_WACOM_INTUOSA5 0x0021 /* Intuos A5 */ +#define USB_PRODUCT_WACOM_GD0912U 0x0022 /* Intuos 9x12 Graphics Tablet */ /* Xirlink products */ #define USB_PRODUCT_XIRLINK_PCCAM 0x8080 /* IBM PC Camera */ ==== //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#12 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.135 2003/06/13 11:24:45 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.136 2003/06/25 22:53:46 joe Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.126 2003/06/13 11:20:26 joe Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.127 2003/06/25 22:50:57 joe Exp */ /* @@ -511,7 +511,13 @@ USB_VENDOR_CANON, USB_PRODUCT_CANON_N656U, 0, "Canon", - "CANOSCAN N656U", + "CanoScan N656U", + }, + { + USB_VENDOR_CANON, USB_PRODUCT_CANON_N1240U, + 0, + "Canon", + "CanoScan N1240U", }, { USB_VENDOR_CANON, USB_PRODUCT_CANON_S10, @@ -526,6 +532,12 @@ "PowerShot S100", }, { + USB_VENDOR_CANON, USB_PRODUCT_CANON_S200, + 0, + "Canon", + "PowerShot S200", + }, + { USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE, 0, "Computer Access Technology", @@ -916,16 +928,16 @@ "Perfection 1240U / 1240Photo scanner", }, { - USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1250, + USB_VENDOR_EPSON, USB_PRODUCT_EPSON_640U, 0, "Seiko Epson", - "Perfection 1250U / 1250Photo scanner", + "Perfection 640U scanner", }, { - USB_VENDOR_EPSON, USB_PRODUCT_EPSON_640U, + USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1250, 0, "Seiko Epson", - "Perfection 640U scanner", + "Perfection 1250U / 1250Photo scanner", }, { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1650, @@ -1018,6 +1030,12 @@ "AH-F401U Air H device", }, { + USB_VENDOR_GENERALINSTMNTS, USB_PRODUCT_GENERALINSTMNTS_SB5100, + 0, + "General Instruments (Motorola)", + "SURFboard SB5100 Cable modem", + }, + { USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL650, 0, "Genesys Logic", @@ -1696,6 +1714,12 @@ "Cordless keyboard", }, { + USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_MX700, + 0, + "Logitech", + "Cordless optical mouse", + }, + { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO2, 0, "Logitech", @@ -1810,13 +1834,19 @@ "Sidewinder Precision Racing Wheel", }, { + USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INETPRO, + 0, + "Microsoft", + "Internet Keyboard Pro", + }, + { USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INTELLIEYE, 0, "Microsoft", "IntelliEye mouse", }, { - USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INETPRO, + USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INETPRO2, 0, "Microsoft", "Internet Keyboard Pro", @@ -2500,6 +2530,12 @@ "CD-RW Device", }, { + USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSBORCA, + 0, + "Shuttle Technology", + "eUSB ORCA Quad Reader", + }, + { USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM, 0, "Siemens", @@ -2872,6 +2908,12 @@ "Intuos A5", }, { + USB_VENDOR_WACOM, USB_PRODUCT_WACOM_GD0912U, + 0, + "WACOM", + "Intuos 9x12 Graphics Tablet", + }, + { USB_VENDOR_XIRLINK, USB_PRODUCT_XIRLINK_PCCAM, 0, "Xirlink", @@ -4108,6 +4150,12 @@ NULL, }, { + USB_VENDOR_GENERALINSTMNTS, 0, + USB_KNOWNDEV_NOPROD, + "General Instruments (Motorola)", + NULL, + }, + { USB_VENDOR_OLYMPUS, 0, USB_KNOWNDEV_NOPROD, "Olympus", ==== //depot/projects/hammer/sys/kern/kern_tc.c#8 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.150 2003/06/23 20:14:08 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.151 2003/06/25 21:23:51 imp Exp $"); #include "opt_ntp.h" @@ -21,6 +21,14 @@ #include /* + * a large step happens on boot. This constant detects such + * a steps. It is relatively small so that ntp_update_second gets called + * enough in the typical 'missed a couple of seconds' case, but doesn't + * loop forever when the time step is large. + */ +#define LARGE_STEP 200 + +/* * Implement a dummy timecounter which we can use until we get a real one * in the air. This allows the console and other early stuff to use * time services. @@ -344,6 +352,7 @@ u_int64_t scale; u_int delta, ncount, ogen; int i; + time_t t; /* * Make the next timehands a copy of the current one, but do not @@ -381,13 +390,28 @@ if (tho->th_counter->tc_poll_pps) tho->th_counter->tc_poll_pps(tho->th_counter); + /* + * Compute the UTC time, before any leapsecond adjustments, are + * made. + */ + bt = th->th_offset; + bintime_add(&bt, &boottimebin); + /* * Deal with NTP second processing. The for loop normally only * iterates once, but in extreme situations it might keep NTP sane - * if timeouts are not run for several seconds. + * if timeouts are not run for several seconds. At boot, the + * time step can be large when the TOD hardware has been read, so + * on really large steps, we call ntp_update_second only once. */ - for (i = th->th_offset.sec - tho->th_offset.sec; i > 0; i--) - ntp_update_second(&th->th_adjustment, &th->th_offset.sec); + for (i = bt.sec - tho->th_microtime.tv_sec; i > 0; i--) { + t = bt.sec; + ntp_update_second(&th->th_adjustment, &bt.sec); + if (bt.sec != t) + boottimebin.sec += bt.sec - t; + if (i > LARGE_STEP) + break; + } /* Now is a good time to change timecounters. */ if (th->th_counter != timecounter) { @@ -423,9 +447,6 @@ scale /= th->th_counter->tc_frequency; th->th_scale = scale * 2; - /* Update the UTC timestamps used for the get*() functions. */ - bt = th->th_offset; - bintime_add(&bt, &boottimebin); bintime2timeval(&bt, &th->th_microtime); bintime2timespec(&bt, &th->th_nanotime); ==== //depot/projects/hammer/usr.bin/locale/Makefile#3 (text+ko) ==== @@ -1,6 +1,7 @@ -# $FreeBSD: src/usr.bin/locale/Makefile,v 1.3 2003/06/22 08:24:53 phantom Exp $ +# $FreeBSD: src/usr.bin/locale/Makefile,v 1.4 2003/06/25 23:05:11 phantom Exp $ PROG = locale +CFLAGS += -I${.CURDIR}/../../lib/libc/locale WARNS ?= 1 .include ==== //depot/projects/hammer/usr.bin/locale/locale.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/usr.bin/locale/locale.c,v 1.5 2003/06/22 08:34:27 phantom Exp $ + * $FreeBSD: src/usr.bin/locale/locale.c,v 1.7 2003/06/25 23:05:11 phantom Exp $ */ /* @@ -40,12 +40,12 @@ #include #include #include -#include /* for _PATH_LOCALE */ #include #include #include #include #include +#include "setlocale.h" /* Local prototypes */ void init_locales_list(void); @@ -320,7 +320,6 @@ { DIR *dirp; struct dirent *dp; - const char *dirname; /* why call this function twice ? */ if (locales != NULL) @@ -332,14 +331,13 @@ err(1, "could not allocate memory"); /* get actual locales directory name */ - dirname = getenv("PATH_LOCALE"); - if (dirname == NULL) - dirname = _PATH_LOCALE; + if (__detect_path_locale() != 0) + err(1, "unable to find locales storage"); /* open locales directory */ - dirp = opendir(dirname); + dirp = opendir(_PathLocale); if (dirp == NULL) - err(1, "could not open directory '%s'", dirname); + err(1, "could not open directory '%s'", _PathLocale); /* scan directory and store its contents except "." and ".." */ while ((dp = readdir(dirp)) != NULL) { From owner-p4-projects@FreeBSD.ORG Wed Jun 25 18:28:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D66EB37B404; Wed, 25 Jun 2003 18:28:13 -0700 (PDT) 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 9F61937B401 for ; Wed, 25 Jun 2003 18:28:13 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24B0344025 for ; Wed, 25 Jun 2003 18:28:13 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5Q1SC0U028439 for ; Wed, 25 Jun 2003 18:28:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5Q1SCRZ028436 for perforce@freebsd.org; Wed, 25 Jun 2003 18:28:12 -0700 (PDT) Date: Wed, 25 Jun 2003 18:28:12 -0700 (PDT) Message-Id: <200306260128.h5Q1SCRZ028436@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 33678 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, 26 Jun 2003 01:28:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=33678 Change 33678 by peter@peter_hammer on 2003/06/25 18:28:06 IFC @33677 Affected files ... .. //depot/projects/hammer/release/Makefile#30 integrate .. //depot/projects/hammer/release/amd64/boot_crunch.conf#2 integrate .. //depot/projects/hammer/release/amd64/dokern.sh#2 integrate .. //depot/projects/hammer/release/amd64/fixit_crunch.conf#2 integrate .. //depot/projects/hammer/release/amd64/mkisoimages.sh#2 integrate .. //depot/projects/hammer/share/mk/bsd.lib.mk#7 integrate Differences ... ==== //depot/projects/hammer/release/Makefile#30 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.782 2003/06/04 22:24:43 peter Exp $ +# $FreeBSD: src/release/Makefile,v 1.783 2003/06/26 00:55:33 peter Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] ==== //depot/projects/hammer/release/amd64/boot_crunch.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/i386/boot_crunch.conf,v 1.56 2003/01/23 08:30:47 ru Exp $ +# $FreeBSD: src/release/amd64/boot_crunch.conf,v 1.56 2003/01/23 08:30:47 ru Exp $ buildopts -DRELEASE_CRUNCH -Dlint ==== //depot/projects/hammer/release/amd64/dokern.sh#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/release/i386/dokern.sh,v 1.80 2003/05/18 03:52:22 scottl Exp $ +# $FreeBSD: src/release/amd64/dokern.sh,v 1.81 2003/06/26 00:58:57 peter Exp $ # sed \ ==== //depot/projects/hammer/release/amd64/fixit_crunch.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/i386/fixit_crunch.conf,v 1.10 2003/05/17 19:16:28 ru Exp $ +# $FreeBSD: src/release/amd64/fixit_crunch.conf,v 1.10 2003/05/17 19:16:28 ru Exp $ buildopts -DRELEASE_CRUNCH ==== //depot/projects/hammer/release/amd64/mkisoimages.sh#2 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.7 2002/04/11 16:39:13 jhb Exp $ +# $FreeBSD: src/release/amd64/mkisoimages.sh,v 1.7 2002/04/11 16:39:13 jhb Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each ==== //depot/projects/hammer/share/mk/bsd.lib.mk#7 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 -# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.140 2003/06/10 04:47:49 obrien Exp $ +# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.141 2003/06/26 01:01:48 peter Exp $ # .include From owner-p4-projects@FreeBSD.ORG Wed Jun 25 19:26:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F106537B404; Wed, 25 Jun 2003 19:26:24 -0700 (PDT) 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 A26AC37B401 for ; Wed, 25 Jun 2003 19:26:24 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A0F443FDF for ; Wed, 25 Jun 2003 19:26:24 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5Q2QO0U046924 for ; Wed, 25 Jun 2003 19:26:24 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5Q2QN5u046921 for perforce@freebsd.org; Wed, 25 Jun 2003 19:26:23 -0700 (PDT) Date: Wed, 25 Jun 2003 19:26:23 -0700 (PDT) Message-Id: <200306260226.h5Q2QN5u046921@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 33680 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, 26 Jun 2003 02:26:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=33680 Change 33680 by peter@peter_hammer on 2003/06/25 19:25:56 use i386/biarch64.h as the comment suggested, it works Affected files ... .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#8 edit Differences ... ==== //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#8 (text+ko) ==== @@ -143,10 +143,8 @@ echo 'union tree_node;' >> ${.TARGET} echo 'typedef union tree_node *tree;' >> ${.TARGET} echo '' >> ${.TARGET} -# XXX: consider including i386/biarch64.h instead of below .if ${TARGET_ARCH} == "amd64" - echo '#define TARGET_64BIT_DEFAULT 1' >>${.TARGET} - echo '#define TARGET_BI_ARCH 1' >>${.TARGET} + echo '#include "i386/biarch64.h"' >>${.TARGET} .endif .if ${TARGET_ARCH} == "ia64" echo '#define TARGET_CPU_DEFAULT (MASK_GNU_AS|MASK_GNU_LD)' >>${.TARGET} From owner-p4-projects@FreeBSD.ORG Wed Jun 25 19:32:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 100B437B404; Wed, 25 Jun 2003 19:32:33 -0700 (PDT) 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 BAB9D37B401 for ; Wed, 25 Jun 2003 19:32:32 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D57143FDF for ; Wed, 25 Jun 2003 19:32:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5Q2WW0U048499 for ; Wed, 25 Jun 2003 19:32:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5Q2WV1b048493 for perforce@freebsd.org; Wed, 25 Jun 2003 19:32:31 -0700 (PDT) Date: Wed, 25 Jun 2003 19:32:31 -0700 (PDT) Message-Id: <200306260232.h5Q2WV1b048493@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 33681 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, 26 Jun 2003 02:32:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=33681 Change 33681 by peter@peter_daintree on 2003/06/25 19:31:40 IFC @33679 Affected files ... .. //depot/projects/hammer/gnu/lib/libstdc++/Makefile#13 integrate Differences ... ==== //depot/projects/hammer/gnu/lib/libstdc++/Makefile#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.45 2003/06/14 13:30:32 des Exp $ +# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.46 2003/06/26 01:30:44 peter Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc SRCDIR= ${.CURDIR}/../../../contrib/libstdc++ From owner-p4-projects@FreeBSD.ORG Wed Jun 25 21:00:24 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5587637B405; Wed, 25 Jun 2003 21:00:24 -0700 (PDT) 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 E694E37B404 for ; Wed, 25 Jun 2003 21:00:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 542ED44008 for ; Wed, 25 Jun 2003 21:00:23 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5Q40N0U080380 for ; Wed, 25 Jun 2003 21:00:23 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5Q40Mhh080377 for perforce@freebsd.org; Wed, 25 Jun 2003 21:00:22 -0700 (PDT) Date: Wed, 25 Jun 2003 21:00:22 -0700 (PDT) Message-Id: <200306260400.h5Q40Mhh080377@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 33687 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, 26 Jun 2003 04:00:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=33687 Change 33687 by peter@peter_daintree on 2003/06/25 20:59:59 IFC @33686 Affected files ... .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#9 integrate .. //depot/projects/hammer/lib/Makefile#19 integrate .. //depot/projects/hammer/lib/libpthread/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/hammer/lib/libstand/Makefile#5 integrate .. //depot/projects/hammer/sys/Makefile#5 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#19 integrate .. //depot/projects/hammer/sys/boot/Makefile#7 integrate .. //depot/projects/hammer/sys/boot/common/Makefile.inc#7 integrate .. //depot/projects/hammer/sys/boot/ficl/Makefile#5 integrate .. //depot/projects/hammer/sys/boot/i386/Makefile.inc#3 integrate .. //depot/projects/hammer/sys/boot/i386/boot2/Makefile#5 integrate .. //depot/projects/hammer/sys/boot/i386/btx/Makefile.inc#3 integrate .. //depot/projects/hammer/sys/boot/i386/btx/btxldr/Makefile#4 integrate .. //depot/projects/hammer/sys/boot/i386/loader/Makefile#7 integrate .. //depot/projects/hammer/sys/vm/vm_pageq.c#5 integrate Differences ... ==== //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.68 2003/05/01 15:00:46 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.69 2003/06/26 03:02:32 peter Exp $ # # This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk @@ -144,7 +144,7 @@ echo 'typedef union tree_node *tree;' >> ${.TARGET} echo '' >> ${.TARGET} .if ${TARGET_ARCH} == "amd64" - echo '#include "i386/biarch64.h"' >>${.TARGET} + echo '#include "i386/biarch64.h" >> ${.TARGET} .endif .if ${TARGET_ARCH} == "ia64" echo '#define TARGET_CPU_DEFAULT (MASK_GNU_AS|MASK_GNU_LD)' >>${.TARGET} ==== //depot/projects/hammer/lib/Makefile#19 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.160 2003/06/02 22:22:52 peter Exp $ +# $FreeBSD: src/lib/Makefile,v 1.161 2003/06/26 03:48:23 peter Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: ==== //depot/projects/hammer/lib/libpthread/arch/ia64/include/pthread_md.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/ia64/include/pthread_md.h,v 1.2 2003/06/23 23:15:06 marcel Exp $ + * $FreeBSD: src/lib/libpthread/arch/ia64/include/pthread_md.h,v 1.3 2003/06/26 03:55:58 marcel Exp $ */ #ifndef _PTHREAD_MD_H_ @@ -41,4 +41,34 @@ int ksd_size; }; +void _ia64_enter_uts(kse_func_t uts, struct kse_mailbox *km, void *stack, + size_t stacksz); +int _ia64_restore_context(mcontext_t *mc, intptr_t val, intptr_t *loc); +int _ia64_save_context(mcontext_t *mc); + +static __inline int +_thread_enter_uts(struct kse_thr_mailbox *tm, struct kse_mailbox *km) +{ + if (tm == NULL) + return (-1); + if (!_ia64_save_context(&tm->tm_context.uc_mcontext)) { + _ia64_enter_uts(km->km_func, km, km->km_stack.ss_sp, + km->km_stack.ss_size); + /* We should not reach here. */ + return (-1); + } + return (0); +} + +static __inline int +_thread_switch(struct kse_thr_mailbox *tm, struct kse_thr_mailbox **thrp) +{ + if (tm == NULL) + return (-1); + _ia64_restore_context(&tm->tm_context.uc_mcontext, (intptr_t)tm, + (intptr_t*)thrp); + /* We should not reach here. */ + return (-1); +} + #endif /* _PTHREAD_MD_H_ */ ==== //depot/projects/hammer/lib/libstand/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libstand/Makefile,v 1.38 2002/12/19 19:34:58 jake Exp $ +# $FreeBSD: src/lib/libstand/Makefile,v 1.39 2003/06/26 03:48:01 peter Exp $ # Originally from $NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $ # # Notes: ==== //depot/projects/hammer/sys/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.27 2003/05/08 06:35:39 peter Exp $ +# $FreeBSD: src/sys/Makefile,v 1.28 2003/06/26 03:52:48 peter Exp $ # The boot loader SUBDIR= boot ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#19 (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.387 2003/06/01 20:26:38 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.388 2003/06/26 03:49:54 peter Exp $ machine amd64 cpu HAMMER ==== //depot/projects/hammer/sys/boot/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.16 2003/04/30 22:13:36 peter Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.17 2003/06/26 03:51:56 peter Exp $ .if ${MACHINE_ARCH} == "amd64" .MAKEFLAGS: MACHINE_ARCH=i386 MACHINE=i386 REALLY_AMD64=true ==== //depot/projects/hammer/sys/boot/common/Makefile.inc#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.15 2003/05/01 03:56:29 peter Exp $ +# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.16 2003/06/26 03:51:57 peter Exp $ SRCS+= bcache.c boot.c commands.c console.c devopen.c interp.c SRCS+= interp_backslash.c interp_parse.c ls.c misc.c ==== //depot/projects/hammer/sys/boot/ficl/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.33 2003/06/08 03:11:16 nyan Exp $ +# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.34 2003/06/26 03:51:57 peter Exp $ # .if ${MACHINE_ARCH} == "amd64" .MAKEFLAGS: MACHINE_ARCH=i386 MACHINE=i386 REALLY_AMD64=true ==== //depot/projects/hammer/sys/boot/i386/Makefile.inc#3 (text+ko) ==== @@ -1,6 +1,6 @@ # Common defines for all of /sys/boot/i386/ # -# $FreeBSD: src/sys/boot/i386/Makefile.inc,v 1.3 2002/05/10 00:53:45 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/Makefile.inc,v 1.4 2003/06/26 03:51:57 peter Exp $ LOADER_ADDRESS?= 0x200000 CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 ==== //depot/projects/hammer/sys/boot/i386/boot2/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.46 2003/02/25 15:41:49 ru Exp $ +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.47 2003/06/26 03:51:57 peter Exp $ PROG= boot2 NOMAN= ==== //depot/projects/hammer/sys/boot/i386/btx/Makefile.inc#3 (text+ko) ==== @@ -1,2 +1,2 @@ -# $FreeBSD$ +# $FreeBSD: src/sys/boot/i386/btx/Makefile.inc,v 1.1 2003/06/26 03:51:57 peter Exp $ .include <${.CURDIR}/../../Makefile.inc> ==== //depot/projects/hammer/sys/boot/i386/btx/btxldr/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/btx/btxldr/Makefile,v 1.11 2002/09/17 01:48:55 peter Exp $ +# $FreeBSD: src/sys/boot/i386/btx/btxldr/Makefile,v 1.12 2003/06/26 03:51:57 peter Exp $ M4?= m4 M4FLAGS+= -DLOADER_ADDRESS=${LOADER_ADDRESS} ==== //depot/projects/hammer/sys/boot/i386/loader/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.65 2003/05/31 05:25:17 scottl Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.66 2003/06/26 03:51:57 peter Exp $ PROG= loader STRIP= ==== //depot/projects/hammer/sys/vm/vm_pageq.c#5 (text+ko) ==== @@ -4,7 +4,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_pageq.c,v 1.10 2003/06/11 23:50:50 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_pageq.c,v 1.11 2003/06/26 03:14:40 alc Exp $"); #include #include @@ -46,26 +46,17 @@ } } -static __inline struct vpgqueues * -vm_pageq_aquire(int queue) -{ - struct vpgqueues *vpq = NULL; - - if (queue != PQ_NONE) { - vpq = &vm_page_queues[queue]; - } - return (vpq); -} - void vm_pageq_requeue(vm_page_t m) { int queue = m->queue; struct vpgqueues *vpq; - vpq = vm_pageq_aquire(queue); - TAILQ_REMOVE(&vpq->pl, m, pageq); - TAILQ_INSERT_TAIL(&vpq->pl, m, pageq); + if (queue != PQ_NONE) { + vpq = &vm_page_queues[queue]; + TAILQ_REMOVE(&vpq->pl, m, pageq); + TAILQ_INSERT_TAIL(&vpq->pl, m, pageq); + } } /* From owner-p4-projects@FreeBSD.ORG Wed Jun 25 21:05:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C93C937B404; Wed, 25 Jun 2003 21:05:31 -0700 (PDT) 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 6667237B401 for ; Wed, 25 Jun 2003 21:05:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B2444402F for ; Wed, 25 Jun 2003 21:05:31 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5Q45U0U084261 for ; Wed, 25 Jun 2003 21:05:30 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5Q45UPN084258 for perforce@freebsd.org; Wed, 25 Jun 2003 21:05:30 -0700 (PDT) Date: Wed, 25 Jun 2003 21:05:30 -0700 (PDT) Message-Id: <200306260405.h5Q45UPN084258@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 33689 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, 26 Jun 2003 04:05:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=33689 Change 33689 by peter@peter_daintree on 2003/06/25 21:05:29 IFC @33688 Affected files ... .. //depot/projects/hammer/sys/amd64/conf/GENERIC#20 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#9 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#20 (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.388 2003/06/26 03:49:54 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.389 2003/06/26 04:01:59 peter Exp $ machine amd64 cpu HAMMER ==== //depot/projects/hammer/sys/dev/ciss/ciss.c#9 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.22 2003/05/31 18:41:09 phk Exp $ + * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.23 2003/06/26 04:01:34 ps Exp $ */ /* @@ -758,7 +758,7 @@ return(ENOMEM); } bus_dmamap_load(sc->ciss_command_dmat, sc->ciss_command_map, sc->ciss_command, - sizeof(struct ciss_command) * sc->ciss_max_requests, + CISS_COMMAND_ALLOC_SIZE * sc->ciss_max_requests, ciss_command_map_helper, sc, 0); bzero(sc->ciss_command, CISS_COMMAND_ALLOC_SIZE * sc->ciss_max_requests); From owner-p4-projects@FreeBSD.ORG Thu Jun 26 10:57:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37CD537B405; Thu, 26 Jun 2003 10:57:28 -0700 (PDT) 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 AFD5737B404 for ; Thu, 26 Jun 2003 10:57:27 -0700 (PDT) Received: from mail.speakeasy.net (mail9.speakeasy.net [216.254.0.209]) by mx1.FreeBSD.org (Postfix) with ESMTP id A40E343FBD for ; Thu, 26 Jun 2003 10:57:26 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 11408 invoked from network); 26 Jun 2003 17:57:26 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender )encrypted SMTP for ; 26 Jun 2003 17:57:26 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.9/8.12.9) with ESMTP id h5QHvOGI059669; Thu, 26 Jun 2003 13:57:24 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.4 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200306252205.h5PM5lga058117@repoman.freebsd.org> Date: Thu, 26 Jun 2003 13:57:36 -0400 (EDT) From: John Baldwin To: Peter Wemm cc: Perforce Change Reviews Subject: RE: PERFORCE change 33663 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, 26 Jun 2003 17:57:29 -0000 On 25-Jun-2003 Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=33663 > > Change 33663 by peter@peter_hammer on 2003/06/25 15:05:09 > > Port sym to amd64 This is possibly not correct. Do all hammer's support the P3+ SFENCE and related instructions? Even i386 should probably be using what bus_space_barrier() uses. Heck, sym should probably just be using bus_space_barrier anyways. > Affected files ... > > .. //depot/projects/hammer/sys/dev/sym/sym_hipd.c#6 edit > > Differences ... > > ==== //depot/projects/hammer/sys/dev/sym/sym_hipd.c#6 (text+ko) ==== > > @@ -162,7 +162,7 @@ > * make sense) to be used. > */ > > -#if defined __i386__ > +#if defined __i386__ || defined __amd64__ > #define MEMORY_BARRIER() do { ; } while(0) > #elif defined __alpha__ > #define MEMORY_BARRIER() alpha_mb() -- 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 Jun 26 16:10:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBCAD37B404; Thu, 26 Jun 2003 16:10:24 -0700 (PDT) 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 8471737B401; Thu, 26 Jun 2003 16:10:24 -0700 (PDT) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2959D43FF2; Thu, 26 Jun 2003 16:10:24 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id 0D12B2A7EA; Thu, 26 Jun 2003 16:10:24 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: John Baldwin In-Reply-To: Date: Thu, 26 Jun 2003 16:10:23 -0700 From: Peter Wemm Message-Id: <20030626231024.0D12B2A7EA@canning.wemm.org> cc: Perforce Change Reviews Subject: Re: PERFORCE change 33663 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, 26 Jun 2003 23:10:26 -0000 John Baldwin wrote: > > On 25-Jun-2003 Peter Wemm wrote: > > http://perforce.freebsd.org/chv.cgi?CH=33663 > > > > Change 33663 by peter@peter_hammer on 2003/06/25 15:05:09 > > > > Port sym to amd64 > > This is possibly not correct. Do all hammer's support the P3+ > SFENCE and related instructions? Even i386 should probably be > using what bus_space_barrier() uses. Heck, sym should probably > just be using bus_space_barrier anyways. Yes, they do. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 From owner-p4-projects@FreeBSD.ORG Thu Jun 26 17:30:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08D0637B401; Thu, 26 Jun 2003 17:30:36 -0700 (PDT) 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 6FC1D37B404 for ; Thu, 26 Jun 2003 17:30:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA1C043FA3 for ; Thu, 26 Jun 2003 17:30:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5R0UX0U097758 for ; Thu, 26 Jun 2003 17:30:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5R0UX3G097742 for perforce@freebsd.org; Thu, 26 Jun 2003 17:30:33 -0700 (PDT) Date: Thu, 26 Jun 2003 17:30:33 -0700 (PDT) Message-Id: <200306270030.h5R0UX3G097742@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 33718 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, 27 Jun 2003 00:30:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=33718 Change 33718 by peter@peter_daintree on 2003/06/26 17:30:08 IFC @33716 Affected files ... .. //depot/projects/hammer/etc/defaults/rc.conf#13 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#10 integrate .. //depot/projects/hammer/etc/rc.d/watchdogd#1 branch .. //depot/projects/hammer/gnu/usr.bin/binutils/as/alpha-freebsd/config.h#5 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/as/i386-freebsd/config.h#5 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/as/ia64-freebsd/config.h#4 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h#4 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h#5 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#10 integrate .. //depot/projects/hammer/lib/libc/locale/fix_grouping.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/ldpart.c#4 integrate .. //depot/projects/hammer/lib/libc/locale/lmessages.c#3 integrate .. //depot/projects/hammer/lib/libc/locale/lmonetary.c#4 integrate .. //depot/projects/hammer/lib/libc/locale/lnumeric.c#4 integrate .. //depot/projects/hammer/lib/libc/locale/localeconv.c#3 integrate .. //depot/projects/hammer/lib/libc/locale/nl_langinfo.c#3 integrate .. //depot/projects/hammer/lib/libpthread/arch/ia64/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libpthread/arch/ia64/ia64/context.S#1 branch .. //depot/projects/hammer/lib/libpthread/arch/ia64/ia64/enter_uts.S#1 branch .. //depot/projects/hammer/lib/libz/zlib.3#2 integrate .. //depot/projects/hammer/release/Makefile#31 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#31 integrate .. //depot/projects/hammer/share/man/man4/Makefile#16 integrate .. //depot/projects/hammer/share/man/man4/watchdog.4#1 branch .. //depot/projects/hammer/sys/conf/NOTES#19 integrate .. //depot/projects/hammer/sys/conf/options#17 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep.c#5 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#6 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#10 integrate .. //depot/projects/hammer/sys/modules/Makefile#20 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#11 integrate .. //depot/projects/hammer/usr.bin/locale/locale.1#2 integrate .. //depot/projects/hammer/usr.bin/locale/locale.c#4 integrate .. //depot/projects/hammer/usr.sbin/Makefile#22 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.8#6 integrate .. //depot/projects/hammer/usr.sbin/watchdogd/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/watchdogd/watchdogd.8#1 branch .. //depot/projects/hammer/usr.sbin/watchdogd/watchdogd.c#1 branch Differences ... ==== //depot/projects/hammer/etc/defaults/rc.conf#13 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.179 2003/06/14 22:26:30 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.180 2003/06/26 09:50:50 smkelly Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -430,6 +430,7 @@ jail_set_hostname_allow="YES" # Allow root user in a jail to change its hostname jail_socket_unixiproute_only="YES" # Route only TCP/IP within a jail jail_sysvipc_allow="NO" # Allow SystemV IPC use from within a jail +watchdogd_enable="NO" # Start the software watchdog daemon ############################################################## ### Define source_rc_confs, the mechanism used by /etc/rc.* ## ==== //depot/projects/hammer/etc/rc.d/Makefile#10 (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.18 2003/06/20 09:47:09 phk Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.19 2003/06/26 09:50:51 smkelly Exp $ .include @@ -17,8 +17,8 @@ ntpdate othermta pccard pcvt ppp-user pppoed pwcheck quota random \ rarpd rcconf.sh root route6d routed rpcbind rtadvd rwho savecore \ securelevel sendmail serial sppp sshd swap1 syscons sysctl \ - syslogd timed ttys usbd vinum virecover ypbind yppasswdd ypserv \ - ypset ypupdated ypxfrd + syslogd timed ttys usbd vinum virecover watchdogd ypbind \ + yppasswdd ypserv ypset ypupdated ypxfrd FILESDIR= /etc/rc.d FILESMODE= ${BINMODE} ==== //depot/projects/hammer/gnu/usr.bin/binutils/as/alpha-freebsd/config.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/as/alpha-freebsd/config.h,v 1.9 2002/12/02 09:43:15 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/as/alpha-freebsd/config.h,v 1.10 2003/06/26 16:13:36 obrien Exp $ */ #define HAVE_DECL_GETOPT 1 @@ -226,10 +226,10 @@ #define BFD_ASSEMBLER 1 /* Target alias. */ -#define TARGET_ALIAS "alpha-obrien-freebsd5.0" +#define TARGET_ALIAS "alpha-obrien-freebsd5" /* Canonical target. */ -#define TARGET_CANONICAL "alpha-obrien-freebsd5.0" +#define TARGET_CANONICAL "alpha-obrien-freebsd5" /* Target CPU. */ #define TARGET_CPU "alpha" @@ -238,7 +238,7 @@ #define TARGET_VENDOR "obrien" /* Target OS. */ -#define TARGET_OS "freebsd5.0" +#define TARGET_OS "freebsd5" /* Define if you have the stpcpy function */ #define HAVE_STPCPY 1 ==== //depot/projects/hammer/gnu/usr.bin/binutils/as/i386-freebsd/config.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/as/i386-freebsd/config.h,v 1.9 2002/12/02 09:43:15 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/as/i386-freebsd/config.h,v 1.10 2003/06/26 16:13:36 obrien Exp $ */ #define HAVE_DECL_GETOPT 1 @@ -226,10 +226,10 @@ #define BFD_ASSEMBLER 1 /* Target alias. */ -#define TARGET_ALIAS "i386-obrien-freebsd5.0" +#define TARGET_ALIAS "i386-obrien-freebsd5" /* Canonical target. */ -#define TARGET_CANONICAL "i386-obrien-freebsd5.0" +#define TARGET_CANONICAL "i386-obrien-freebsd5" /* Target CPU. */ #define TARGET_CPU "i386" @@ -238,7 +238,7 @@ #define TARGET_VENDOR "obrien" /* Target OS. */ -#define TARGET_OS "freebsd5.0" +#define TARGET_OS "freebsd5" /* Define if you have the stpcpy function */ #define HAVE_STPCPY 1 ==== //depot/projects/hammer/gnu/usr.bin/binutils/as/ia64-freebsd/config.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/as/ia64-freebsd/config.h,v 1.4 2002/10/20 07:50:18 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/as/ia64-freebsd/config.h,v 1.5 2003/06/26 16:13:36 obrien Exp $ */ #define HAVE_DECL_GETOPT 1 @@ -229,10 +229,10 @@ #define BFD_ASSEMBLER 1 /* Target alias. */ -#define TARGET_ALIAS "ia64-obrien-freebsd5.0" +#define TARGET_ALIAS "ia64-obrien-freebsd5" /* Canonical target. */ -#define TARGET_CANONICAL "ia64-obrien-freebsd5.0" +#define TARGET_CANONICAL "ia64-obrien-freebsd5" /* Target CPU. */ #define TARGET_CPU "ia64" @@ -241,7 +241,7 @@ #define TARGET_VENDOR "obrien" /* Target OS. */ -#define TARGET_OS "freebsd5.0" +#define TARGET_OS "freebsd5" /* Define if you have the stpcpy function */ #define HAVE_STPCPY 1 ==== //depot/projects/hammer/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h,v 1.6 2002/10/20 07:50:18 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h,v 1.7 2003/06/26 16:13:36 obrien Exp $ */ #define HAVE_DECL_GETOPT 1 @@ -229,10 +229,10 @@ #define BFD_ASSEMBLER 1 /* Target alias. */ -#define TARGET_ALIAS "powerpc-obrien-freebsd5.0" +#define TARGET_ALIAS "powerpc-obrien-freebsd5" /* Canonical target. */ -#define TARGET_CANONICAL "powerpc-obrien-freebsd5.0" +#define TARGET_CANONICAL "powerpc-obrien-freebsd5" /* Target CPU. */ #define TARGET_CPU "powerpc" @@ -241,7 +241,7 @@ #define TARGET_VENDOR "obrien" /* Target OS. */ -#define TARGET_OS "freebsd5.0" +#define TARGET_OS "freebsd5" /* Define if you have the stpcpy function */ #define HAVE_STPCPY 1 ==== //depot/projects/hammer/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h,v 1.8 2002/12/02 09:43:15 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h,v 1.9 2003/06/26 16:13:36 obrien Exp $ */ #define HAVE_DECL_GETOPT 1 @@ -226,10 +226,10 @@ #define BFD_ASSEMBLER 1 /* Target alias. */ -#define TARGET_ALIAS "sparc64-obrien-freebsd5.0" +#define TARGET_ALIAS "sparc64-obrien-freebsd5" /* Canonical target. */ -#define TARGET_CANONICAL "sparc64-obrien-freebsd5.0" +#define TARGET_CANONICAL "sparc64-obrien-freebsd5" /* Target CPU. */ #define TARGET_CPU "sparc64" @@ -238,7 +238,7 @@ #define TARGET_VENDOR "obrien" /* Target OS. */ -#define TARGET_OS "freebsd5.0" +#define TARGET_OS "freebsd5" /* Define if you have the stpcpy function */ #define HAVE_STPCPY 1 ==== //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.69 2003/06/26 03:02:32 peter Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.70 2003/06/26 20:34:08 peter Exp $ # # This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk @@ -144,7 +144,7 @@ echo 'typedef union tree_node *tree;' >> ${.TARGET} echo '' >> ${.TARGET} .if ${TARGET_ARCH} == "amd64" - echo '#include "i386/biarch64.h" >> ${.TARGET} + echo '#include "i386/biarch64.h"' >> ${.TARGET} .endif .if ${TARGET_ARCH} == "ia64" echo '#define TARGET_CPU_DEFAULT (MASK_GNU_AS|MASK_GNU_LD)' >>${.TARGET} ==== //depot/projects/hammer/lib/libc/locale/fix_grouping.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/fix_grouping.c,v 1.7 2002/03/22 21:52:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/fix_grouping.c,v 1.8 2003/06/26 10:46:16 phantom Exp $"); #include #include @@ -34,12 +34,15 @@ static const char nogrouping[] = { CHAR_MAX, '\0' }; /* - * "3;3;-1" -> "\003\003\177" + * Internal helper used to convert grouping sequences from string + * representation into POSIX specified form, i.e. + * + * "3;3;-1" -> "\003\003\177\000" */ const char * -__fix_locale_grouping_str(const char *str) { - +__fix_locale_grouping_str(const char *str) +{ char *src, *dst; char n; ==== //depot/projects/hammer/lib/libc/locale/ldpart.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/ldpart.c,v 1.13 2003/06/13 00:14:07 jkh Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/ldpart.c,v 1.14 2003/06/26 10:46:16 phantom Exp $"); #include "namespace.h" #include @@ -39,8 +39,8 @@ #include #include "un-namespace.h" +#include "ldpart.h" #include "setlocale.h" -#include "ldpart.h" static int split_lines(char *, const char *); @@ -80,6 +80,7 @@ namesize = strlen(name) + 1; /* 'PathLocale' must be already set & checked. */ + /* Range checking not needed, 'name' size is limited */ strcpy(filename, _PathLocale); strcat(filename, "/"); ==== //depot/projects/hammer/lib/libc/locale/lmessages.c#3 (text+ko) ==== @@ -25,12 +25,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/lmessages.c,v 1.13 2003/06/13 00:14:07 jkh Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/lmessages.c,v 1.14 2003/06/26 10:46:16 phantom Exp $"); #include +#include "ldpart.h" #include "lmessages.h" -#include "ldpart.h" #define LCMESSAGES_SIZE_FULL (sizeof(struct lc_messages_T) / sizeof(char *)) #define LCMESSAGES_SIZE_MIN \ ==== //depot/projects/hammer/lib/libc/locale/lmonetary.c#4 (text+ko) ==== @@ -25,13 +25,14 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/lmonetary.c,v 1.18 2003/06/13 00:14:07 jkh Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/lmonetary.c,v 1.19 2003/06/26 10:46:16 phantom Exp $"); #include #include #include + +#include "ldpart.h" #include "lmonetary.h" -#include "ldpart.h" extern int __mlocale_changed; extern const char * __fix_locale_grouping_str(const char *); @@ -112,7 +113,7 @@ /* * The six additional C99 international monetary formatting * parameters default to the national parameters when - * reading FreeBSD 4 LC_MONETARY data files. + * reading FreeBSD LC_MONETARY data files. */ #define M_ASSIGN_ICHAR(NAME) \ do { \ @@ -159,6 +160,12 @@ "n_sep_by_space = %d\n" "p_sign_posn = %d\n" "n_sign_posn = %d\n", + "int_p_cs_precedes = %d\n" + "int_p_sep_by_space = %d\n" + "int_n_cs_precedes = %d\n" + "int_n_sep_by_space = %d\n" + "int_p_sign_posn = %d\n" + "int_n_sign_posn = %d\n", _monetary_locale.int_curr_symbol, _monetary_locale.currency_symbol, _monetary_locale.mon_decimal_point, @@ -173,7 +180,13 @@ _monetary_locale.n_cs_precedes[0], _monetary_locale.n_sep_by_space[0], _monetary_locale.p_sign_posn[0], - _monetary_locale.n_sign_posn[0] + _monetary_locale.n_sign_posn[0], + _monetary_locale.int_p_cs_precedes[0], + _monetary_locale.int_p_sep_by_space[0], + _monetary_locale.int_n_cs_precedes[0], + _monetary_locale.int_n_sep_by_space[0], + _monetary_locale.int_p_sign_posn[0], + _monetary_locale.int_n_sign_posn[0] ); } #endif /* LOCALE_DEBUG */ ==== //depot/projects/hammer/lib/libc/locale/lnumeric.c#4 (text+ko) ==== @@ -25,11 +25,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/lnumeric.c,v 1.15 2003/06/13 00:14:07 jkh Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/lnumeric.c,v 1.16 2003/06/26 10:46:16 phantom Exp $"); #include + +#include "ldpart.h" #include "lnumeric.h" -#include "ldpart.h" extern int __nlocale_changed; extern const char *__fix_locale_grouping_str(const char *); ==== //depot/projects/hammer/lib/libc/locale/localeconv.c#3 (text+ko) ==== @@ -36,9 +36,10 @@ static char sccsid[] = "@(#)localeconv.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/localeconv.c,v 1.12 2002/10/09 09:19:28 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/localeconv.c,v 1.13 2003/06/26 10:46:16 phantom Exp $"); #include + #include "lmonetary.h" #include "lnumeric.h" ==== //depot/projects/hammer/lib/libc/locale/nl_langinfo.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2001 Alexey Zelkin + * Copyright (c) 2001, 2003 Alexey Zelkin * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,24 +25,24 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/nl_langinfo.c,v 1.16 2003/06/10 01:26:04 ache Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/nl_langinfo.c,v 1.17 2003/06/26 10:46:16 phantom Exp $"); -#include #include #include +#include #include #include -#include "../stdtime/timelocal.h" #include "lnumeric.h" +#include "lmessages.h" #include "lmonetary.h" -#include "lmessages.h" +#include "../stdtime/timelocal.h" #define _REL(BASE) ((int)item-BASE) char * -nl_langinfo(nl_item item) { - +nl_langinfo(nl_item item) +{ char *ret, *s, *cs; static char *csym = NULL; @@ -126,9 +126,9 @@ ret = (char*) __get_current_messages_locale()->noexpr; break; /* - * All items marked with LEGACY are available, but not recomended - * by SUSv2 to be used in portable applications since they're subject - * to remove in future specification editions + * YESSTR and NOSTR items marked with LEGACY are available, but not + * recomended by SUSv2 to be used in portable applications since + * they're subject to remove in future specification editions. */ case YESSTR: /* LEGACY */ ret = (char*) __get_current_messages_locale()->yesstr; @@ -136,6 +136,9 @@ case NOSTR: /* LEGACY */ ret = (char*) __get_current_messages_locale()->nostr; break; + /* + * SUSv2 special formatted currency string + */ case CRNCYSTR: ret = ""; cs = (char*) __get_current_monetary_locale()->currency_symbol; @@ -162,7 +165,7 @@ } } break; - case D_MD_ORDER: /* local extension */ + case D_MD_ORDER: /* FreeBSD local extension */ ret = (char *) __get_current_time_locale()->md_order; break; default: ==== //depot/projects/hammer/lib/libpthread/arch/ia64/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/lib/libpthread/arch/ia64/Makefile.inc,v 1.2 2003/06/23 23:15:06 marcel Exp $ +# $FreeBSD: src/lib/libpthread/arch/ia64/Makefile.inc,v 1.3 2003/06/26 05:40:15 marcel Exp $ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} -SRCS+= thr_enter_uts.S thr_switch.S +SRCS+= context.S enter_uts.S ==== //depot/projects/hammer/lib/libz/zlib.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/lib/libz/zlib.3,v 1.5 2002/03/11 22:36:26 green Exp $ +.\" $FreeBSD: src/lib/libz/zlib.3,v 1.6 2003/06/26 20:04:27 se Exp $ .\" .TH ZLIB 3 "11 March 2002" .SH NAME @@ -69,7 +69,7 @@ or, if this fails, to the author addresses given below. The zlib home page is: .IP -http://www.cdrom.com/pub/infozip/zlib/ +http://www.gzip.org/zlib/ .LP The data format used by the zlib library is described by RFC (Request for Comments) 1950 to 1952 in the files: ==== //depot/projects/hammer/release/Makefile#31 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.783 2003/06/26 00:55:33 peter Exp $ +# $FreeBSD: src/release/Makefile,v 1.785 2003/06/26 11:23:36 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -18,11 +18,11 @@ # Set these, release builder! # # Fixed version: -#BUILDNAME=5.0-RELEASE +#BUILDNAME=5.1-RELEASE # # Automatic SNAP versioning: DATE != date +%Y%m%d -BASE = 5.0 +BASE = 5.1 BUILDNAME?=${BASE}-${DATE}-SNAP # #CHROOTDIR=/junk/release @@ -277,9 +277,7 @@ FIXIT_TARGET= .endif -.if !defined(CRUNCH_TARGETS) -CRUNCH_TARGETS= boot fixit -.endif +CRUNCH_TARGETS?=boot fixit .if !defined(FIXIT_TARGET) FIXIT_TARGET= release.10 ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#31 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.578 2003/06/21 00:04:11 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.580 2003/06/26 21:22:00 bmah Exp $ 2000 @@ -123,7 +123,9 @@ Kernel Changes - + A kernel software watchdog facility has been implemented. + For more information, see &man.watchdog.4; and + &man.watchdogd.8;. @@ -152,9 +154,16 @@ Network Interface Support + The new &man.ath.4; and &man.ath.hal.4; drivers provide + support for 802.11a/b/g devices based on the AR5210, AR5211, + and AR5212 chips. + A bug in the &man.bge.4; driver that prevented it from working correctly at 10 Mbps has been fixed. + The 802.11 support layer has been rewritten to allow for + future growth and new features. + @@ -250,7 +259,7 @@ Digitalis release. texinfo has been updated from 4.5 - to 4.6. + to 4.6. &merged; ==== //depot/projects/hammer/share/man/man4/Makefile#16 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.212 2003/06/25 13:21:55 harti Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.213 2003/06/26 09:50:51 smkelly Exp $ MAN= aac.4 \ acpi.4 \ @@ -270,6 +270,7 @@ vlan.4 \ vpo.4 \ vr.4 \ + watchdog.4 \ wb.4 \ wi.4 \ witness.4 \ ==== //depot/projects/hammer/sys/conf/NOTES#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1155 2003/06/25 13:21:04 harti Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1156 2003/06/26 09:50:51 smkelly Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -2065,6 +2065,13 @@ options HW_WDOG # +# Add software watchdog routines. This will add some sysctl OIDs that +# can be used in combination with an external daemon to create a +# software-based watchdog solution. +# +options WATCHDOG + +# # Disable swapping of upages and stack pages. This option removes all # code which actually performs swapping, so it's not possible to turn # it back on at run-time. ==== //depot/projects/hammer/sys/conf/options#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.399 2003/06/25 14:51:20 sam Exp $ +# $FreeBSD: src/sys/conf/options,v 1.400 2003/06/26 09:50:51 smkelly Exp $ # # On the handling of kernel options # @@ -442,6 +442,7 @@ NPX_DEBUG opt_debug_npx.h NETATALKDEBUG opt_atalk.h SI_DEBUG opt_debug_si.h +WATCHDOG opt_watchdog.h # Fb options FB_DEBUG opt_fb.h ==== //depot/projects/hammer/sys/dev/ep/if_ep.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ */ /* - * $FreeBSD: src/sys/dev/ep/if_ep.c,v 1.114 2003/03/29 22:27:41 mdodd Exp $ + * $FreeBSD: src/sys/dev/ep/if_ep.c,v 1.117 2003/06/26 17:02:52 mux Exp $ * * Promiscuous mode added and interrupt logic slightly changed * to reduce the number of adapter failures. Transceiver select @@ -480,28 +480,25 @@ ep_if_start(ifp) struct ifnet *ifp; { - struct ep_softc *sc = ifp->if_softc; + struct ep_softc *sc; u_int len; - struct mbuf *m; - struct mbuf *top; + struct mbuf *m, *m0; int s, pad; - if (sc->gone) { + sc = ifp->if_softc; + if (sc->gone) return; - } while (inw(BASE + EP_STATUS) & S_COMMAND_IN_PROGRESS); - if (ifp->if_flags & IFF_OACTIVE) { + if (ifp->if_flags & IFF_OACTIVE) return; - } startagain: /* Sneak a peek at the next packet */ - m = ifp->if_snd.ifq_head; - if (m == 0) { + IF_DEQUEUE(&ifp->if_snd, m0); + if (m0 == NULL) return; - } - for (len = 0, top = m; m; m = m->m_next) + for (len = 0, m = m0; m != NULL; m = m->m_next) len += m->m_len; pad = (4 - len) & 3; @@ -513,9 +510,8 @@ */ if (len + pad > ETHER_MAX_LEN) { /* packet is obviously too large: toss it */ - ++ifp->if_oerrors; - IF_DEQUEUE(&ifp->if_snd, m); - m_freem(m); + ifp->if_oerrors++; + m_freem(m0); goto readcheck; } if (inw(BASE + EP_W1_FREE_TX) < len + pad + 4) { @@ -524,21 +520,20 @@ /* make sure */ if (inw(BASE + EP_W1_FREE_TX) < len + pad + 4) { ifp->if_flags |= IFF_OACTIVE; + IF_PREPEND(&ifp->if_snd, m0); return; } } else { outw(BASE + EP_COMMAND, SET_TX_AVAIL_THRESH | EP_THRESH_DISABLE); } - IF_DEQUEUE(&ifp->if_snd, m); - s = splhigh(); outw(BASE + EP_W1_TX_PIO_WR_1, len); outw(BASE + EP_W1_TX_PIO_WR_1, 0x0); /* Second dword meaningless */ if (EP_FTST(sc, F_ACCESS_32_BITS)) { - for (top = m; m != 0; m = m->m_next) { + for (m = m0; m != NULL; m = m->m_next) { if (m->m_len > 3) outsl(BASE + EP_W1_TX_PIO_WR_1, mtod(m, caddr_t), m->m_len / 4); @@ -547,7 +542,7 @@ mtod(m, caddr_t) + (m->m_len & (~3)), m->m_len & 3); } } else { - for (top = m; m != 0; m = m->m_next) { + for (m = m0; m != NULL; m = m->m_next) { if (m->m_len > 1) outsw(BASE + EP_W1_TX_PIO_WR_1, mtod(m, caddr_t), m->m_len / 2); @@ -562,11 +557,11 @@ splx(s); - BPF_MTAP(ifp, top); + BPF_MTAP(ifp, m0); ifp->if_timer = 2; ifp->if_opackets++; - m_freem(top); + m_freem(m0); /* * Is another packet coming in? We don't want to overflow the tiny RX @@ -578,9 +573,8 @@ * we check if we have packets left, in that case we prepare to come * back later */ - if (ifp->if_snd.ifq_head) { + if (ifp->if_snd.ifq_head) outw(BASE + EP_COMMAND, SET_TX_AVAIL_THRESH | 8); - } return; } goto startagain; ==== //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/dsp.c,v 1.63 2003/05/01 16:31:21 orion Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/dsp.c,v 1.64 2003/06/26 13:13:18 mdodd Exp $"); #define OLDPCM_IOCTL @@ -774,10 +774,8 @@ if (maxfrags == 0) maxfrags = CHN_2NDBUFMAXSIZE / fragsz; - if (maxfrags < 2) { - ret = EINVAL; - break; - } + if (maxfrags < 2) + maxfrags = 2; if (maxfrags * fragsz > CHN_2NDBUFMAXSIZE) maxfrags = CHN_2NDBUFMAXSIZE / fragsz; ==== //depot/projects/hammer/sys/kern/kern_clock.c#10 (text+ko) ==== @@ -39,9 +39,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.160 2003/06/15 00:31:23 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.161 2003/06/26 09:50:51 smkelly Exp $"); #include "opt_ntp.h" +#include "opt_ddb.h" +#include "opt_watchdog.h" #include #include @@ -71,6 +73,10 @@ #include #endif +#ifdef DDB +#include +#endif + #ifdef DEVICE_POLLING extern void hardclock_device_poll(void); #endif /* DEVICE_POLLING */ @@ -84,6 +90,22 @@ SYSCTL_OPAQUE(_kern, OID_AUTO, cp_time, CTLFLAG_RD, &cp_time, sizeof(cp_time), "LU", "CPU time statistics"); +#ifdef WATCHDOG +static int sysctl_watchdog_reset(SYSCTL_HANDLER_ARGS); +static void watchdog_fire(void); + +static int watchdog_enabled; +static unsigned int watchdog_ticks; +static int watchdog_timeout = 20; + +SYSCTL_NODE(_debug, OID_AUTO, watchdog, CTLFLAG_RW, 0, "System watchdog"); +SYSCTL_INT(_debug_watchdog, OID_AUTO, enabled, CTLFLAG_RW, &watchdog_enabled, + 0, "Enable the watchdog"); +SYSCTL_INT(_debug_watchdog, OID_AUTO, timeout, CTLFLAG_RW, &watchdog_timeout, + 0, "Timeout for watchdog checkins"); + +#endif /* WATCHDOG */ + /* * Clock handling routines. * @@ -228,6 +250,12 @@ */ if (need_softclock) swi_sched(softclock_ih, 0); + +#ifdef WATCHDOG + if (watchdog_enabled > 0 && + (int)(ticks - watchdog_ticks) >= (hz * watchdog_timeout)) + watchdog_fire(); +#endif /* WATCHDOG */ } /* @@ -481,3 +509,57 @@ SYSCTL_PROC(_kern, KERN_CLOCKRATE, clockrate, CTLTYPE_STRUCT|CTLFLAG_RD, 0, 0, sysctl_kern_clockrate, "S,clockinfo", "Rate and period of various kernel clocks"); + +#ifdef WATCHDOG +/* + * Reset the watchdog timer to ticks, thus preventing the watchdog + * from firing for another watchdog timeout period. + */ +static int +sysctl_watchdog_reset(SYSCTL_HANDLER_ARGS) +{ + int ret; + + ret = 0; + watchdog_ticks = ticks; + return sysctl_handle_int(oidp, &ret, 0, req); +} + +SYSCTL_PROC(_debug_watchdog, OID_AUTO, reset, CTLFLAG_RW, 0, 0, + sysctl_watchdog_reset, "I", "Reset the watchdog"); + +/* + * Handle a watchdog timeout by dumping interrupt information and + * then either dropping to DDB or panicing. + */ +static void +watchdog_fire(void) +{ + int nintr; + u_int64_t inttotal; + u_long *curintr; + char *curname; + + curintr = intrcnt; + curname = intrnames; + inttotal = 0; + nintr = eintrcnt - intrcnt; + + printf("interrupt total\n"); + while (--nintr >= 0) { + if (*curintr) + printf("%-12s %20lu\n", curname, *curintr); + curname += strlen(curname) + 1; + inttotal += *curintr++; + } + printf("Total %20llu\n", inttotal); + +#ifdef DDB + db_print_backtrace(); + Debugger("watchdog timeout"); +#else /* !DDB */ + panic("watchdog timeout"); +#endif /* DDB */ +} + +#endif /* WATCHDOG */ ==== //depot/projects/hammer/sys/modules/Makefile#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.334 2003/06/24 13:35:46 iedowse Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.335 2003/06/26 08:06:31 ru Exp $ .if !defined(NOCRYPT) || defined(ALL_MODULES) .if exists(${.CURDIR}/../opencrypto) @@ -299,6 +299,7 @@ .endif .if defined(ALL_MODULES) +SUBDIR+=null SUBDIR+=ufs .endif ==== //depot/projects/hammer/sys/net80211/ieee80211_input.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.2 2003/06/25 17:42:36 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.3 2003/06/26 22:11:19 sam Exp $"); #include "opt_inet.h" @@ -941,6 +941,8 @@ ni->ni_fhdwell = ic->ic_bss->ni_fhdwell; ni->ni_fhindex = ic->ic_bss->ni_fhindex; if (ni->ni_associd == 0) { + /* XXX handle rollover at 2007 */ + /* XXX guarantee uniqueness */ ni->ni_associd = 0xc000 | ic->ic_bss->ni_associd++; newassoc = 1; } else ==== //depot/projects/hammer/sys/vm/vm_page.c#11 (text+ko) ==== @@ -101,7 +101,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.252 2003/06/22 21:35:41 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.253 2003/06/26 15:44:03 alc Exp $"); #include #include @@ -719,7 +719,8 @@ while (TRUE) { m = vm_pageq_find(PQ_CACHE, color & PQ_L2_MASK, FALSE); if (m && ((m->flags & (PG_BUSY|PG_UNMANAGED)) || m->busy || - m->hold_count || m->wire_count)) { + m->hold_count || m->wire_count || + !VM_OBJECT_TRYLOCK(m->object))) { vm_page_deactivate(m); continue; } @@ -765,6 +766,7 @@ vm_page_t >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 26 17:53:07 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A4DB37B404; Thu, 26 Jun 2003 17:53:06 -0700 (PDT) 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 085E737B401 for ; Thu, 26 Jun 2003 17:53:06 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 81F2743FDF for ; Thu, 26 Jun 2003 17:53:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5R0r50U005401 for ; Thu, 26 Jun 2003 17:53:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5R0r4Kt005391 for perforce@freebsd.org; Thu, 26 Jun 2003 17:53:04 -0700 (PDT) Date: Thu, 26 Jun 2003 17:53:04 -0700 (PDT) Message-Id: <200306270053.h5R0r4Kt005391@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 33723 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, 27 Jun 2003 00:53:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=33723 Change 33723 by peter@peter_hammer on 2003/06/26 17:52:45 Back out the evil hack to binutils contrib sources. David may find this less offensive. Instead of configuring libbfd with two ambiguous elf32_i386 targets, just configure one of them. This stops the autodetect code from complaining about the ambiguity. I think this is a bug on the i386 platform too, FWIW. Affected files ... .. //depot/projects/hammer/contrib/binutils/bfd/elf32-i386-fbsd.c#3 edit .. //depot/projects/hammer/contrib/binutils/bfd/elf32-i386.c#6 edit .. //depot/projects/hammer/contrib/gcc/config/i386/biarch64.h#3 edit .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.amd64#3 edit Differences ... ==== //depot/projects/hammer/contrib/binutils/bfd/elf32-i386-fbsd.c#3 (text+ko) ==== @@ -22,9 +22,6 @@ #define ELF_ARCH bfd_arch_i386 #define ELF_MACHINE_CODE EM_386 #define ELF_MAXPAGESIZE 0x1000 -#ifdef __amd64__ -#define ELF_OSABI ELFOSABI_FREEBSD -#endif #include "bfd.h" #include "sysdep.h" ==== //depot/projects/hammer/contrib/binutils/bfd/elf32-i386.c#6 (text+ko) ==== @@ -629,20 +629,6 @@ /* Allocate our special target data. */ struct elf_i386_obj_tdata *new_tdata; bfd_size_type amt = sizeof (struct elf_i386_obj_tdata); -#ifdef __amd64__ - Elf_Internal_Ehdr * i_ehdrp; /* ELF file header, internal form. */ - - i_ehdrp = elf_elfheader (abfd); - -#ifdef ELF_OSABI - if (i_ehdrp->e_ident[EI_OSABI] != ELF_OSABI) - return false; -#endif -#if defined(__FreeBSD__) && !defined(ELF_OSABI) - if (i_ehdrp->e_ident[EI_OSABI] == ELFOSABI_FREEBSD) - return false; -#endif -#endif new_tdata = bfd_zalloc (abfd, amt); if (new_tdata == NULL) return false; ==== //depot/projects/hammer/contrib/gcc/config/i386/biarch64.h#3 (text+ko) ==== @@ -21,5 +21,5 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define TARGET_64BIT_DEFAULT 1 -#define TARGET_BI_ARCH 1 +#define TARGET_64BIT_DEFAULT +#define TARGET_BI_ARCH ==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.amd64#3 (text+ko) ==== @@ -1,21 +1,22 @@ # $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.amd64,v 1.1 2003/04/26 03:28:21 obrien Exp $ -.include "${.CURDIR}/Makefile.i386" - -# Get the i386 DEFAULT_VECTOR and VECS. -I386_VECS:= ${VECS} - DEFAULT_VECTOR= bfd_elf64_x86_64_vec -VECS= bfd_elf64_x86_64_vec ${I386_VECS} +VECS= bfd_elf64_x86_64_vec bfd_elf32_i386_freebsd_vec SRCS+= elf64-amd64-fbsd.c elf64-target.h elf64-gen.c elf64.c +SRCS+= cpu-i386.c elf32-i386-fbsd.c elf32-target.h elf32.c elflink.c CLEANFILES+= elf64-target.h elf64-target.h: elfxx-target.h sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET} +CLEANFILES+= elf32-target.h + +elf32-target.h: elfxx-target.h + sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET} + CLEANFILES+= elf64-amd64-fbsd.c elf64-amd64-fbsd.c: ${.CURDIR}/elf-fbsd-brand.c ${SRCDIR}/bfd/elf64-x86-64.c From owner-p4-projects@FreeBSD.ORG Thu Jun 26 18:28:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AACA637B404; Thu, 26 Jun 2003 18:28:49 -0700 (PDT) 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 5C81737B401 for ; Thu, 26 Jun 2003 18:28:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB65043FEA for ; Thu, 26 Jun 2003 18:28:48 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5R1Sm0U016202 for ; Thu, 26 Jun 2003 18:28:48 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5R1SmAL016199 for perforce@freebsd.org; Thu, 26 Jun 2003 18:28:48 -0700 (PDT) Date: Thu, 26 Jun 2003 18:28:48 -0700 (PDT) Message-Id: <200306270128.h5R1SmAL016199@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 33724 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, 27 Jun 2003 01:28:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=33724 Change 33724 by cvance@cvance_demo on 2003/06/26 18:28:30 Update SEBSD policy slightly - allows system to boot in enforcing mode, with (very) basic support. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/getty.te#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/initrc.te#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ldconfig.te#3 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/getty.te#2 (text+ko) ==== @@ -41,5 +41,8 @@ allow getty_t tty_device_t:chr_file rw_file_perms; allow getty_t ttyfile:chr_file rw_file_perms; +rw_dir_create_file(getty_t, var_lock_t) -rw_dir_create_file(getty_t, var_lock_t) +# Allow getty _secure_path call to stat /root/.login_conf +allow getty_t sysadm_home_t:dir r_dir_perms; + ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/initrc.te#2 (text+ko) ==== @@ -76,6 +76,7 @@ # Update /etc/ld.so.cache. allow initrc_t ld_so_cache_t:file rw_file_perms; +allow initrc_t ld_so_cache_t:file unlink; # Update /etc/mail. allow initrc_t etc_mail_t:file rw_file_perms; @@ -98,6 +99,7 @@ # Access /var/db/entropy. allow initrc_t var_db_entropy_t:file rw_file_perms; allow initrc_t var_db_entropy_t:file unlink; +allow initrc_t var_db_entropy_t:dir read; # Create lock file. allow initrc_t var_lock_t:dir create_dir_perms; @@ -154,6 +156,8 @@ ifdef(`gpm.te', `allow initrc_t gpmctl_t:sock_file setattr;') allow initrc_t var_spool_t:file rw_file_perms; +allow initrc_t var_spool_t:file { create unlink }; +allow initrc_t var_spool_t:dir rw_dir_perms; ifdef(`pump.te', `allow initrc_t pump_var_run_t:sock_file unlink;') @@ -209,3 +213,6 @@ allow initrc_t pidfile:sock_file unlink; allow initrc_t tmpfile:sock_file unlink; rw_dir_create_file(initrc_t, var_lib_t) + +allow initrc_t devfs_t:dir rw_dir_perms; +allow initrc_t devfs_t:lnk_file create; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ldconfig.te#3 (text+ko) ==== @@ -25,3 +25,5 @@ allow ldconfig_t etc_t:file r_file_perms; allow ldconfig_t fs_t:filesystem getattr; + +allow ldconfig_t init_t:fd use; From owner-p4-projects@FreeBSD.ORG Thu Jun 26 19:38:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 058FD37B404; Thu, 26 Jun 2003 19:38:14 -0700 (PDT) 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 94B6C37B401 for ; Thu, 26 Jun 2003 19:38:13 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3963843FE0 for ; Thu, 26 Jun 2003 19:38:13 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5R2cC0U037563 for ; Thu, 26 Jun 2003 19:38:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5R2cC8O037552 for perforce@freebsd.org; Thu, 26 Jun 2003 19:38:12 -0700 (PDT) Date: Thu, 26 Jun 2003 19:38:12 -0700 (PDT) Message-Id: <200306270238.h5R2cC8O037552@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 33725 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, 27 Jun 2003 02:38:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=33725 Change 33725 by peter@peter_hammer on 2003/06/26 19:37:25 mark off some finished items Affected files ... .. //depot/projects/hammer/TODO.txt#3 edit Differences ... ==== //depot/projects/hammer/TODO.txt#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$P4: //depot/projects/hammer/TODO.txt#2 $ +$P4: //depot/projects/hammer/TODO.txt#3 $ reread the logs etc and check out the "XXX worry about this later" stuff @@ -29,9 +29,6 @@ (peter: basic functionality, uses -fno-omit-frame-pointer.. disassembler still expects 32 bit code but compiles) -libstdc++.so (build bug, tries to link libgcc.a (non-pic) into the .so, - but the libstdc++.a works). - crashdumps? teach libkvm about crashdumps. (need to lookup KPML4, 4 level page tree etc) @@ -49,9 +46,6 @@ SSE MXCSR register as well as the x87 control word - netbsd have already done this, we can look at theirs) -increase direct map base size to 4GB to cover all of pci mapping space -so that pmap_mapdev can use it without consuming kvm. - factor out common compat/freebsd32/* and compat/ia32/* from ia64 and amd64 trees. freebsd32 should be for running 32 bit binaries on a 64 bit kernel, while ia32 is for special MD bits. Lots of missing syscalls. @@ -70,3 +64,10 @@ boot blocks (need gcc -m32 to work) (fixed in p4 tree, needs binutils patches etc) + +increase direct map base size to 4GB to cover all of pci mapping space +so that pmap_mapdev can use it without consuming kvm. + +libstdc++.so (build bug, tries to link libgcc.a (non-pic) into the .so, + but the libstdc++.a works). + From owner-p4-projects@FreeBSD.ORG Thu Jun 26 19:39:16 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6AB337B404; Thu, 26 Jun 2003 19:39:15 -0700 (PDT) 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 6853B37B401 for ; Thu, 26 Jun 2003 19:39:15 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12AD743FD7 for ; Thu, 26 Jun 2003 19:39:15 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5R2dE0U037604 for ; Thu, 26 Jun 2003 19:39:14 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5R2dEk7037601 for perforce@freebsd.org; Thu, 26 Jun 2003 19:39:14 -0700 (PDT) Date: Thu, 26 Jun 2003 19:39:14 -0700 (PDT) Message-Id: <200306270239.h5R2dEk7037601@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 33726 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, 27 Jun 2003 02:39:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=33726 Change 33726 by peter@peter_hammer on 2003/06/26 19:38:26 note binutils todo Affected files ... .. //depot/projects/hammer/TODO.txt#4 edit Differences ... ==== //depot/projects/hammer/TODO.txt#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$P4: //depot/projects/hammer/TODO.txt#3 $ +$P4: //depot/projects/hammer/TODO.txt#4 $ reread the logs etc and check out the "XXX worry about this later" stuff @@ -55,6 +55,9 @@ revert ppp(8) compiler bug workaround after gcc-3.3 is imported. +do something about config changes for binutils to enable i386 output +(in p4, not cvs) http://people.freebsd.org/~peter/binutils.diff + ======= DONE ======= ppp(8) (compiler bug, hack in http://people.freebsd.org/~peter/hammer.diff, but gcc-3.3 would be much better) From owner-p4-projects@FreeBSD.ORG Thu Jun 26 23:58:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DE1037B407; Thu, 26 Jun 2003 23:58:33 -0700 (PDT) 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 D886D37B409 for ; Thu, 26 Jun 2003 23:58:32 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B7B343FF7 for ; Thu, 26 Jun 2003 23:58:32 -0700 (PDT) (envelope-from mikeh@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5R6wW0U025221 for ; Thu, 26 Jun 2003 23:58:32 -0700 (PDT) (envelope-from mikeh@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5R6wWmo025218 for perforce@freebsd.org; Thu, 26 Jun 2003 23:58:32 -0700 (PDT) Date: Thu, 26 Jun 2003 23:58:32 -0700 (PDT) Message-Id: <200306270658.h5R6wWmo025218@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mikeh@freebsd.org using -f From: Mike Heffner To: Perforce Change Reviews Subject: PERFORCE change 33734 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, 27 Jun 2003 06:58:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=33734 Change 33734 by mikeh@mikeh_cowpie on 2003/06/26 23:58:25 For my first P4 commit, update the URL in the cookbook. Affected files ... .. //depot/doc/p4cookbook.txt#4 edit Differences ... ==== //depot/doc/p4cookbook.txt#4 (text+ko) ==== @@ -21,7 +21,7 @@ Subject: p4 cookbook Besides the quickstart: -http://www.perforce.com/perforce/doc.011/manuals/boilerplates/quickstart.html +http://www.perforce.com/perforce/doc.022/manuals/boilerplates/quickstart.html here are some pointers. Step 0: snarf: ftp://ftp.perforce.com/pub/perforce/r01.1/bin.freebsd4/p4 From owner-p4-projects@FreeBSD.ORG Fri Jun 27 12:26:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 143D637B404; Fri, 27 Jun 2003 12:26:13 -0700 (PDT) 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 A3B7C37B401 for ; Fri, 27 Jun 2003 12:26:12 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 598B543FF7 for ; Fri, 27 Jun 2003 12:26:11 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5RJQB0U070064 for ; Fri, 27 Jun 2003 12:26:11 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5RJQAMS070061 for perforce@freebsd.org; Fri, 27 Jun 2003 12:26:10 -0700 (PDT) Date: Fri, 27 Jun 2003 12:26:10 -0700 (PDT) Message-Id: <200306271926.h5RJQAMS070061@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 33751 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, 27 Jun 2003 19:26:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=33751 Change 33751 by peter@peter_hammer on 2003/06/27 12:25:25 IFC @33750 Affected files ... .. //depot/projects/hammer/lib/Makefile#20 integrate .. //depot/projects/hammer/lib/libc/gen/getpwent.c#7 integrate .. //depot/projects/hammer/lib/libc/sys/uuidgen.2#4 integrate .. //depot/projects/hammer/lib/libpthread/arch/ia64/ia64/context.S#2 integrate .. //depot/projects/hammer/lib/libthr/Makefile#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/Makefile#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/amd64/Makefile#1 branch .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/amd64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#1 branch .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/Makefile#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/amd64/Makefile#1 branch .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/amd64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/Makefile#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/amd64/Makefile#1 branch .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#8 integrate .. //depot/projects/hammer/release/doc/share/examples/Makefile.relnotesng#5 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#10 integrate .. //depot/projects/hammer/share/man/man4/ath.4#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#9 integrate .. //depot/projects/hammer/sys/dev/ata/ata-card.c#9 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#13 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci.c#10 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohcivar.h#4 integrate .. //depot/projects/hammer/sys/dev/wi/if_wavelan_ieee.h#5 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#12 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_denode.c#8 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#10 integrate .. //depot/projects/hammer/sys/ia64/ia64/busdma_machdep.c#8 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.c#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.h#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/hammer/sys/pci/agp_via.c#6 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/busdma_machdep.c#7 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#14 integrate .. //depot/projects/hammer/usr.bin/ar/Makefile#2 delete .. //depot/projects/hammer/usr.bin/ar/append.c#2 delete .. //depot/projects/hammer/usr.bin/ar/ar.1#2 delete .. //depot/projects/hammer/usr.bin/ar/ar.1aout#2 delete .. //depot/projects/hammer/usr.bin/ar/ar.5#2 delete .. //depot/projects/hammer/usr.bin/ar/ar.c#2 delete .. //depot/projects/hammer/usr.bin/ar/archive.c#2 delete .. //depot/projects/hammer/usr.bin/ar/archive.h#2 delete .. //depot/projects/hammer/usr.bin/ar/contents.c#2 delete .. //depot/projects/hammer/usr.bin/ar/delete.c#2 delete .. //depot/projects/hammer/usr.bin/ar/extern.h#2 delete .. //depot/projects/hammer/usr.bin/ar/extract.c#2 delete .. //depot/projects/hammer/usr.bin/ar/misc.c#2 delete .. //depot/projects/hammer/usr.bin/ar/move.c#2 delete .. //depot/projects/hammer/usr.bin/ar/pathnames.h#2 delete .. //depot/projects/hammer/usr.bin/ar/print.c#2 delete .. //depot/projects/hammer/usr.bin/ar/replace.c#2 delete .. //depot/projects/hammer/usr.bin/nm/Makefile#2 delete .. //depot/projects/hammer/usr.bin/nm/nm.1#3 delete .. //depot/projects/hammer/usr.bin/nm/nm.1aout#3 delete .. //depot/projects/hammer/usr.bin/nm/nm.c#3 delete .. //depot/projects/hammer/usr.bin/size/Makefile#2 delete .. //depot/projects/hammer/usr.bin/size/size.1#2 delete .. //depot/projects/hammer/usr.bin/size/size.1aout#2 delete .. //depot/projects/hammer/usr.bin/size/size.c#2 delete .. //depot/projects/hammer/usr.bin/strings/Makefile#2 delete .. //depot/projects/hammer/usr.bin/strings/strings.1#2 delete .. //depot/projects/hammer/usr.bin/strings/strings.1aout#2 delete .. //depot/projects/hammer/usr.bin/strings/strings.c#2 delete .. //depot/projects/hammer/usr.bin/strip/Makefile#2 delete .. //depot/projects/hammer/usr.bin/strip/strip.1#2 delete .. //depot/projects/hammer/usr.bin/strip/strip.1aout#2 delete .. //depot/projects/hammer/usr.bin/strip/strip.c#2 delete Differences ... ==== //depot/projects/hammer/lib/Makefile#20 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.161 2003/06/26 03:48:23 peter Exp $ +# $FreeBSD: src/lib/Makefile,v 1.162 2003/06/27 07:41:51 marcel Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -40,9 +40,12 @@ _csu=csu .endif +# libc_r is obsolete on ia64. +.if ${MACHINE_ARCH} != "ia64" .if !defined(NOLIBC_R) _libc_r= libc_r .endif +.endif .if !defined(NO_BIND) _libbind= libbind @@ -69,6 +72,9 @@ .endif .if ${MACHINE_ARCH} == "ia64" +.if !defined(NOLIBPTHREAD) +_libpthread= libpthread +.endif .if !defined(NOLIBTHR) _libthr= libthr .endif ==== //depot/projects/hammer/lib/libc/gen/getpwent.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getpwent.c,v 1.81 2003/05/01 19:03:13 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getpwent.c,v 1.82 2003/06/27 03:37:44 jwd Exp $"); #include "namespace.h" #include @@ -938,14 +938,15 @@ nis_map(char *domain, enum nss_lookup_type how, char *buffer, size_t bufsize, int *master) { - int rv, order; + int rv; + char *outname; *master = 0; if (geteuid() == 0) { if (snprintf(buffer, bufsize, "master.passwd.by%s", (how == nss_lt_id) ? "uid" : "name") >= bufsize) return (NS_UNAVAIL); - rv = yp_order(domain, buffer, &order); + rv = yp_master(domain, buffer, &outname); if (rv == 0) { *master = 1; return (NS_SUCCESS); @@ -954,7 +955,7 @@ if (snprintf(buffer, bufsize, "passwd.by%s", (how == nss_lt_id) ? "uid" : "name") >= bufsize) return (NS_UNAVAIL); - rv = yp_order(domain, buffer, &order); + rv = yp_master(domain, buffer, &outname); if (rv == 0) return (NS_SUCCESS); return (NS_UNAVAIL); ==== //depot/projects/hammer/lib/libc/sys/uuidgen.2#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/uuidgen.2,v 1.6 2002/12/19 09:40:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/uuidgen.2,v 1.7 2003/06/27 13:41:29 yar Exp $ .\" .Dd May 26, 2002 .Dt UUIDGEN 2 @@ -83,7 +83,7 @@ The least significant 16 bits of the most significant 28 bits of the 60-bit timestamp. This field is stored in the native byte-order. -.It Va time_hi_and_reserved +.It Va time_hi_and_version The most significant 12 bits of the 60-bit timestamp multiplexed with a 4-bit version number. The version number is stored in the most significant 4 bits of the 16-bit ==== //depot/projects/hammer/lib/libpthread/arch/ia64/ia64/context.S#2 (text+ko) ==== @@ -25,16 +25,301 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/arch/ia64/ia64/context.S,v 1.1 2003/06/26 05:40:15 marcel Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/arch/ia64/ia64/context.S,v 1.2 2003/06/27 06:15:13 marcel Exp $"); + +#define SIZEOF_SPECIAL (18*8) /* * int _ia64_restore_context(mcontext_t *mc, intptr_t val, intptr_t *loc); */ ENTRY(_ia64_restore_context, 3) +{ .mmi + invala + mov ar.rsc=0xc + add r32=16,r32 + ;; +} +{ .mmi + loadrs + ld8 r12=[r32] // sp + add r31=8,r32 + ;; +} +{ .mii + ld8 r16=[r31],16 // unat (before) + add r30=16,r32 + add r14=SIZEOF_SPECIAL,r32 + ;; +} +{ .mmi + ld8 r17=[r30],16 // rp + ld8 r18=[r31],16 // pr + mov r2=r33 + ;; +} +{ .mmi + ld8 r19=[r30],16 // pfs + ld8 r20=[r31],24 // bspstore + mov rp=r17 + ;; +} +{ .mmi + ld8 r21=[r30],24 // rnat + ld8 r13=[r31],16 // tp + mov pr=r18,0x1fffe + ;; +} +{ .mmi + ld8 r22=[r30],16 // rsc + ld8 r23=[r31],16 // fpsr + mov r3=r34 + ;; +} +{ .mmi + ld8 r17=[r14],8 // unat (after) + mov ar.bspstore=r20 + cmp.ne p15,p0=r0,r3 + ;; +} +{ .mmi + mov ar.rnat=r21 + mov ar.unat=r17 + add r15=8,r14 + ;; +} +{ .mmi + ld8.fill r4=[r14],16 // r4 + ld8.fill r5=[r15],16 // r5 + mov ar.pfs=r19 + ;; +} +{ .mmi + ld8.fill r6=[r14],16 // r6 + ld8.fill r7=[r15],16 // r7 + nop 0 + ;; +} +{ .mmi + mov ar.unat=r16 + mov ar.rsc=r22 + nop 0 +} +{ .mmi + ld8 r17=[r14],16 // b1 + ld8 r18=[r15],16 // b2 + nop 0 + ;; +} +{ .mmi + ld8 r19=[r14],16 // b3 + ld8 r20=[r15],16 // b4 + mov b1=r17 + ;; +} +{ .mmi + ld8 r16=[r14],24 // b5 + ld8 r17=[r15],32 // lc + mov b2=r18 + ;; +} +{ .mmi + ldf.fill f2=[r14],32 + ldf.fill f3=[r15],32 + mov b3=r19 + ;; +} +{ .mmi + ldf.fill f4=[r14],32 + ldf.fill f5=[r15],32 + mov b4=r20 + ;; +} +{ .mmi + ldf.fill f16=[r14],32 + ldf.fill f17=[r15],32 + mov b5=r16 + ;; +} +{ .mmi + ldf.fill f18=[r14],32 + ldf.fill f19=[r15],32 + mov ar.lc=r17 + ;; +} + ldf.fill f20=[r14],32 + ldf.fill f21=[r15],32 + ;; + ldf.fill f22=[r14],32 + ldf.fill f23=[r15],32 + ;; + ldf.fill f24=[r14],32 + ldf.fill f25=[r15],32 + ;; + ldf.fill f26=[r14],32 + ldf.fill f27=[r15],32 + ;; + ldf.fill f28=[r14],32 + ldf.fill f29=[r15],32 + ;; +{ .mmi + ldf.fill f30=[r14] + ldf.fill f31=[r15] + add r8=1,r0 + ;; +} +{ .mmb +(p15) st8 [r3]=r2 + mov ar.fpsr=r23 + br.ret.sptk rp + ;; +} END(_ia64_restore_context) /* * int _ia64_save_context(mcontext_t *mc); */ ENTRY(_ia64_save_context, 1) +{ .mmi + mov r14=ar.rsc + mov r15=ar.fpsr + add r31=8,r32 + ;; +} +{ .mmi + st8 [r32]=r0,16 + st8 [r31]=r0,16 + nop 0 + ;; +} +{ .mmi + mov ar.rsc=0xc + mov r16=ar.unat + nop 0 + ;; +} +{ .mmi + flushrs + st8 [r32]=sp,16 // sp + mov r17=rp + ;; +} +{ .mmi + st8 [r31]=r16,16 // unat (before) + st8 [r32]=r17,16 // rp + mov r16=pr + ;; +} +{ .mmi + st8 [r31]=r16,16 // pr + mov r17=ar.bsp + mov r16=ar.pfs + ;; +} +{ .mmi + st8 [r32]=r16,16 // pfs + st8 [r31]=r17,16 // bspstore + nop 0 + ;; +} +{ .mmi + mov r16=ar.rnat + mov ar.rsc=r14 + add r30=SIZEOF_SPECIAL-(6*8),r32 + ;; +} +{ .mmi + st8 [r32]=r16,16 // rnat + st8 [r31]=r0,16 // __spare + nop 0 + ;; +} +{ .mmi + st8 [r32]=r13,16 // tp + st8 [r31]=r14,16 // rsc + mov r16=b1 + ;; +} +{ .mmi + st8 [r32]=r15,10*8 // fpr + st8 [r31]=r0,8*8 // psr + nop 0 + ;; +} + /* callee_saved */ +{ .mmi + .mem.offset 8,0 + st8.spill [r31]=r4,16 // r4 + .mem.offset 16,0 + st8.spill [r32]=r5,16 // r5 + mov r17=b2 + ;; +} +{ .mmi + .mem.offset 24,0 + st8.spill [r31]=r6,16 // r6 + .mem.offset 32,0 + st8.spill [r32]=r7,16 // r7 + mov r18=b3 + ;; +} +{ .mmi + st8 [r31]=r16,16 // b1 + mov r16=ar.unat + mov r19=b4 + ;; +} +{ .mmi + st8 [r30]=r16 // unat (after) + st8 [r32]=r17,16 // b2 + mov r16=b5 + ;; +} +{ .mmi + st8 [r31]=r18,16 // b3 + st8 [r32]=r19,16 // b4 + mov r17=ar.lc + ;; +} + st8 [r31]=r16,16 // b5 + st8 [r32]=r17,16 // lc + ;; + st8 [r31]=r0,24 // __spare + stf.spill [r32]=f2,32 + ;; + stf.spill [r31]=f3,32 + stf.spill [r32]=f4,32 + ;; + stf.spill [r31]=f5,32 + stf.spill [r32]=f16,32 + ;; + stf.spill [r31]=f17,32 + stf.spill [r32]=f18,32 + ;; + stf.spill [r31]=f19,32 + stf.spill [r32]=f20,32 + ;; + stf.spill [r31]=f21,32 + stf.spill [r32]=f22,32 + ;; + stf.spill [r31]=f23,32 + stf.spill [r32]=f24,32 + ;; + stf.spill [r31]=f25,32 + stf.spill [r32]=f26,32 + ;; + stf.spill [r31]=f27,32 + stf.spill [r32]=f28,32 + ;; +{ .mmi + stf.spill [r31]=f29,32 + stf.spill [r32]=f30 + add r8=0,r0 + ;; +} +{ .mmb + stf.spill [r31]=f31 + mf + br.ret.sptk rp + ;; +} END(_ia64_save_context) ==== //depot/projects/hammer/lib/libthr/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libthr/Makefile,v 1.3 2003/05/23 09:48:20 mtm Exp $ +# $FreeBSD: src/lib/libthr/Makefile,v 1.4 2003/06/27 18:07:47 marcel Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -26,4 +26,16 @@ .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" +.if !defined(NOLIBC_R) +.if ${MACHINE_ARCH} == "ia64" +SYMLINKS+=libthr.a ${LIBDIR}/libc_r.a +.if !defined(NOPIC) +SYMLINKS+=libthr.so ${SHLIBDIR}/libc_r.so +.endif +.if !defined(NOPROFILE) +SYMLINKS+=libthr_p.a ${LIBDIR}/libc_r_p.a +.endif +.endif +.endif + .include ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/Makefile#3 (text+ko) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.5 2002/11/08 18:36:04 bmah Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.6 2003/06/27 03:50:35 bmah Exp $ RELN_ROOT?= ${.CURDIR}/../.. SUBDIR = alpha +SUBDIR+= amd64 SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#2 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -8,6 +8,7 @@ + ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/Makefile#3 (text+ko) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile,v 1.5 2002/11/08 18:36:04 bmah Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile,v 1.6 2003/06/27 03:50:36 bmah Exp $ RELN_ROOT?= ${.CURDIR}/../.. SUBDIR = alpha +SUBDIR+= amd64 SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/Makefile#3 (text+ko) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile,v 1.5 2002/11/08 18:36:04 bmah Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile,v 1.6 2003/06/27 03:50:36 bmah Exp $ RELN_ROOT?= ${.CURDIR}/../.. SUBDIR = alpha +SUBDIR+= amd64 SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 ==== //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#8 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -11,7 +11,7 @@ FreeBSD ╔в╔М╔╦╔╖╔╞╔х - $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.87 2003/06/11 21:08:52 hrs Exp $ + $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.88 2003/06/27 17:15:20 hrs Exp $ 2000 @@ -138,7 +138,9 @@ ╔╚║╪╔м╔К╓нйя╧╧ею - + ╔╚║╪╔м╔К╓к╔╫╔у╔х╔╕╔╖╔╒╔╕╔╘╔ц╔а╔и╔ц╔╟╣║г╫╓╛╪баУ╓╣╓Л╓ч╓╥╓©║ё + ╬э╓╥╓╞╓о &man.watchdog.4; ╓х + &man.watchdogd.8; ╓Р╓╢мВ╓╞╓ю╓╣╓╓║ё @@ -149,6 +151,9 @@ ╬О╓к PCI ЁД╓Й╧Ч╓ъ╓╛╩х╓О╓Л╓К╓Х╓╕╓к╓й╓Й╓ч╓╥╓©║ё ╓Ё╓Л╓к╓Х╓Й║╒╨ё╓ч╓г╩хмя╓г╓╜╓й╓╚╓ц╓© (фц╓к╔И╔ц╔в╔х╔ц╔в╓н) PCI ╔╚║╪╔и╓╛╩хмя╓г╓╜╓К╓Х╓╕╓к╓й╓ц╓ф╓╓╓ч╓╧║ё + + PAE ╣║г╫╓Р╓╒╓КфцдЙ╓ннл╓н╔А╔Б╔Й╓РеК╨э╓╥╓ф╓╓╓К╔ч╔╥╔С╓гм╜╦З╓к╓╥╓©╬Л╧Г╓к║╒ + ╔╚║╪╔м╔К╓╛╔я╔к╔ц╔╞╓╣╓╩╓К╦╤╟Ь╓х╓й╓Кю╟©Т╠И╩╩╓н╔╙║╪╔п╔у╔М║╪╓╛╫╓ю╣╓╣╓Л╓ч╓╥╓©║ё @@ -163,7 +168,15 @@ ╔м╔ц╔х╔О║╪╔╞╔╓╔С╔©║╪╔у╔╖╔╓╔╧╓нбп╠Ч╬У╤╥ - + &man.ath.4; ╓╙╓Х╓с &man.ath.hal.4; ╔и╔И╔╓╔п╓╛©╥╓╥╓╞ди╡ц╓╣╓Л╓ч╓╥╓©║ё + ╓Ё╓Л╓о║╒AR5210, AR5211, AR5212 ╔ы║╪╔╧╓н + 802.11a/b/g ╔г╔п╔╓╔╧╓кбп╠Ч╓╥╓ф╓╓╓ч╓╧║ё + + &man.bge.4; ╓к╓╒╓ц╓©╔п╔╟╓╛╫╓ю╣╓╣╓Л║╒ + 10Mbps ╓гю╣╬О╓кф╟╨Н╓╧╓К╓Х╓╕╓к╓й╓Й╓ч╓╥╓©║ё + + 802.11 бп╠Ч╔Л╔╓╔Д╓╛║╒ + Ёхд╔╓Д©╥╣║г╫╓нди╡ц╓╛╡дг╫╓й╓Х╓╕╓к╫Я╓╜д╬╓╣╓Л╓ч╓╥╓©║ё @@ -187,6 +200,12 @@ geom_vol_ffs ╓х╓╓╓ц╓©║╒╓╣╓ч╓╤╓ч╓╒╓К &man.geom.4; ╔Б╔╦╔Е║╪╔К╓╛║╒ ╔╚║╪╔м╔К╔Б╔╦╔Е║╪╔К╓х╓╥╓ффи╓ъ╧Ч╓ъ╡дг╫╓к╓й╓Й╓ч╓╥╓©║ё + + ╔ч╔К╔а╔я╔╧╔╧╔х╔Л║╪╔╦╔г╔п╔╓╔╧╓н╦║╫п╓Д║╒╔╒╔╞╔╩╔╧╔я╔╧а╙бР╓Р╡дг╫╓к╓╧╓К + GEOM_FOX ╔Б╔╦╔Е║╪╔К╓╛ди╡ц╓╣╓Л╓ч╓╥╓©║ё + + ╬╬╡╪ CR-562 ╓╙╓Х╓с CR-563 CD ╔и╔И╔╓╔ж╓кбп╠Ч╓╥╓© + &man.matcd.4; ╔и╔И╔╓╔п╓╛║╒╨ф╓с╩х╓╗╓К╓Х╓╕╓к╓й╓Й╓ч╓╥╓©║ё @@ -210,6 +229,8 @@ юъдЙ╓к╓о╓╫╓Л╓╬╓Л║╒, , ╔╙╔в╔╥╔Г╔С╓Р╩х╓╓╓ч╓╧║ё + devfs ╓╛и╛©э╓х╓й╓ц╓©╓©╓А║╒dev_db ╔Ф║╪╔ф╔ё╔Й╔ф╔ё╓о╨О╫Э╓╣╓Л╓ч╓╥╓©║ё + libcipher DES ╟е╧Ф╔И╔╓╔ж╔И╔Й╓╛╨О╫Э╓╣╓Л╓ч╓╥╓©║ё ╓Ё╓Л╓И╓н╣║г╫╓о╓╧╓ы╓ф libcrypto ╔И╔╓╔ж╔И╔Й╓г @@ -221,18 +242,36 @@ libthr 1:1 ╔╧╔Л╔ц╔и╔И╔╓╔ж╔И╔Й╓╛╔г╔у╔╘╔К╔х╓г╧╫цш╓╣╓Л╓К╓Х╓╕╓к╓й╓Й╓ч╓╥╓©║ё + &man.locale.1; ╔Ф║╪╔ф╔ё╔Й╔ф╔ё╓╛╨ф╪баУ╓╣╓Л║╒POSIX + и╦╫Ю╓к╫Ю╣Р╓╥╓ч╓╥╓©║ё + ╔╡╔╧╔х╔М╔╟╔╓╔С╓кбп╠Ч╓╧╓К &man.pam.guest.8; PAM ╔Б╔╦╔Е║╪╔К╓╛ди╡ц╓╣╓Л╓ч╓╥╓©║ё ╓Ё╓Л╓о pam_ftp(8) ╔Б╔╦╔Е║╪╔К╓Рцж╓╜╢╧╓╗╓К╓Б╓н╓г╓╧║ё + + &man.ps.1; ╓к║╒Ёф╔в╔М╔╩╔╧╓н╔╚║╪╔м╔К╔╧╔Л╔ц╔и╓Ри╫╪╗╓╧╓К + ╔╙╔в╔╥╔Г╔С╓╛ди╡ц╓╣╓Л╓ч╓╥╓©║ё ╢Сбё╔╫╔у╔х╔╕╔╖╔╒ + BIND ╓╛╔п║╪╔╦╔Г╔С 8.3.4 + ╓╚╓И║╒╔п║╪╔╦╔Г╔С 8.3.6 ╓к╧╧©╥╓╣╓Л╓ч╓╥╓©║ё + + lukemftp ╓╛╔п║╪╔╦╔Г╔С + 1.6beta2 ╓╚╓И║╒NetBSD ╓н 2003 г╞ 6 ╥Н 15 + фЭ╩Чею╓н╔╧╔й╔ц╔в╔╥╔Г╔ц╔х╓к╧╧©╥╓╣╓Л╓ч╓╥╓©║ё + OpenPAM ╓╛ - Digitalis ╔Й╔Й║╪╔╧╓к╧╧©╥╓╣╓Л╓ч╓╥╓©║ё + Dianthus ╔Й╔Й║╪╔╧╓к╧╧©╥╓╣╓Л╓ч╓╥╓©║ё + + texinfo ╓╛╔п║╪╔╦╔Г╔С 4.5 + ╓╚╓И║╒╔п║╪╔╦╔Г╔С 4.6 ╓к╧╧©╥╓╣╓Л╓ч╓╥╓©║ё + &merged; + Ports/Packages Collection ╔╓╔С╔у╔И╔╧╔х╔И╔╞╔а╔Ц ==== //depot/projects/hammer/release/doc/share/examples/Makefile.relnotesng#5 (text+ko) ==== @@ -1,12 +1,12 @@ # -*- makefile -*- # -# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.8 2002/11/13 17:28:44 bmah Exp $ +# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.9 2003/06/27 03:50:36 bmah Exp $ # # Sample makefile for rendering and uploading RELNOTESng files outside # the build tree. # -ARCHS= alpha ia64 i386 pc98 sparc64 +ARCHS= alpha amd64 ia64 i386 pc98 sparc64 MULTITEXTS= installation relnotes hardware UNITEXTS= readme errata early-adopter ==== //depot/projects/hammer/sbin/ipfw/ipfw2.c#10 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.28 2003/06/23 22:32:14 luigi Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.29 2003/06/27 17:18:14 luigi Exp $ */ #include @@ -1225,7 +1225,7 @@ case O_VERREVPATH: printf(" verrevpath"); break; - + case O_KEEP_STATE: printf(" keep-state"); break; @@ -1277,9 +1277,7 @@ if (!d->expire && !(d->dyn_type == O_LIMIT_PARENT)) return; } - bcopy(&d->rule, &rulenum, sizeof(rulenum)); - printf("%05d %*llu %*llu (%ds)", rulenum, pcwidth, align_uint64(&d->pcnt), bcwidth, align_uint64(&d->bcnt), d->expire); @@ -1519,7 +1517,6 @@ bcopy(&((struct ip_fw *)data)->next_rule, &set_disable, sizeof(set_disable)); - for (i = 0, msg = "disable" ; i < 31; i++) if ( (set_disable & (1< -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.38 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.39 2003/06/27 08:31:47 scottl Exp $"); #include #include @@ -94,6 +94,7 @@ vm_offset_t busaddress; /* address in bus space */ bus_dmamap_callback_t *callback; void *callback_arg; + struct mtx *callback_mtx; void *sgmaphandle; /* handle into sgmap */ STAILQ_ENTRY(bus_dmamap) links; }; @@ -931,8 +932,12 @@ while ((map = STAILQ_FIRST(&bounce_map_callbacklist)) != NULL) { STAILQ_REMOVE_HEAD(&bounce_map_callbacklist, links); mtx_unlock(&bounce_lock); + if (map->callback_mtx != NULL) + mtx_lock(map->callback_mtx); bus_dmamap_load(map->dmat, map, map->buf, map->buflen, map->callback, map->callback_arg, /*flags*/0); + if (map->callback_mtx != NULL) + mtx_unlock(map->callback_mtx); mtx_lock(&bounce_lock); } mtx_unlock(&bounce_lock); ==== //depot/projects/hammer/sys/dev/ata/ata-card.c#9 (text+ko) ==== @@ -25,7 +25,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/dev/ata/ata-card.c,v 1.14 2003/06/17 12:33:53 imp Exp $ + * $FreeBSD: src/sys/dev/ata/ata-card.c,v 1.15 2003/06/27 03:25:43 imp Exp $ */ #include @@ -131,10 +131,6 @@ start + ATA_ALTOFFSET, ATA_ALTIOSIZE); } } - else { - bus_release_resource(dev, SYS_RES_IOPORT, rid, io); - return ENXIO; - } /* allocate the altport range */ rid = ATA_ALTADDR_RID; ==== //depot/projects/hammer/sys/dev/ata/ata-chipset.c#13 (text+ko) ==== @@ -25,7 +25,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/dev/ata/ata-chipset.c,v 1.30 2003/06/19 15:11:04 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.31 2003/06/27 10:11:54 grehan Exp $ */ #include "opt_ata.h" #include @@ -1509,6 +1509,12 @@ } else ctlr->setmode = ata_cmd_setmode; + + if ((pci_read_config(dev, 0x51, 1) & 0x08) != 0x08) { + device_printf(dev, "secondary channel disabled\n"); + ctlr->channels = 1; + } + return 0; } ==== //depot/projects/hammer/sys/dev/firewire/fwohci.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.52 2003/06/15 04:09:26 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.53 2003/06/27 00:27:33 simokawa Exp $ * */ @@ -144,7 +144,6 @@ static int fwohci_itxbuf_enable __P((struct firewire_comm *, int)); static int fwohci_itx_disable __P((struct firewire_comm *, int)); static void fwohci_timeout __P((void *)); -static void fwohci_poll __P((struct firewire_comm *, int, int)); static void fwohci_set_intr __P((struct firewire_comm *, int)); static int fwohci_add_rx_buf __P((struct fwohci_dbch *, struct fwohcidb_tr *, int, struct fwdma_alloc *)); @@ -2010,7 +2009,7 @@ #endif } -static void +void fwohci_poll(struct firewire_comm *fc, int quick, int count) { int s; ==== //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/fwohci_pci.c,v 1.23 2003/06/04 04:26:14 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/fwohci_pci.c,v 1.24 2003/06/27 00:27:33 simokawa Exp $ */ #define BOUNCE_BUFFER_TEST 0 @@ -317,8 +317,9 @@ * Clear the bus reset event flag to start transactions even when * interrupt is disabled during the boot process. */ + DELAY(250); /* 2 cycles */ s = splfw(); - fwohci_intr((void *)sc); + fwohci_poll((void *)sc, 0, -1); splx(s); return 0; ==== //depot/projects/hammer/sys/dev/firewire/fwohcivar.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/fwohcivar.h,v 1.8 2003/04/17 03:38:02 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/fwohcivar.h,v 1.9 2003/06/27 00:27:33 simokawa Exp $ * */ @@ -84,6 +84,7 @@ void fwohci_intr __P((void *arg)); int fwohci_init __P((struct fwohci_softc *, device_t)); +void fwohci_poll __P((struct firewire_comm *, int, int)); void fwohci_reset __P((struct fwohci_softc *, device_t)); int fwohci_detach __P((struct fwohci_softc *, device_t)); int fwohci_resume __P((struct fwohci_softc *, device_t)); ==== //depot/projects/hammer/sys/dev/wi/if_wavelan_ieee.h#5 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/wi/if_wavelan_ieee.h,v 1.17 2003/01/15 20:11:31 sam Exp $ + * $FreeBSD: src/sys/dev/wi/if_wavelan_ieee.h,v 1.18 2003/06/27 00:49:04 sam Exp $ */ #ifndef _IF_WAVELAN_IEEE_H @@ -466,9 +466,9 @@ u_int8_t wi_src_addr[6]; u_int16_t wi_len; }; -#define WI_DATA_HDRLEN WI_802_11_OFFSET -#define WI_MGMT_HDRLEN WI_802_11_OFFSET_RAW -#define WI_CTL_HDRLEN WI_802_11_OFFSET_RAW +#define WI_DATA_HDRLEN 0x44 +#define WI_MGMT_HDRLEN 0x3C +#define WI_CTL_HDRLEN 0x3C /* ==== //depot/projects/hammer/sys/dev/wi/if_wi.c#12 (text+ko) ==== @@ -62,7 +62,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.142 2003/06/13 00:40:37 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.143 2003/06/27 00:49:04 sam Exp $"); #define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */ #define WI_HERMES_STATS_WAR /* Work around stats counter bug. */ @@ -145,7 +145,7 @@ static int wi_newstate(void *, enum ieee80211_state); -static int wi_scan_ap(struct wi_softc *); +static int wi_scan_ap(struct wi_softc *, u_int16_t, u_int16_t); static void wi_scan_result(struct wi_softc *, int, int); static void wi_dump_pkt(struct wi_frame *, struct ieee80211_node *, int rssi); @@ -1297,6 +1297,89 @@ } static void +wi_rx_monitor(struct wi_softc *sc, int fid) +{ + struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = &ic->ic_if; + struct wi_frame *rx_frame; + struct mbuf *m; + int datlen, hdrlen; + + /* first allocate mbuf for packet storage */ + m = m_getcl(M_DONTWAIT, MT_DATA, 0); + if (m == NULL) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 27 12:30:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7435837B405; Fri, 27 Jun 2003 12:30:33 -0700 (PDT) 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 C11E937B401 for ; Fri, 27 Jun 2003 12:30:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9ECE43FEC for ; Fri, 27 Jun 2003 12:30:27 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5RJUR0U070315 for ; Fri, 27 Jun 2003 12:30:27 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5RJUJ5O070263 for perforce@freebsd.org; Fri, 27 Jun 2003 12:30:19 -0700 (PDT) Date: Fri, 27 Jun 2003 12:30:19 -0700 (PDT) Message-Id: <200306271930.h5RJUJ5O070263@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 33752 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, 27 Jun 2003 19:30:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=33752 Change 33752 by jhb@jhb_laptop on 2003/06/27 12:30:05 IFC @33748. Affected files ... .. //depot/projects/smpng/sys/Makefile#4 integrate .. //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#17 integrate .. //depot/projects/smpng/sys/alpha/alpha/interrupt.c#21 integrate .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#46 integrate .. //depot/projects/smpng/sys/alpha/alpha/trap.c#49 integrate .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#24 integrate .. //depot/projects/smpng/sys/alpha/include/param.h#6 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#14 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_mount.c#10 integrate .. //depot/projects/smpng/sys/amd64/amd64/mem.c#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#7 integrate .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#5 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/smpng/sys/amd64/include/param.h#4 integrate .. //depot/projects/smpng/sys/amd64/include/pmap.h#4 integrate .. //depot/projects/smpng/sys/boot/Makefile#9 integrate .. //depot/projects/smpng/sys/boot/common/Makefile.inc#5 integrate .. //depot/projects/smpng/sys/boot/ficl/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/forth/beastie.4th#2 integrate .. //depot/projects/smpng/sys/boot/i386/Makefile.inc#3 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#11 integrate .. //depot/projects/smpng/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/smpng/sys/boot/i386/btx/btxldr/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#12 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/main.c#14 integrate .. //depot/projects/smpng/sys/cam/cam.c#5 integrate .. //depot/projects/smpng/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.c#17 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#17 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#9 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#40 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_low.c#10 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_low_pisa.c#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#10 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#9 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#16 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#8 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_targ_bh.c#6 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#9 integrate .. //depot/projects/smpng/sys/coda/coda_fbsd.c#5 integrate .. //depot/projects/smpng/sys/coda/coda_namecache.c#7 integrate .. //depot/projects/smpng/sys/coda/coda_psdev.c#10 integrate .. //depot/projects/smpng/sys/coda/coda_subr.c#8 integrate .. //depot/projects/smpng/sys/coda/coda_venus.c#6 integrate .. //depot/projects/smpng/sys/coda/coda_vfsops.c#12 integrate .. //depot/projects/smpng/sys/coda/coda_vfsops.h#3 integrate .. //depot/projects/smpng/sys/coda/coda_vnops.c#11 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#28 integrate .. //depot/projects/smpng/sys/compat/linux/linux_file.c#19 integrate .. //depot/projects/smpng/sys/compat/linux/linux_getcwd.c#12 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#27 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ipc.c#14 integrate .. //depot/projects/smpng/sys/compat/linux/linux_mib.c#9 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#39 integrate .. //depot/projects/smpng/sys/compat/linux/linux_signal.c#14 integrate .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#11 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#14 integrate .. //depot/projects/smpng/sys/compat/linux/linux_sysctl.c#9 integrate .. //depot/projects/smpng/sys/compat/linux/linux_uid16.c#15 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.c#9 integrate .. //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#18 integrate .. //depot/projects/smpng/sys/compat/svr4/imgact_svr4.c#9 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#14 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_filio.c#12 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ioctl.c#10 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ipc.c#4 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#25 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_resource.c#8 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_signal.c#11 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_socket.c#6 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sockio.c#7 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#12 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#14 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#13 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_termios.c#6 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ttold.c#5 integrate .. //depot/projects/smpng/sys/conf/NOTES#46 integrate .. //depot/projects/smpng/sys/conf/files#79 integrate .. //depot/projects/smpng/sys/conf/files.i386#42 integrate .. //depot/projects/smpng/sys/conf/files.pc98#43 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#28 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#22 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#20 integrate .. //depot/projects/smpng/sys/conf/majors#25 integrate .. //depot/projects/smpng/sys/conf/options#55 integrate .. //depot/projects/smpng/sys/conf/options.alpha#11 integrate .. //depot/projects/smpng/sys/conf/options.amd64#4 integrate .. //depot/projects/smpng/sys/conf/options.i386#27 integrate .. //depot/projects/smpng/sys/conf/options.ia64#15 integrate .. //depot/projects/smpng/sys/conf/options.pc98#28 integrate .. //depot/projects/smpng/sys/conf/options.sparc64#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwregs.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/COPYRIGHT#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/README#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/ah_desc.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/ah_devid.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/ah_if.m#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/ah_osdep.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/ah_osdep.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/version.h#1 branch .. //depot/projects/smpng/sys/crypto/blowfish/bf_enc.c#3 integrate .. //depot/projects/smpng/sys/crypto/blowfish/bf_skey.c#3 integrate .. //depot/projects/smpng/sys/crypto/cast128/cast128.c#3 integrate .. //depot/projects/smpng/sys/crypto/md5.c#4 integrate .. //depot/projects/smpng/sys/crypto/rc4/rc4.c#3 integrate .. //depot/projects/smpng/sys/crypto/rijndael/rijndael-alg-fst.c#2 integrate .. //depot/projects/smpng/sys/crypto/rijndael/rijndael-api-fst.c#4 integrate .. //depot/projects/smpng/sys/crypto/sha1.c#3 integrate .. //depot/projects/smpng/sys/crypto/sha2/sha2.c#5 integrate .. //depot/projects/smpng/sys/ddb/db_access.c#2 integrate .. //depot/projects/smpng/sys/ddb/db_break.c#6 integrate .. //depot/projects/smpng/sys/ddb/db_command.c#12 integrate .. //depot/projects/smpng/sys/ddb/db_elf.c#4 integrate .. //depot/projects/smpng/sys/ddb/db_examine.c#5 integrate .. //depot/projects/smpng/sys/ddb/db_expr.c#4 integrate .. //depot/projects/smpng/sys/ddb/db_input.c#7 integrate .. //depot/projects/smpng/sys/ddb/db_kld.c#3 integrate .. //depot/projects/smpng/sys/ddb/db_lex.c#4 integrate .. //depot/projects/smpng/sys/ddb/db_output.c#3 integrate .. //depot/projects/smpng/sys/ddb/db_print.c#2 integrate .. //depot/projects/smpng/sys/ddb/db_ps.c#20 integrate .. //depot/projects/smpng/sys/ddb/db_run.c#6 integrate .. //depot/projects/smpng/sys/ddb/db_sym.c#3 integrate .. //depot/projects/smpng/sys/ddb/db_sysctl.c#2 integrate .. //depot/projects/smpng/sys/ddb/db_trap.c#2 integrate .. //depot/projects/smpng/sys/ddb/db_variables.c#3 integrate .. //depot/projects/smpng/sys/ddb/db_watch.c#4 integrate .. //depot/projects/smpng/sys/ddb/db_write_cmd.c#2 integrate .. //depot/projects/smpng/sys/debugscripts/.gdbinit#2 delete .. //depot/projects/smpng/sys/debugscripts/gdbinit.i386#2 delete .. //depot/projects/smpng/sys/debugscripts/gdbinit.kernel#2 delete .. //depot/projects/smpng/sys/debugscripts/gdbinit.vinum#2 delete .. //depot/projects/smpng/sys/dev/aac/aac_disk.c#15 integrate .. //depot/projects/smpng/sys/dev/advansys/advansys.c#6 integrate .. //depot/projects/smpng/sys/dev/advansys/adwcam.c#6 integrate .. //depot/projects/smpng/sys/dev/ahb/ahb.c#7 integrate .. //depot/projects/smpng/sys/dev/aic/aic.c#6 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#14 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#11 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.c#11 integrate .. //depot/projects/smpng/sys/dev/amd/amd.c#5 integrate .. //depot/projects/smpng/sys/dev/amr/amr_cam.c#7 integrate .. //depot/projects/smpng/sys/dev/ata/ata-card.c#12 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#15 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#9 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#1 branch .. //depot/projects/smpng/sys/dev/ath/if_ath_pci.c#1 branch .. //depot/projects/smpng/sys/dev/ath/if_athioctl.h#1 branch .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#1 branch .. //depot/projects/smpng/sys/dev/ciss/ciss.c#16 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_scsi.c#7 integrate .. //depot/projects/smpng/sys/dev/en/if_en_pci.c#1 branch .. //depot/projects/smpng/sys/dev/en/midway.c#15 integrate .. //depot/projects/smpng/sys/dev/en/midwayvar.h#6 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep.c#7 integrate .. //depot/projects/smpng/sys/dev/fatm/firmware.h#1 branch .. //depot/projects/smpng/sys/dev/fatm/if_fatm.c#1 branch .. //depot/projects/smpng/sys/dev/fatm/if_fatm_rate.h#1 branch .. //depot/projects/smpng/sys/dev/fatm/if_fatmreg.h#1 branch .. //depot/projects/smpng/sys/dev/fatm/if_fatmvar.h#1 branch .. //depot/projects/smpng/sys/dev/firewire/firewire.c#19 integrate .. //depot/projects/smpng/sys/dev/firewire/firewirereg.h#9 integrate .. //depot/projects/smpng/sys/dev/firewire/fwcrom.c#5 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#17 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohcivar.h#6 integrate .. //depot/projects/smpng/sys/dev/firewire/iec13213.h#6 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#19 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#38 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm.c#1 branch .. //depot/projects/smpng/sys/dev/hatm/if_hatm_intr.c#1 branch .. //depot/projects/smpng/sys/dev/hatm/if_hatm_ioctl.c#1 branch .. //depot/projects/smpng/sys/dev/hatm/if_hatm_rx.c#1 branch .. //depot/projects/smpng/sys/dev/hatm/if_hatm_tx.c#1 branch .. //depot/projects/smpng/sys/dev/hatm/if_hatmconf.h#1 branch .. //depot/projects/smpng/sys/dev/hatm/if_hatmreg.h#1 branch .. //depot/projects/smpng/sys/dev/hatm/if_hatmvar.h#1 branch .. //depot/projects/smpng/sys/dev/iicbus/iicbb.c#3 integrate .. //depot/projects/smpng/sys/dev/iicbus/iiconf.h#3 integrate .. //depot/projects/smpng/sys/dev/ips/ips.c#2 integrate .. //depot/projects/smpng/sys/dev/ips/ips.h#2 integrate .. //depot/projects/smpng/sys/dev/ips/ips_commands.c#2 integrate .. //depot/projects/smpng/sys/dev/ips/ips_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#22 integrate .. //depot/projects/smpng/sys/dev/matcd/creativeif.h#1 branch .. //depot/projects/smpng/sys/dev/matcd/matcd.c#1 branch .. //depot/projects/smpng/sys/dev/matcd/matcd_data.h#1 branch .. //depot/projects/smpng/sys/dev/matcd/matcd_isa.c#1 branch .. //depot/projects/smpng/sys/dev/matcd/matcddrv.h#1 branch .. //depot/projects/smpng/sys/dev/matcd/options.h#1 branch .. //depot/projects/smpng/sys/dev/md/md.c#38 integrate .. //depot/projects/smpng/sys/dev/mii/brgphyreg.h#4 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_freebsd.c#8 integrate .. //depot/projects/smpng/sys/dev/null/null.c#11 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirmio.c#4 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirmio.h#2 integrate .. //depot/projects/smpng/sys/dev/ofw/openpromio.c#1 branch .. //depot/projects/smpng/sys/dev/ofw/openpromio.h#1 branch .. //depot/projects/smpng/sys/dev/pccard/pccard.c#21 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#26 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#26 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#31 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbvar.h#11 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#27 integrate .. //depot/projects/smpng/sys/dev/pci/pci_user.c#8 integrate .. //depot/projects/smpng/sys/dev/rndtest/rndtest.c#2 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#14 integrate .. //depot/projects/smpng/sys/dev/streams/streams.c#14 integrate .. //depot/projects/smpng/sys/dev/sym/sym_hipd.c#12 integrate .. //depot/projects/smpng/sys/dev/trm/trm.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/ohci_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/uhci_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/uhid.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/ulpt.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#25 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#33 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs.h#34 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#34 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#11 integrate .. //depot/projects/smpng/sys/dev/utopia/idtphy.h#1 branch .. //depot/projects/smpng/sys/dev/utopia/suni.h#1 branch .. //depot/projects/smpng/sys/dev/utopia/utopia.c#1 branch .. //depot/projects/smpng/sys/dev/utopia/utopia.h#1 branch .. //depot/projects/smpng/sys/dev/vinum/vinumconfig.c#13 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumio.c#14 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumio.h#3 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumioctl.c#15 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumkw.h#3 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumparser.c#4 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumrequest.c#11 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumutil.c#3 integrate .. //depot/projects/smpng/sys/dev/wi/if_wavelan_ieee.h#12 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#51 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#17 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#12 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vfsops.c#12 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vfsops.c#10 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#13 integrate .. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#23 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#18 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#18 integrate .. //depot/projects/smpng/sys/fs/msdosfs/denode.h#5 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_denode.c#12 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#18 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#18 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#13 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#17 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#13 integrate .. //depot/projects/smpng/sys/fs/nullfs/null.h#4 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_subr.c#7 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#10 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#12 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_io.c#8 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vfsops.c#12 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vnops.c#7 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal_vfsops.c#11 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_status.c#17 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.h#18 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#26 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#12 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.c#11 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.h#5 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_smb.c#9 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_subr.c#4 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#18 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#19 integrate .. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#24 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#9 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#12 integrate .. //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#15 integrate .. //depot/projects/smpng/sys/fs/unionfs/union.h#7 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_subr.c#14 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#16 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#10 integrate .. //depot/projects/smpng/sys/geom/geom_aes.c#12 integrate .. //depot/projects/smpng/sys/geom/geom_apple.c#7 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#32 integrate .. //depot/projects/smpng/sys/geom/geom_bsd_enc.c#3 integrate .. //depot/projects/smpng/sys/geom/geom_ccd.c#4 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.c#15 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#27 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#28 integrate .. //depot/projects/smpng/sys/geom/geom_dump.c#20 integrate .. //depot/projects/smpng/sys/geom/geom_event.c#19 integrate .. //depot/projects/smpng/sys/geom/geom_fox.c#1 branch .. //depot/projects/smpng/sys/geom/geom_gpt.c#13 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#21 integrate .. //depot/projects/smpng/sys/geom/geom_kern.c#16 integrate .. //depot/projects/smpng/sys/geom/geom_mbr.c#22 integrate .. //depot/projects/smpng/sys/geom/geom_mbr_enc.c#2 integrate .. //depot/projects/smpng/sys/geom/geom_mirror.c#6 integrate .. //depot/projects/smpng/sys/geom/geom_pc98.c#20 integrate .. //depot/projects/smpng/sys/geom/geom_pc98_enc.c#2 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#24 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#30 integrate .. //depot/projects/smpng/sys/geom/geom_sunlabel.c#23 integrate .. //depot/projects/smpng/sys/geom/geom_sunlabel_enc.c#2 integrate .. //depot/projects/smpng/sys/geom/geom_vol_ffs.c#6 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#22 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#17 integrate .. //depot/projects/smpng/sys/i386/bios/apm.c#4 integrate .. //depot/projects/smpng/sys/i386/bios/smapi.c#3 integrate .. //depot/projects/smpng/sys/i386/bios/smapi_bios.S#3 integrate .. //depot/projects/smpng/sys/i386/conf/PAE#5 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#19 integrate .. //depot/projects/smpng/sys/i386/i386/legacy.c#3 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#39 integrate .. //depot/projects/smpng/sys/i386/i386/sys_machdep.c#29 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#59 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#39 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#11 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_stat.c#10 integrate .. //depot/projects/smpng/sys/i386/include/param.h#10 integrate .. //depot/projects/smpng/sys/i386/isa/pcf.c#6 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#34 integrate .. //depot/projects/smpng/sys/i4b/capi/capi_l4if.c#7 integrate .. //depot/projects/smpng/sys/i4b/capi/capi_llif.c#3 integrate .. //depot/projects/smpng/sys/i4b/capi/capi_msgs.c#4 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_card.c#4 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_isa.c#8 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_lli.c#6 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_pci.c#8 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_ctl.c#7 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_ing.c#8 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#15 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_isppp.c#8 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_rbch.c#10 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_tel.c#8 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_trace.c#10 integrate .. //depot/projects/smpng/sys/i4b/layer1/i4b_hdlc.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/i4b_l1dmux.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/i4b_l1lib.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#8 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#9 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#7 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#8 integrate .. //depot/projects/smpng/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_asuscom_ipac.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_avm_a1.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_bchan.c#7 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_ctx_s0P.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_diva.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_drn_ngo.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_dynalink.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_elsa_qs1i.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_hscx.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_isac.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_isic.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_isic_isa.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_isic_pnp.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_itk_ix1.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_l1.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_l1fsm.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_siemens_isurf.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_sws.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s016.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s0163.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s08.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_usr_sti.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_isac.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_l1.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_pci.c#8 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#7 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_pci.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_iframe.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_l2.c#8 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_l2fsm.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_l2timer.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_lme.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_mbuf.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_sframe.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_tei.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_uframe.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_util.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_l2if.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_l3fsm.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_l3timer.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_l4if.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_q931.c#8 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_q932fac.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer4/i4b_i4bdrv.c#14 integrate .. //depot/projects/smpng/sys/i4b/layer4/i4b_l4.c#7 integrate .. //depot/projects/smpng/sys/i4b/layer4/i4b_l4mgmt.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer4/i4b_l4timer.c#4 integrate .. //depot/projects/smpng/sys/ia64/conf/SKI#13 integrate .. //depot/projects/smpng/sys/ia64/ia64/busdma_machdep.c#16 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#58 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#47 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#51 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#27 integrate .. //depot/projects/smpng/sys/ia64/include/elf.h#8 integrate .. //depot/projects/smpng/sys/ia64/include/param.h#10 integrate .. //depot/projects/smpng/sys/isa/atkbd_isa.c#7 integrate .. //depot/projects/smpng/sys/isa/atkbdc_isa.c#6 integrate .. //depot/projects/smpng/sys/isa/fd.c#22 integrate .. //depot/projects/smpng/sys/isa/isa_common.c#11 integrate .. //depot/projects/smpng/sys/isa/isahint.c#2 integrate .. //depot/projects/smpng/sys/isa/orm.c#3 integrate .. //depot/projects/smpng/sys/isa/pnp.c#8 integrate .. //depot/projects/smpng/sys/isa/pnpparse.c#4 integrate .. //depot/projects/smpng/sys/isa/ppc.c#8 integrate .. //depot/projects/smpng/sys/isa/psm.c#15 integrate .. //depot/projects/smpng/sys/isa/syscons_isa.c#5 integrate .. //depot/projects/smpng/sys/isa/vga_isa.c#8 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_bmap.c#3 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_lookup.c#7 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_node.c#9 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_node.h#4 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_rrip.c#5 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_util.c#3 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#20 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vnops.c#11 integrate .. //depot/projects/smpng/sys/kern/imgact_aout.c#19 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#28 integrate .. //depot/projects/smpng/sys/kern/imgact_elf32.c#3 integrate .. //depot/projects/smpng/sys/kern/imgact_elf64.c#3 integrate .. //depot/projects/smpng/sys/kern/imgact_gzip.c#8 integrate .. //depot/projects/smpng/sys/kern/imgact_shell.c#5 integrate .. //depot/projects/smpng/sys/kern/inflate.c#5 integrate .. //depot/projects/smpng/sys/kern/init_main.c#36 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#28 integrate .. //depot/projects/smpng/sys/kern/kern_acl.c#20 integrate .. //depot/projects/smpng/sys/kern/kern_alq.c#4 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#28 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#29 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_context.c#5 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#47 integrate .. //depot/projects/smpng/sys/kern/kern_environment.c#12 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#60 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#67 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#62 integrate .. //depot/projects/smpng/sys/kern/kern_idle.c#15 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#31 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#28 integrate .. //depot/projects/smpng/sys/kern/kern_kthread.c#13 integrate .. //depot/projects/smpng/sys/kern/kern_ktr.c#20 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#32 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#30 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_lockf.c#15 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#26 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#22 integrate .. //depot/projects/smpng/sys/kern/kern_mib.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_module.c#12 integrate .. //depot/projects/smpng/sys/kern/kern_mtxpool.c#6 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#70 integrate .. //depot/projects/smpng/sys/kern/kern_ntptime.c#12 integrate .. //depot/projects/smpng/sys/kern/kern_physio.c#9 integrate .. //depot/projects/smpng/sys/kern/kern_poll.c#9 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#53 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#71 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#37 integrate .. //depot/projects/smpng/sys/kern/kern_sema.c#5 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#36 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#70 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#25 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#31 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#52 integrate .. //depot/projects/smpng/sys/kern/kern_syscalls.c#4 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#32 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#9 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#37 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#25 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#12 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#4 integrate .. //depot/projects/smpng/sys/kern/kern_uuid.c#6 integrate .. //depot/projects/smpng/sys/kern/kern_xxx.c#9 integrate .. //depot/projects/smpng/sys/kern/link_elf.c#21 integrate .. //depot/projects/smpng/sys/kern/md4c.c#2 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#11 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#12 integrate .. //depot/projects/smpng/sys/kern/subr_autoconf.c#3 integrate .. //depot/projects/smpng/sys/kern/subr_blist.c#5 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#24 integrate .. //depot/projects/smpng/sys/kern/subr_clock.c#4 integrate .. //depot/projects/smpng/sys/kern/subr_devstat.c#10 integrate .. //depot/projects/smpng/sys/kern/subr_disk.c#20 integrate .. //depot/projects/smpng/sys/kern/subr_eventhandler.c#20 integrate .. //depot/projects/smpng/sys/kern/subr_hints.c#5 integrate .. //depot/projects/smpng/sys/kern/subr_kobj.c#3 integrate .. //depot/projects/smpng/sys/kern/subr_log.c#11 integrate .. //depot/projects/smpng/sys/kern/subr_mbuf.c#35 integrate .. //depot/projects/smpng/sys/kern/subr_mchain.c#11 integrate .. //depot/projects/smpng/sys/kern/subr_module.c#2 integrate .. //depot/projects/smpng/sys/kern/subr_msgbuf.c#1 branch .. //depot/projects/smpng/sys/kern/subr_param.c#11 integrate .. //depot/projects/smpng/sys/kern/subr_pcpu.c#5 integrate .. //depot/projects/smpng/sys/kern/subr_power.c#4 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#30 integrate .. //depot/projects/smpng/sys/kern/subr_prof.c#21 integrate .. //depot/projects/smpng/sys/kern/subr_rman.c#13 integrate .. //depot/projects/smpng/sys/kern/subr_sbuf.c#12 integrate .. //depot/projects/smpng/sys/kern/subr_scanf.c#4 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#19 integrate .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#11 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#54 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#99 integrate .. //depot/projects/smpng/sys/kern/subr_xxx.c#8 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#25 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#28 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#29 integrate .. //depot/projects/smpng/sys/kern/sys_socket.c#16 integrate .. //depot/projects/smpng/sys/kern/sysv_ipc.c#12 integrate .. //depot/projects/smpng/sys/kern/sysv_msg.c#18 integrate .. //depot/projects/smpng/sys/kern/sysv_sem.c#19 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#17 integrate .. //depot/projects/smpng/sys/kern/tty.c#36 integrate .. //depot/projects/smpng/sys/kern/tty_compat.c#4 integrate .. //depot/projects/smpng/sys/kern/tty_conf.c#3 integrate .. //depot/projects/smpng/sys/kern/tty_cons.c#20 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#24 integrate .. //depot/projects/smpng/sys/kern/tty_subr.c#5 integrate .. //depot/projects/smpng/sys/kern/tty_tty.c#10 integrate .. //depot/projects/smpng/sys/kern/uipc_accf.c#3 integrate .. //depot/projects/smpng/sys/kern/uipc_cow.c#12 integrate .. //depot/projects/smpng/sys/kern/uipc_domain.c#7 integrate .. //depot/projects/smpng/sys/kern/uipc_jumbo.c#7 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#19 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf2.c#10 integrate .. //depot/projects/smpng/sys/kern/uipc_proto.c#3 integrate .. //depot/projects/smpng/sys/kern/uipc_sem.c#7 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#37 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#24 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#35 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#28 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#40 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#46 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#19 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#26 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#21 integrate .. //depot/projects/smpng/sys/kern/vfs_export.c#10 integrate .. //depot/projects/smpng/sys/kern/vfs_init.c#9 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#16 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#15 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#56 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#58 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#39 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#14 integrate .. //depot/projects/smpng/sys/libkern/arc4random.c#4 integrate .. //depot/projects/smpng/sys/libkern/ashldi3.c#2 integrate .. //depot/projects/smpng/sys/libkern/ashrdi3.c#2 integrate .. //depot/projects/smpng/sys/libkern/bcd.c#2 integrate .. //depot/projects/smpng/sys/libkern/bcmp.c#3 integrate .. //depot/projects/smpng/sys/libkern/bsearch.c#5 integrate .. //depot/projects/smpng/sys/libkern/crc32.c#2 integrate .. //depot/projects/smpng/sys/libkern/divdi3.c#2 integrate .. //depot/projects/smpng/sys/libkern/ffs.c#3 integrate .. //depot/projects/smpng/sys/libkern/fnmatch.c#2 integrate .. //depot/projects/smpng/sys/libkern/iconv.c#5 integrate .. //depot/projects/smpng/sys/libkern/iconv_xlat.c#3 integrate .. //depot/projects/smpng/sys/libkern/index.c#2 integrate .. //depot/projects/smpng/sys/libkern/inet_ntoa.c#2 integrate .. //depot/projects/smpng/sys/libkern/lshrdi3.c#2 integrate .. //depot/projects/smpng/sys/libkern/mcount.c#4 integrate .. //depot/projects/smpng/sys/libkern/moddi3.c#2 integrate .. //depot/projects/smpng/sys/libkern/qdivrem.c#2 integrate .. //depot/projects/smpng/sys/libkern/qsort.c#4 integrate .. //depot/projects/smpng/sys/libkern/random.c#3 integrate .. //depot/projects/smpng/sys/libkern/rindex.c#2 integrate .. //depot/projects/smpng/sys/libkern/scanc.c#2 integrate .. //depot/projects/smpng/sys/libkern/skpc.c#2 integrate .. //depot/projects/smpng/sys/libkern/strcat.c#4 integrate .. //depot/projects/smpng/sys/libkern/strcmp.c#3 integrate .. //depot/projects/smpng/sys/libkern/strcpy.c#4 integrate .. //depot/projects/smpng/sys/libkern/strdup.c#3 integrate .. //depot/projects/smpng/sys/libkern/strlen.c#3 integrate .. //depot/projects/smpng/sys/libkern/strncmp.c#3 integrate .. //depot/projects/smpng/sys/libkern/strncpy.c#4 integrate .. //depot/projects/smpng/sys/libkern/strtol.c#3 integrate .. //depot/projects/smpng/sys/libkern/strtoq.c#3 integrate .. //depot/projects/smpng/sys/libkern/strtoul.c#3 integrate .. //depot/projects/smpng/sys/libkern/strtouq.c#3 integrate .. //depot/projects/smpng/sys/libkern/strvalid.c#3 integrate .. //depot/projects/smpng/sys/libkern/ucmpdi2.c#2 integrate .. //depot/projects/smpng/sys/libkern/udivdi3.c#2 integrate .. //depot/projects/smpng/sys/libkern/umoddi3.c#2 integrate .. //depot/projects/smpng/sys/modules/Makefile#55 integrate .. //depot/projects/smpng/sys/modules/ath/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ath_hal/Makefile#1 branch .. //depot/projects/smpng/sys/modules/en/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/fatm/Makefile#1 branch .. //depot/projects/smpng/sys/modules/geom/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/geom/Makefile.inc#1 branch .. //depot/projects/smpng/sys/modules/geom/geom_fox/Makefile#1 branch .. //depot/projects/smpng/sys/modules/hatm/Makefile#1 branch .. //depot/projects/smpng/sys/modules/i2c/controllers/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/i2c/controllers/lpbb/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/netgraph/Makefile#9 integrate .. //depot/projects/smpng/sys/modules/netgraph/atm/Makefile#1 branch .. //depot/projects/smpng/sys/modules/netgraph/atm/Makefile.inc#1 branch .. //depot/projects/smpng/sys/modules/netgraph/atm/atm/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ufs/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/utopia/Makefile#1 branch .. //depot/projects/smpng/sys/modules/vinum/.gdbinit.crash#2 delete .. //depot/projects/smpng/sys/modules/vinum/.gdbinit.kernel#2 delete .. //depot/projects/smpng/sys/modules/vinum/.gdbinit.serial#2 delete .. //depot/projects/smpng/sys/modules/vinum/.gdbinit.vinum#2 delete .. //depot/projects/smpng/sys/modules/vinum/.gdbinit.vinum.paths#2 delete .. //depot/projects/smpng/sys/net/if_atm.h#6 integrate .. //depot/projects/smpng/sys/net/if_atmsubr.c#11 integrate .. //depot/projects/smpng/sys/net/if_media.h#9 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211.h#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_crypto.c#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_crypto.h#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.h#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_node.h#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#1 branch .. //depot/projects/smpng/sys/netatm/atm_aal5.c#8 integrate .. //depot/projects/smpng/sys/netatm/atm_cm.c#11 integrate .. //depot/projects/smpng/sys/netatm/atm_device.c#8 integrate .. //depot/projects/smpng/sys/netatm/atm_if.c#10 integrate .. //depot/projects/smpng/sys/netatm/atm_proto.c#4 integrate .. //depot/projects/smpng/sys/netatm/atm_signal.c#5 integrate .. //depot/projects/smpng/sys/netatm/atm_socket.c#8 integrate .. //depot/projects/smpng/sys/netatm/atm_subr.c#13 integrate .. //depot/projects/smpng/sys/netatm/atm_usrreq.c#9 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_event.c#2 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_if.c#7 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_input.c#5 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_load.c#5 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_output.c#3 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_usrreq.c#4 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_vcm.c#5 integrate .. //depot/projects/smpng/sys/netatm/sigpvc/sigpvc_if.c#5 integrate .. //depot/projects/smpng/sys/netatm/sigpvc/sigpvc_subr.c#5 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_arp.c#6 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_cls.c#6 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_if.c#5 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_kxdr.c#7 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_msg.c#8 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_print.c#3 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_proto.c#6 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_subr.c#4 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_util.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/q2110_sigaa.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/q2110_sigcpcs.c#5 integrate .. //depot/projects/smpng/sys/netatm/uni/q2110_subr.c#2 integrate .. //depot/projects/smpng/sys/netatm/uni/qsaal1_sigaa.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/qsaal1_sigcpcs.c#5 integrate .. //depot/projects/smpng/sys/netatm/uni/qsaal1_subr.c#2 integrate .. //depot/projects/smpng/sys/netatm/uni/sscf_uni.c#6 integrate .. //depot/projects/smpng/sys/netatm/uni/sscf_uni_lower.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/sscf_uni_upper.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop.c#6 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_lower.c#6 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_pdu.c#5 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_sigaa.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_sigcpcs.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_subr.c#6 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_timer.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_upper.c#5 integrate .. //depot/projects/smpng/sys/netatm/uni/uni_load.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/uniarp.c#6 integrate .. //depot/projects/smpng/sys/netatm/uni/uniarp_cache.c#5 integrate .. //depot/projects/smpng/sys/netatm/uni/uniarp_input.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/uniarp_output.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/uniarp_timer.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/uniarp_vcm.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/uniip.c#7 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_decode.c#7 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_encode.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_if.c#5 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_mbuf.c#2 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_msg.c#5 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_print.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_proto.c#2 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_sigmgr_state.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_subr.c#5 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_util.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_vc_state.c#6 integrate .. //depot/projects/smpng/sys/netgraph/atm/ng_atm.c#1 branch .. //depot/projects/smpng/sys/netgraph/atm/ng_atm.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket.c#3 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#7 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#6 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#5 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_tee.c#7 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#17 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.c#18 delete .. //depot/projects/smpng/sys/netinet/ip_fw2.c#14 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#36 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#20 integrate .. //depot/projects/smpng/sys/netipx/ipx.c#7 integrate .. //depot/projects/smpng/sys/netipx/ipx_cksum.c#2 integrate .. //depot/projects/smpng/sys/netipx/ipx_input.c#7 integrate .. //depot/projects/smpng/sys/netipx/ipx_ip.c#8 integrate .. //depot/projects/smpng/sys/netipx/ipx_outputfl.c#4 integrate .. //depot/projects/smpng/sys/netipx/ipx_pcb.c#9 integrate .. //depot/projects/smpng/sys/netipx/ipx_proto.c#3 integrate .. //depot/projects/smpng/sys/netipx/ipx_usrreq.c#12 integrate .. //depot/projects/smpng/sys/netipx/spx_debug.c#2 integrate .. //depot/projects/smpng/sys/netipx/spx_usrreq.c#8 integrate .. //depot/projects/smpng/sys/netkey/key.c#16 integrate .. //depot/projects/smpng/sys/netkey/key_debug.c#6 integrate .. //depot/projects/smpng/sys/netkey/keydb.c#3 integrate .. //depot/projects/smpng/sys/netkey/keysock.c#15 integrate .. //depot/projects/smpng/sys/netnatm/natm.c#11 integrate .. //depot/projects/smpng/sys/netnatm/natm_pcb.c#4 integrate .. //depot/projects/smpng/sys/netnatm/natm_proto.c#8 integrate .. //depot/projects/smpng/sys/netncp/ncp_conn.c#9 integrate .. //depot/projects/smpng/sys/netncp/ncp_crypt.c#2 integrate .. //depot/projects/smpng/sys/netncp/ncp_login.c#2 integrate .. //depot/projects/smpng/sys/netncp/ncp_mod.c#4 integrate .. //depot/projects/smpng/sys/netncp/ncp_ncp.c#9 integrate .. //depot/projects/smpng/sys/netncp/ncp_nls.c#2 integrate .. //depot/projects/smpng/sys/netncp/ncp_rq.c#6 integrate .. //depot/projects/smpng/sys/netncp/ncp_sock.c#6 integrate .. //depot/projects/smpng/sys/netncp/ncp_subr.c#5 integrate .. //depot/projects/smpng/sys/netsmb/smb_conn.c#7 integrate .. //depot/projects/smpng/sys/netsmb/smb_crypt.c#4 integrate .. //depot/projects/smpng/sys/netsmb/smb_dev.c#11 integrate .. //depot/projects/smpng/sys/netsmb/smb_iod.c#11 integrate .. //depot/projects/smpng/sys/netsmb/smb_rq.c#11 integrate .. //depot/projects/smpng/sys/netsmb/smb_smb.c#8 integrate .. //depot/projects/smpng/sys/netsmb/smb_subr.c#13 integrate .. //depot/projects/smpng/sys/netsmb/smb_trantcp.c#15 integrate .. //depot/projects/smpng/sys/netsmb/smb_usr.c#3 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#20 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_diskless.c#3 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_lock.c#26 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#24 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#30 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#29 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#13 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#16 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#18 integrate .. //depot/projects/smpng/sys/opencrypto/cast.c#2 integrate .. //depot/projects/smpng/sys/opencrypto/criov.c#2 integrate .. //depot/projects/smpng/sys/opencrypto/crmbuf.c#2 integrate .. //depot/projects/smpng/sys/opencrypto/crypto.c#8 integrate .. //depot/projects/smpng/sys/opencrypto/cryptodev.c#8 integrate .. //depot/projects/smpng/sys/opencrypto/cryptosoft.c#3 integrate .. //depot/projects/smpng/sys/opencrypto/deflate.c#2 integrate .. //depot/projects/smpng/sys/opencrypto/rijndael.c#2 integrate .. //depot/projects/smpng/sys/opencrypto/rmd160.c#2 integrate .. //depot/projects/smpng/sys/opencrypto/skipjack.c#2 integrate .. //depot/projects/smpng/sys/opencrypto/xform.c#2 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#34 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#9 integrate .. //depot/projects/smpng/sys/pc98/pc98/olpt.c#7 integrate .. //depot/projects/smpng/sys/pccard/pccard.c#20 integrate .. //depot/projects/smpng/sys/pccard/pccard_beep.c#3 integrate .. //depot/projects/smpng/sys/pccard/pccard_nbk.c#11 integrate .. //depot/projects/smpng/sys/pccard/pcic.c#20 integrate .. //depot/projects/smpng/sys/pccard/pcic_isa.c#9 integrate .. //depot/projects/smpng/sys/pccard/pcic_pci.c#28 integrate .. //depot/projects/smpng/sys/pci/agp.c#13 integrate .. //depot/projects/smpng/sys/pci/agp_ali.c#5 integrate .. //depot/projects/smpng/sys/pci/agp_amd.c#9 integrate .. //depot/projects/smpng/sys/pci/agp_i810.c#9 integrate .. //depot/projects/smpng/sys/pci/agp_intel.c#11 integrate .. //depot/projects/smpng/sys/pci/agp_sis.c#6 integrate .. //depot/projects/smpng/sys/pci/agp_via.c#6 integrate .. //depot/projects/smpng/sys/pci/alpm.c#6 integrate .. //depot/projects/smpng/sys/pci/amdpm.c#7 integrate .. //depot/projects/smpng/sys/pci/cy_pci.c#6 integrate .. //depot/projects/smpng/sys/pci/if_de.c#11 integrate .. //depot/projects/smpng/sys/pci/if_devar.h#5 integrate .. //depot/projects/smpng/sys/pci/if_en_pci.c#7 delete .. //depot/projects/smpng/sys/pci/if_mn.c#6 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#30 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#26 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#28 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#28 integrate .. //depot/projects/smpng/sys/pci/intpm.c#7 integrate .. //depot/projects/smpng/sys/pci/meteor.c#8 integrate .. //depot/projects/smpng/sys/pci/ncr.c#10 integrate .. //depot/projects/smpng/sys/pci/viapm.c#4 integrate .. //depot/projects/smpng/sys/pci/xrpu.c#8 integrate .. //depot/projects/smpng/sys/posix4/ksched.c#12 integrate .. //depot/projects/smpng/sys/posix4/p1003_1b.c#8 integrate .. //depot/projects/smpng/sys/posix4/posix4_mib.c#5 integrate .. //depot/projects/smpng/sys/powerpc/include/cpu.h#13 integrate .. //depot/projects/smpng/sys/powerpc/include/param.h#7 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/busdma_machdep.c#12 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#39 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#27 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#25 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#16 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#9 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#16 integrate .. //depot/projects/smpng/sys/security/mac_none/mac_none.c#10 integrate .. //depot/projects/smpng/sys/security/mac_partition/mac_partition.c#4 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#12 integrate .. //depot/projects/smpng/sys/sparc64/conf/NOTES#2 integrate .. //depot/projects/smpng/sys/sparc64/include/bus.h#16 integrate .. //depot/projects/smpng/sys/sparc64/include/bus_private.h#4 integrate .. //depot/projects/smpng/sys/sparc64/include/cpufunc.h#18 integrate .. //depot/projects/smpng/sys/sparc64/include/iommuvar.h#11 integrate .. //depot/projects/smpng/sys/sparc64/include/param.h#12 integrate .. //depot/projects/smpng/sys/sparc64/isa/isa.c#7 integrate .. //depot/projects/smpng/sys/sparc64/pci/apb.c#4 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci_if.m#1 branch .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#23 integrate .. //depot/projects/smpng/sys/sparc64/sbus/sbus.c#11 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/bus_machdep.c#17 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/exception.S#11 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#17 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_exception.S#5 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/nexus.c#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#38 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/support.S#5 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#52 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tsb.c#20 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#33 integrate .. //depot/projects/smpng/sys/sys/alq.h#2 integrate .. //depot/projects/smpng/sys/sys/bitstring.h#1 branch .. //depot/projects/smpng/sys/sys/buf.h#20 integrate .. //depot/projects/smpng/sys/sys/cdefs.h#19 integrate .. //depot/projects/smpng/sys/sys/elf_common.h#4 integrate .. //depot/projects/smpng/sys/sys/fbio.h#4 integrate .. //depot/projects/smpng/sys/sys/fcntl.h#5 integrate .. //depot/projects/smpng/sys/sys/file.h#16 integrate .. //depot/projects/smpng/sys/sys/kse.h#10 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#15 integrate .. //depot/projects/smpng/sys/sys/msgbuf.h#7 integrate .. //depot/projects/smpng/sys/sys/param.h#42 integrate .. //depot/projects/smpng/sys/sys/proc.h#92 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#19 integrate .. //depot/projects/smpng/sys/sys/tty.h#10 integrate .. //depot/projects/smpng/sys/sys/watchdog.h#2 integrate .. //depot/projects/smpng/sys/tools/vnode_if.awk#6 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#23 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_balloc.c#10 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#14 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_rawread.c#5 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#29 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep_stub.c#7 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_subr.c#8 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_tables.c#4 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#42 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#20 integrate .. //depot/projects/smpng/sys/ufs/ufs/quota.h#8 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_acl.c#12 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_bmap.c#9 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#17 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#25 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_ihash.c#9 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_inode.c#13 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#15 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#19 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#14 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#28 integrate .. //depot/projects/smpng/sys/vm/default_pager.c#4 integrate .. //depot/projects/smpng/sys/vm/device_pager.c#10 integrate .. //depot/projects/smpng/sys/vm/phys_pager.c#9 integrate .. //depot/projects/smpng/sys/vm/pmap.h#18 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#28 integrate .. //depot/projects/smpng/sys/vm/swap_pager.h#9 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#32 integrate .. //depot/projects/smpng/sys/vm/uma_dbg.c#6 integrate .. //depot/projects/smpng/sys/vm/uma_int.h#14 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#14 integrate .. //depot/projects/smpng/sys/vm/vm_extern.h#15 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#26 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#29 integrate .. //depot/projects/smpng/sys/vm/vm_init.c#7 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#14 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#37 integrate .. //depot/projects/smpng/sys/vm/vm_map.h#18 integrate .. //depot/projects/smpng/sys/vm/vm_meter.c#15 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#29 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#40 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#38 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#32 integrate .. //depot/projects/smpng/sys/vm/vm_pageq.c#9 integrate .. //depot/projects/smpng/sys/vm/vm_pager.c#13 integrate .. //depot/projects/smpng/sys/vm/vm_pager.h#6 integrate .. //depot/projects/smpng/sys/vm/vm_swap.c#24 integrate .. //depot/projects/smpng/sys/vm/vm_unix.c#7 integrate .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#11 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#31 integrate Differences ... ==== //depot/projects/smpng/sys/Makefile#4 (text+ko) ==== @@ -1,10 +1,7 @@ -# $FreeBSD: src/sys/Makefile,v 1.27 2003/05/08 06:35:39 peter Exp $ +# $FreeBSD: src/sys/Makefile,v 1.28 2003/06/26 03:52:48 peter Exp $ -SUBDIR= # The boot loader -.if ${MACHINE_ARCH} != "amd64" -SUBDIR+=boot -.endif +SUBDIR= boot # KLD modules build for both a.out and ELF .if defined(MODULES_WITH_WORLD) ==== //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.38 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.39 2003/06/27 08:31:47 scottl Exp $"); #include #include @@ -94,6 +94,7 @@ vm_offset_t busaddress; /* address in bus space */ bus_dmamap_callback_t *callback; void *callback_arg; + struct mtx *callback_mtx; void *sgmaphandle; /* handle into sgmap */ STAILQ_ENTRY(bus_dmamap) links; }; @@ -931,8 +932,12 @@ while ((map = STAILQ_FIRST(&bounce_map_callbacklist)) != NULL) { STAILQ_REMOVE_HEAD(&bounce_map_callbacklist, links); mtx_unlock(&bounce_lock); + if (map->callback_mtx != NULL) + mtx_lock(map->callback_mtx); bus_dmamap_load(map->dmat, map, map->buf, map->buflen, map->callback, map->callback_arg, /*flags*/0); + if (map->callback_mtx != NULL) + mtx_unlock(map->callback_mtx); mtx_lock(&bounce_lock); } mtx_unlock(&bounce_lock); ==== //depot/projects/smpng/sys/alpha/alpha/interrupt.c#21 (text+ko) ==== @@ -35,7 +35,7 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.73 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.74 2003/06/14 23:23:52 alc Exp $"); #include #include @@ -106,7 +106,7 @@ intr_restore(s); #endif atomic_add_int(&td->td_intr_nesting_level, 1); -#ifndef KSTACK_GUARD +#if KSTACK_GUARD_PAGES == 0 #ifndef SMP { if ((caddr_t) framep < (caddr_t) td->td_pcb + 1024) { ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#46 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.123 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.126 2003/06/18 02:57:38 alc Exp $"); #include #include @@ -594,7 +594,7 @@ } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 27 12:53:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0368A37B404; Fri, 27 Jun 2003 12:53:08 -0700 (PDT) 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 8E1E137B401 for ; Fri, 27 Jun 2003 12:53:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 32D9443FE0 for ; Fri, 27 Jun 2003 12:53:07 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5RJr60U083301 for ; Fri, 27 Jun 2003 12:53:06 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5RJr6pD083289 for perforce@freebsd.org; Fri, 27 Jun 2003 12:53:06 -0700 (PDT) Date: Fri, 27 Jun 2003 12:53:06 -0700 (PDT) Message-Id: <200306271953.h5RJr6pD083289@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 33754 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, 27 Jun 2003 19:53:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=33754 Change 33754 by jhb@jhb_laptop on 2003/06/27 12:52:44 IFC @33750. Affected files ... .. //depot/projects/smpng/sys/vm/vm_map.c#38 integrate .. //depot/user/jhb/acpipci/vm/vm_map.c#13 integrate Differences ... ==== //depot/projects/smpng/sys/vm/vm_map.c#38 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.299 2003/06/25 05:31:02 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.300 2003/06/27 18:52:49 alc Exp $"); #include #include @@ -821,14 +821,10 @@ * reference counting is insufficient to recognize * aliases with precision.) */ - if (object != kmem_object) - mtx_lock(&Giant); VM_OBJECT_LOCK(object); if (object->ref_count > 1 || object->shadow_count != 0) vm_object_clear_flag(object, OBJ_ONEMAPPING); VM_OBJECT_UNLOCK(object); - if (object != kmem_object) - mtx_unlock(&Giant); } else if ((prev_entry != &map->header) && (prev_entry->eflags == protoeflags) && ==== //depot/user/jhb/acpipci/vm/vm_map.c#13 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.299 2003/06/25 05:31:02 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.300 2003/06/27 18:52:49 alc Exp $"); #include #include @@ -821,14 +821,10 @@ * reference counting is insufficient to recognize * aliases with precision.) */ - if (object != kmem_object) - mtx_lock(&Giant); VM_OBJECT_LOCK(object); if (object->ref_count > 1 || object->shadow_count != 0) vm_object_clear_flag(object, OBJ_ONEMAPPING); VM_OBJECT_UNLOCK(object); - if (object != kmem_object) - mtx_unlock(&Giant); } else if ((prev_entry != &map->header) && (prev_entry->eflags == protoeflags) && From owner-p4-projects@FreeBSD.ORG Sat Jun 28 16:52:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C96C937B404; Sat, 28 Jun 2003 16:52:17 -0700 (PDT) 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 7397537B401 for ; Sat, 28 Jun 2003 16:52:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 011D74401E for ; Sat, 28 Jun 2003 16:52:16 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5SNqF0U047645 for ; Sat, 28 Jun 2003 16:52:15 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5SNqC7M047612 for perforce@freebsd.org; Sat, 28 Jun 2003 16:52:12 -0700 (PDT) Date: Sat, 28 Jun 2003 16:52:12 -0700 (PDT) Message-Id: <200306282352.h5SNqC7M047612@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 33819 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, 28 Jun 2003 23:52:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=33819 Change 33819 by marcel@marcel_nfs on 2003/06/28 16:51:14 IFC @33818 Affected files ... .. //depot/projects/ia64/Makefile.inc1#68 integrate .. //depot/projects/ia64/contrib/gcc/gcc.1#5 integrate .. //depot/projects/ia64/crypto/openssh/packet.c#7 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#35 integrate .. //depot/projects/ia64/etc/mtree/BSD.include.dist#15 integrate .. //depot/projects/ia64/etc/network.subr#6 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#16 integrate .. //depot/projects/ia64/etc/rc.d/netoptions#1 branch .. //depot/projects/ia64/etc/rc.d/routing#1 branch .. //depot/projects/ia64/etc/rc.d/watchdogd#1 branch .. //depot/projects/ia64/gnu/lib/libstdc++/Makefile#19 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/as/alpha-freebsd/config.h#7 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/as/i386-freebsd/config.h#7 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/as/ia64-freebsd/config.h#5 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h#5 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h#8 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/Makefile#16 integrate .. //depot/projects/ia64/include/Makefile#29 integrate .. //depot/projects/ia64/include/paths.h#10 integrate .. //depot/projects/ia64/include/rune.h#4 integrate .. //depot/projects/ia64/include/stdlib.h#20 integrate .. //depot/projects/ia64/lib/Makefile#29 integrate .. //depot/projects/ia64/lib/libc/gen/getpwent.c#13 integrate .. //depot/projects/ia64/lib/libc/gen/sigsetops.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/ttyname.c#4 integrate .. //depot/projects/ia64/lib/libc/i386/gen/alloca.S#4 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/Makefile.inc#13 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/signalcontext.c#1 branch .. //depot/projects/ia64/lib/libc/locale/fix_grouping.c#5 integrate .. //depot/projects/ia64/lib/libc/locale/ldpart.c#8 integrate .. //depot/projects/ia64/lib/libc/locale/lmessages.c#7 integrate .. //depot/projects/ia64/lib/libc/locale/lmonetary.c#9 integrate .. //depot/projects/ia64/lib/libc/locale/lnumeric.c#7 integrate .. //depot/projects/ia64/lib/libc/locale/localeconv.c#5 integrate .. //depot/projects/ia64/lib/libc/locale/nl_langinfo.c#5 integrate .. //depot/projects/ia64/lib/libc/locale/setlocale.c#7 integrate .. //depot/projects/ia64/lib/libc/locale/setlocale.h#3 integrate .. //depot/projects/ia64/lib/libc/locale/setrunelocale.c#6 integrate .. //depot/projects/ia64/lib/libc/locale/table.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/scanf.3#11 integrate .. //depot/projects/ia64/lib/libc/stdio/vfscanf.c#10 integrate .. //depot/projects/ia64/lib/libc/stdlib/alloca.3#2 integrate .. //depot/projects/ia64/lib/libc/sys/sigpending.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/sigprocmask.2#7 integrate .. //depot/projects/ia64/lib/libc/sys/sigsuspend.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/uuidgen.2#9 integrate .. //depot/projects/ia64/lib/libpthread/arch/ia64/Makefile.inc#3 integrate .. //depot/projects/ia64/lib/libpthread/arch/ia64/ia64/context.S#1 branch .. //depot/projects/ia64/lib/libpthread/arch/ia64/ia64/enter_uts.S#1 branch .. //depot/projects/ia64/lib/libpthread/arch/ia64/include/pthread_md.h#3 integrate .. //depot/projects/ia64/lib/libpthread/pthread.map#2 integrate .. //depot/projects/ia64/lib/libpthread/support/thr_support.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cancel.c#7 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cond.c#12 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_create.c#11 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_info.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_init.c#12 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#21 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kill.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_private.h#15 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_rtld.c#2 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sig.c#13 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sigaction.c#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sigmask.c#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sigpending.c#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sigprocmask.c#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sigsuspend.c#6 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sigwait.c#6 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_stack.c#3 integrate .. //depot/projects/ia64/lib/libstand/Makefile#13 integrate .. //depot/projects/ia64/lib/libthr/Makefile#3 integrate .. //depot/projects/ia64/lib/libz/zlib.3#3 integrate .. //depot/projects/ia64/release/Makefile#56 integrate .. //depot/projects/ia64/release/amd64/boot_crunch.conf#1 branch .. //depot/projects/ia64/release/amd64/dokern.sh#1 branch .. //depot/projects/ia64/release/amd64/fixit_crunch.conf#1 branch .. //depot/projects/ia64/release/amd64/mkisoimages.sh#1 branch .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#21 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/Makefile#5 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/amd64/Makefile#1 branch .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/amd64/article.sgml#1 branch .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#1 branch .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#5 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/Makefile#5 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/amd64/Makefile#1 branch .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/amd64/article.sgml#1 branch .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/Makefile#5 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/amd64/Makefile#1 branch .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml#1 branch .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#100 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/Makefile#3 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/amd64/Makefile#1 branch .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml#1 branch .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml#1 branch .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#15 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/common/hw.ent#3 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/Makefile#5 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/amd64/Makefile#1 branch .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml#1 branch .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#24 integrate .. //depot/projects/ia64/release/doc/share/examples/Makefile.relnotesng#7 integrate .. //depot/projects/ia64/sbin/ifconfig/ifieee80211.c#4 integrate .. //depot/projects/ia64/sbin/ifconfig/ifmedia.c#6 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.c#8 delete .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#18 integrate .. //depot/projects/ia64/sbin/ping/ping.8#13 integrate .. //depot/projects/ia64/share/man/man4/Makefile#51 integrate .. //depot/projects/ia64/share/man/man4/ath.4#2 integrate .. //depot/projects/ia64/share/man/man4/fatm.4#2 integrate .. //depot/projects/ia64/share/man/man4/hatm.4#2 integrate .. //depot/projects/ia64/share/man/man4/ng_atm.4#1 branch .. //depot/projects/ia64/share/man/man4/sbp.4#8 integrate .. //depot/projects/ia64/share/man/man4/watchdog.4#1 branch .. //depot/projects/ia64/share/man/man5/rc.conf.5#42 integrate .. //depot/projects/ia64/share/man/man5/style.Makefile.5#3 integrate .. //depot/projects/ia64/share/man/man9/bus_dma.9#3 integrate .. //depot/projects/ia64/share/mk/bsd.lib.mk#20 integrate .. //depot/projects/ia64/sys/Makefile#4 integrate .. //depot/projects/ia64/sys/alpha/alpha/busdma_machdep.c#17 integrate .. //depot/projects/ia64/sys/alpha/alpha/machdep.c#30 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#32 integrate .. //depot/projects/ia64/sys/alpha/mcbus/mcpcia.c#7 integrate .. //depot/projects/ia64/sys/amd64/amd64/busdma_machdep.c#4 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#8 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/ia64/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/ia64/sys/boot/Makefile#7 integrate .. //depot/projects/ia64/sys/boot/common/Makefile.inc#5 integrate .. //depot/projects/ia64/sys/boot/ficl/Makefile#6 integrate .. //depot/projects/ia64/sys/boot/i386/Makefile.inc#3 integrate .. //depot/projects/ia64/sys/boot/i386/boot2/Makefile#13 integrate .. //depot/projects/ia64/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/ia64/sys/boot/i386/btx/btxldr/Makefile#3 integrate .. //depot/projects/ia64/sys/boot/i386/loader/Makefile#12 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ioctl.c#26 integrate .. //depot/projects/ia64/sys/conf/NOTES#55 integrate .. //depot/projects/ia64/sys/conf/files#84 integrate .. //depot/projects/ia64/sys/conf/files.i386#38 integrate .. //depot/projects/ia64/sys/conf/files.pc98#32 integrate .. //depot/projects/ia64/sys/conf/files.powerpc#17 integrate .. //depot/projects/ia64/sys/conf/kern.pre.mk#18 integrate .. //depot/projects/ia64/sys/conf/options#55 integrate .. //depot/projects/ia64/sys/conf/options.i386#18 integrate .. //depot/projects/ia64/sys/conf/options.pc98#19 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/COPYRIGHT#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/README#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/ah.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/ah_desc.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/ah_devid.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/freebsd/ah_if.m#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/freebsd/ah_osdep.c#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/freebsd/ah_osdep.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/freebsd/opt_ah.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/version.h#1 branch .. //depot/projects/ia64/sys/dev/acpica/acpi_ec.c#9 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.c#15 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.h#12 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.seq#10 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_inline.h#10 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_pci.c#12 integrate .. //depot/projects/ia64/sys/dev/an/if_an.c#23 integrate .. //depot/projects/ia64/sys/dev/ata/ata-card.c#12 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#19 integrate .. //depot/projects/ia64/sys/dev/awi/awi.c#12 integrate .. //depot/projects/ia64/sys/dev/awi/awi_wep.c#9 integrate .. //depot/projects/ia64/sys/dev/awi/awi_wicfg.c#5 integrate .. //depot/projects/ia64/sys/dev/awi/awivar.h#4 integrate .. //depot/projects/ia64/sys/dev/awi/if_awi_pccard.c#7 integrate .. //depot/projects/ia64/sys/dev/ciss/ciss.c#20 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep.c#8 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#31 integrate .. //depot/projects/ia64/sys/dev/firewire/firewirereg.h#19 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#26 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci_pci.c#17 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohcivar.h#8 integrate .. //depot/projects/ia64/sys/dev/hifn/hifn7751.c#11 integrate .. //depot/projects/ia64/sys/dev/ips/ips.c#2 integrate .. //depot/projects/ia64/sys/dev/ips/ips.h#2 integrate .. //depot/projects/ia64/sys/dev/ips/ips_commands.c#2 integrate .. //depot/projects/ia64/sys/dev/ips/ips_disk.c#2 integrate .. //depot/projects/ia64/sys/dev/ips/ips_pci.c#2 integrate .. //depot/projects/ia64/sys/dev/null/null.c#12 integrate .. //depot/projects/ia64/sys/dev/ray/if_ray.c#9 integrate .. //depot/projects/ia64/sys/dev/rndtest/rndtest.c#2 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/dsp.c#11 integrate .. //depot/projects/ia64/sys/dev/sym/sym_hipd.c#12 integrate .. //depot/projects/ia64/sys/dev/trm/trm.c#10 integrate .. //depot/projects/ia64/sys/dev/ubsec/ubsec.c#17 integrate .. //depot/projects/ia64/sys/dev/usb/uhid.c#11 integrate .. //depot/projects/ia64/sys/dev/usb/umct.c#1 branch .. //depot/projects/ia64/sys/dev/usb/usbdevs#38 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs.h#37 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#37 integrate .. //depot/projects/ia64/sys/dev/wi/if_wavelan_ieee.h#11 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#40 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#21 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pci.c#12 integrate .. //depot/projects/ia64/sys/dev/wi/if_wivar.h#14 integrate .. //depot/projects/ia64/sys/fs/msdosfs/denode.h#4 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_denode.c#12 integrate .. //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#20 integrate .. //depot/projects/ia64/sys/i386/i386/genassym.c#17 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#41 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#23 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#45 integrate .. //depot/projects/ia64/sys/i386/i386/swtch.s#10 integrate .. //depot/projects/ia64/sys/i386/include/md_var.h#14 integrate .. //depot/projects/ia64/sys/i386/include/pcpu.h#6 integrate .. //depot/projects/ia64/sys/ia64/ia64/busdma_machdep.c#14 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#79 integrate .. //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#30 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_node.h#4 integrate .. //depot/projects/ia64/sys/kern/init_sysent.c#28 integrate .. //depot/projects/ia64/sys/kern/kern_clock.c#24 integrate .. //depot/projects/ia64/sys/kern/kern_ntptime.c#9 integrate .. //depot/projects/ia64/sys/kern/kern_prot.c#27 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#55 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#40 integrate .. //depot/projects/ia64/sys/kern/kern_tc.c#24 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#54 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#20 integrate .. //depot/projects/ia64/sys/kern/subr_trap.c#33 integrate .. //depot/projects/ia64/sys/kern/syscalls.c#29 integrate .. //depot/projects/ia64/sys/kern/syscalls.master#30 integrate .. //depot/projects/ia64/sys/modules/Makefile#55 integrate .. //depot/projects/ia64/sys/modules/ath_hal/Makefile#1 branch .. //depot/projects/ia64/sys/modules/netgraph/Makefile#6 integrate .. //depot/projects/ia64/sys/modules/netgraph/atm/Makefile#1 branch .. //depot/projects/ia64/sys/modules/netgraph/atm/Makefile.inc#1 branch .. //depot/projects/ia64/sys/modules/netgraph/atm/atm/Makefile#1 branch .. //depot/projects/ia64/sys/modules/umct/Makefile#1 branch .. //depot/projects/ia64/sys/modules/wlan/Makefile#2 integrate .. //depot/projects/ia64/sys/net/if_ieee80211.h#5 delete .. //depot/projects/ia64/sys/net/if_ieee80211subr.c#6 delete .. //depot/projects/ia64/sys/net/if_media.h#10 integrate .. //depot/projects/ia64/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/ia64/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_crypto.c#2 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_crypto.h#2 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_node.h#2 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/ia64/sys/netgraph/atm/ng_atm.c#1 branch .. //depot/projects/ia64/sys/netgraph/atm/ng_atm.h#1 branch .. //depot/projects/ia64/sys/netgraph/ng_tee.c#7 integrate .. //depot/projects/ia64/sys/netinet/ip_dummynet.c#19 integrate .. //depot/projects/ia64/sys/netinet/ip_fw.c#14 delete .. //depot/projects/ia64/sys/netinet/ip_fw2.c#21 integrate .. //depot/projects/ia64/sys/netipsec/xform_ah.c#3 integrate .. //depot/projects/ia64/sys/netipsec/xform_esp.c#5 integrate .. //depot/projects/ia64/sys/netipsec/xform_ipcomp.c#3 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_serv.c#23 integrate .. //depot/projects/ia64/sys/opencrypto/crypto.c#10 integrate .. //depot/projects/ia64/sys/opencrypto/cryptodev.h#5 integrate .. //depot/projects/ia64/sys/opencrypto/cryptosoft.c#4 integrate .. //depot/projects/ia64/sys/pc98/i386/machdep.c#37 integrate .. //depot/projects/ia64/sys/pci/agp_via.c#7 integrate .. //depot/projects/ia64/sys/powerpc/include/cpu.h#9 integrate .. //depot/projects/ia64/sys/powerpc/powermac/grackle.c#1 branch .. //depot/projects/ia64/sys/powerpc/powermac/gracklevar.h#1 branch .. //depot/projects/ia64/sys/powerpc/powermac/hrowpic.c#1 branch .. //depot/projects/ia64/sys/powerpc/powermac/hrowpicvar.h#1 branch .. //depot/projects/ia64/sys/powerpc/powerpc/busdma_machdep.c#14 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#28 integrate .. //depot/projects/ia64/sys/sparc64/pci/ofw_pci_if.m#1 branch .. //depot/projects/ia64/sys/sparc64/sparc64/iommu.c#20 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#41 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/trap.c#29 integrate .. //depot/projects/ia64/sys/sys/kse.h#12 integrate .. //depot/projects/ia64/sys/sys/proc.h#69 integrate .. //depot/projects/ia64/sys/sys/smp.h#4 integrate .. //depot/projects/ia64/sys/sys/syscall.h#28 integrate .. //depot/projects/ia64/sys/sys/syscall.mk#28 integrate .. //depot/projects/ia64/sys/sys/sysproto.h#31 integrate .. //depot/projects/ia64/sys/sys/watchdog.h#2 integrate .. //depot/projects/ia64/sys/vm/device_pager.c#13 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#31 integrate .. //depot/projects/ia64/sys/vm/uma_core.c#42 integrate .. //depot/projects/ia64/sys/vm/uma_int.h#13 integrate .. //depot/projects/ia64/sys/vm/vm_kern.c#24 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#56 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#49 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#40 integrate .. //depot/projects/ia64/sys/vm/vm_pageq.c#10 integrate .. //depot/projects/ia64/tools/regression/lib/libc/stdio/Makefile#3 integrate .. //depot/projects/ia64/tools/regression/lib/libc/stdio/test-scanfloat.c#1 branch .. //depot/projects/ia64/tools/tools/README#10 integrate .. //depot/projects/ia64/tools/tools/ath/Makefile#1 branch .. //depot/projects/ia64/tools/tools/ath/athstats.c#1 branch .. //depot/projects/ia64/usr.bin/Makefile#49 integrate .. //depot/projects/ia64/usr.bin/ar/Makefile#5 delete .. //depot/projects/ia64/usr.bin/ar/append.c#4 delete .. //depot/projects/ia64/usr.bin/ar/ar.1#3 delete .. //depot/projects/ia64/usr.bin/ar/ar.1aout#3 delete .. //depot/projects/ia64/usr.bin/ar/ar.5#2 delete .. //depot/projects/ia64/usr.bin/ar/ar.c#6 delete .. //depot/projects/ia64/usr.bin/ar/archive.c#4 delete .. //depot/projects/ia64/usr.bin/ar/archive.h#4 delete .. //depot/projects/ia64/usr.bin/ar/contents.c#4 delete .. //depot/projects/ia64/usr.bin/ar/delete.c#4 delete .. //depot/projects/ia64/usr.bin/ar/extern.h#4 delete .. //depot/projects/ia64/usr.bin/ar/extract.c#4 delete .. //depot/projects/ia64/usr.bin/ar/misc.c#5 delete .. //depot/projects/ia64/usr.bin/ar/move.c#4 delete .. //depot/projects/ia64/usr.bin/ar/pathnames.h#2 delete .. //depot/projects/ia64/usr.bin/ar/print.c#4 delete .. //depot/projects/ia64/usr.bin/ar/replace.c#4 delete .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#32 integrate .. //depot/projects/ia64/usr.bin/elfdump/elfdump.1#4 integrate .. //depot/projects/ia64/usr.bin/elfdump/elfdump.c#4 integrate .. //depot/projects/ia64/usr.bin/finger/finger.1#7 integrate .. //depot/projects/ia64/usr.bin/finger/finger.c#9 integrate .. //depot/projects/ia64/usr.bin/fstat/cd9660.c#4 integrate .. //depot/projects/ia64/usr.bin/fstat/fstat.c#15 integrate .. //depot/projects/ia64/usr.bin/fstat/msdosfs.c#4 integrate .. //depot/projects/ia64/usr.bin/ftp/Makefile#4 integrate .. //depot/projects/ia64/usr.bin/locale/Makefile#3 integrate .. //depot/projects/ia64/usr.bin/locale/locale.1#2 integrate .. //depot/projects/ia64/usr.bin/locale/locale.c#3 integrate .. //depot/projects/ia64/usr.bin/nm/Makefile#2 delete .. //depot/projects/ia64/usr.bin/nm/nm.1#3 delete .. //depot/projects/ia64/usr.bin/nm/nm.1aout#3 delete .. //depot/projects/ia64/usr.bin/nm/nm.c#5 delete .. //depot/projects/ia64/usr.bin/size/Makefile#4 delete .. //depot/projects/ia64/usr.bin/size/size.1#3 delete .. //depot/projects/ia64/usr.bin/size/size.1aout#2 delete .. //depot/projects/ia64/usr.bin/size/size.c#4 delete .. //depot/projects/ia64/usr.bin/strings/Makefile#4 delete .. //depot/projects/ia64/usr.bin/strings/strings.1#3 delete .. //depot/projects/ia64/usr.bin/strings/strings.1aout#2 delete .. //depot/projects/ia64/usr.bin/strings/strings.c#4 delete .. //depot/projects/ia64/usr.bin/strip/Makefile#6 delete .. //depot/projects/ia64/usr.bin/strip/strip.1#3 delete .. //depot/projects/ia64/usr.bin/strip/strip.1aout#2 delete .. //depot/projects/ia64/usr.bin/strip/strip.c#3 delete .. //depot/projects/ia64/usr.bin/w/w.c#7 integrate .. //depot/projects/ia64/usr.bin/whois/whois.c#9 integrate .. //depot/projects/ia64/usr.sbin/Makefile#42 integrate .. //depot/projects/ia64/usr.sbin/adduser/adduser.sh#9 integrate .. //depot/projects/ia64/usr.sbin/bluetooth/hcsecd/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/jail/jail.8#11 integrate .. //depot/projects/ia64/usr.sbin/ppp/radius.c#11 integrate .. //depot/projects/ia64/usr.sbin/ppp/radius.h#8 integrate .. //depot/projects/ia64/usr.sbin/raycontrol/raycontrol.c#4 integrate .. //depot/projects/ia64/usr.sbin/watchdogd/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/watchdogd/watchdogd.8#1 branch .. //depot/projects/ia64/usr.sbin/watchdogd/watchdogd.c#1 branch .. //depot/projects/ia64/usr.sbin/wicontrol/wicontrol.c#13 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#68 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.368 2003/06/22 10:01:03 simokawa Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.369 2003/06/28 04:46:45 smkelly Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -94,7 +94,7 @@ # rebuilt before you do them. .if defined(LOCAL_DIRS) .for _DIR in ${LOCAL_DIRS} -.if exists(${.CURDIR}/${_DIR}) & exists(${.CURDIR}/${_DIR}/Makefile) +.if exists(${.CURDIR}/${_DIR}) && exists(${.CURDIR}/${_DIR}/Makefile) SUBDIR+= ${_DIR} .endif .endfor ==== //depot/projects/ia64/contrib/gcc/gcc.1#5 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/contrib/gcc/gcc.1,v 1.18 2003/02/01 18:39:32 imp Exp $ +.\" $FreeBSD: src/contrib/gcc/gcc.1,v 1.19 2003/06/25 16:12:05 obrien Exp $ .\" Copyright (c) 1991, 1992, 1993, 1994 Free Software Foundation -*-Text-*- .\" See section COPYING for conditions for redistribution .\" @@ -541,8 +541,7 @@ .SH FreeBSD SPECIFIC OPTIONS .TP .BI "\-pthread" -Link a user-threaded process against libc_r instead of libc. Objects linked -into user-threaded processes should be compiled with -D_THREAD_SAFE. +Link a user-threaded process against libc_r instead of libc. .SH OVERALL OPTIONS .TP .BI "\-x " "language" ==== //depot/projects/ia64/crypto/openssh/packet.c#7 (text+ko) ==== @@ -1344,6 +1344,7 @@ /* Only set socket options if using a socket. */ if (!packet_connection_is_on_socket()) + return; if (interactive) set_nodelay(connection_in); #if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN) ==== //depot/projects/ia64/etc/defaults/rc.conf#35 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.179 2003/06/14 22:26:30 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.180 2003/06/26 09:50:50 smkelly Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -430,6 +430,7 @@ jail_set_hostname_allow="YES" # Allow root user in a jail to change its hostname jail_socket_unixiproute_only="YES" # Route only TCP/IP within a jail jail_sysvipc_allow="NO" # Allow SystemV IPC use from within a jail +watchdogd_enable="NO" # Start the software watchdog daemon ############################################################## ### Define source_rc_confs, the mechanism used by /etc/rc.* ## ==== //depot/projects/ia64/etc/mtree/BSD.include.dist#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.67 2003/06/12 14:28:31 harti Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.69 2003/06/25 14:59:17 sam Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -85,6 +85,8 @@ .. net .. + net80211 + .. netatalk .. netatm @@ -98,6 +100,8 @@ .. .. netgraph + atm + .. bluetooth include .. ==== //depot/projects/ia64/etc/network.subr#6 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.150 2003/06/09 17:34:31 mtm Exp $ +# $FreeBSD: src/etc/network.subr,v 1.151 2003/06/24 03:55:21 kuriyama Exp $ # # @@ -157,7 +157,7 @@ _list= for ifn in ${cloned_interfaces}; do ifconfig ${ifn} create - if $? ; then + if [ $? -eq 0 ]; then _list="${_list}${_prefix}${ifn}" [ -z "$_prefix" ] && _prefix=' ' fi @@ -174,7 +174,7 @@ _list= for ifn in ${cloned_interfaces}; do ifconfig ${ifn} destroy - if $? ; then + if [ $? -eq 0 ]; then _list="${_list}${_prefix}${ifn}" [ -z "$_prefix" ] && _prefix=' ' fi ==== //depot/projects/ia64/etc/rc.d/Makefile#16 (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.18 2003/06/20 09:47:09 phk Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.19 2003/06/26 09:50:51 smkelly Exp $ .include @@ -17,8 +17,8 @@ ntpdate othermta pccard pcvt ppp-user pppoed pwcheck quota random \ rarpd rcconf.sh root route6d routed rpcbind rtadvd rwho savecore \ securelevel sendmail serial sppp sshd swap1 syscons sysctl \ - syslogd timed ttys usbd vinum virecover ypbind yppasswdd ypserv \ - ypset ypupdated ypxfrd + syslogd timed ttys usbd vinum virecover watchdogd ypbind \ + yppasswdd ypserv ypset ypupdated ypxfrd FILESDIR= /etc/rc.d FILESMODE= ${BINMODE} ==== //depot/projects/ia64/gnu/lib/libstdc++/Makefile#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.45 2003/06/14 13:30:32 des Exp $ +# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.46 2003/06/26 01:30:44 peter Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc SRCDIR= ${.CURDIR}/../../../contrib/libstdc++ @@ -8,11 +8,6 @@ ${SRCDIR}/config/locale/generic ${SRCDIR} ${SRCDIR}/std \ ${SUPDIR} ${GCCDIR} -.if ${MACHINE_ARCH} == "amd64" -NOPIC= broken # need libgcc.so or libgcc_pic.a -NOSHARED= broken -.endif - #SUBDIR= doc LIB= stdc++ ==== //depot/projects/ia64/gnu/usr.bin/binutils/as/alpha-freebsd/config.h#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/as/alpha-freebsd/config.h,v 1.9 2002/12/02 09:43:15 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/as/alpha-freebsd/config.h,v 1.10 2003/06/26 16:13:36 obrien Exp $ */ #define HAVE_DECL_GETOPT 1 @@ -226,10 +226,10 @@ #define BFD_ASSEMBLER 1 /* Target alias. */ -#define TARGET_ALIAS "alpha-obrien-freebsd5.0" +#define TARGET_ALIAS "alpha-obrien-freebsd5" /* Canonical target. */ -#define TARGET_CANONICAL "alpha-obrien-freebsd5.0" +#define TARGET_CANONICAL "alpha-obrien-freebsd5" /* Target CPU. */ #define TARGET_CPU "alpha" @@ -238,7 +238,7 @@ #define TARGET_VENDOR "obrien" /* Target OS. */ -#define TARGET_OS "freebsd5.0" +#define TARGET_OS "freebsd5" /* Define if you have the stpcpy function */ #define HAVE_STPCPY 1 ==== //depot/projects/ia64/gnu/usr.bin/binutils/as/i386-freebsd/config.h#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/as/i386-freebsd/config.h,v 1.9 2002/12/02 09:43:15 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/as/i386-freebsd/config.h,v 1.10 2003/06/26 16:13:36 obrien Exp $ */ #define HAVE_DECL_GETOPT 1 @@ -226,10 +226,10 @@ #define BFD_ASSEMBLER 1 /* Target alias. */ -#define TARGET_ALIAS "i386-obrien-freebsd5.0" +#define TARGET_ALIAS "i386-obrien-freebsd5" /* Canonical target. */ -#define TARGET_CANONICAL "i386-obrien-freebsd5.0" +#define TARGET_CANONICAL "i386-obrien-freebsd5" /* Target CPU. */ #define TARGET_CPU "i386" @@ -238,7 +238,7 @@ #define TARGET_VENDOR "obrien" /* Target OS. */ -#define TARGET_OS "freebsd5.0" +#define TARGET_OS "freebsd5" /* Define if you have the stpcpy function */ #define HAVE_STPCPY 1 ==== //depot/projects/ia64/gnu/usr.bin/binutils/as/ia64-freebsd/config.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/as/ia64-freebsd/config.h,v 1.4 2002/10/20 07:50:18 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/as/ia64-freebsd/config.h,v 1.5 2003/06/26 16:13:36 obrien Exp $ */ #define HAVE_DECL_GETOPT 1 @@ -229,10 +229,10 @@ #define BFD_ASSEMBLER 1 /* Target alias. */ -#define TARGET_ALIAS "ia64-obrien-freebsd5.0" +#define TARGET_ALIAS "ia64-obrien-freebsd5" /* Canonical target. */ -#define TARGET_CANONICAL "ia64-obrien-freebsd5.0" +#define TARGET_CANONICAL "ia64-obrien-freebsd5" /* Target CPU. */ #define TARGET_CPU "ia64" @@ -241,7 +241,7 @@ #define TARGET_VENDOR "obrien" /* Target OS. */ -#define TARGET_OS "freebsd5.0" +#define TARGET_OS "freebsd5" /* Define if you have the stpcpy function */ #define HAVE_STPCPY 1 ==== //depot/projects/ia64/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h,v 1.6 2002/10/20 07:50:18 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h,v 1.7 2003/06/26 16:13:36 obrien Exp $ */ #define HAVE_DECL_GETOPT 1 @@ -229,10 +229,10 @@ #define BFD_ASSEMBLER 1 /* Target alias. */ -#define TARGET_ALIAS "powerpc-obrien-freebsd5.0" +#define TARGET_ALIAS "powerpc-obrien-freebsd5" /* Canonical target. */ -#define TARGET_CANONICAL "powerpc-obrien-freebsd5.0" +#define TARGET_CANONICAL "powerpc-obrien-freebsd5" /* Target CPU. */ #define TARGET_CPU "powerpc" @@ -241,7 +241,7 @@ #define TARGET_VENDOR "obrien" /* Target OS. */ -#define TARGET_OS "freebsd5.0" +#define TARGET_OS "freebsd5" /* Define if you have the stpcpy function */ #define HAVE_STPCPY 1 ==== //depot/projects/ia64/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h,v 1.8 2002/12/02 09:43:15 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h,v 1.9 2003/06/26 16:13:36 obrien Exp $ */ #define HAVE_DECL_GETOPT 1 @@ -226,10 +226,10 @@ #define BFD_ASSEMBLER 1 /* Target alias. */ -#define TARGET_ALIAS "sparc64-obrien-freebsd5.0" +#define TARGET_ALIAS "sparc64-obrien-freebsd5" /* Canonical target. */ -#define TARGET_CANONICAL "sparc64-obrien-freebsd5.0" +#define TARGET_CANONICAL "sparc64-obrien-freebsd5" /* Target CPU. */ #define TARGET_CPU "sparc64" @@ -238,7 +238,7 @@ #define TARGET_VENDOR "obrien" /* Target OS. */ -#define TARGET_OS "freebsd5.0" +#define TARGET_OS "freebsd5" /* Define if you have the stpcpy function */ #define HAVE_STPCPY 1 ==== //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/Makefile#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.68 2003/05/01 15:00:46 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.70 2003/06/26 20:34:08 peter Exp $ # # This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk @@ -143,9 +143,8 @@ echo 'union tree_node;' >> ${.TARGET} echo 'typedef union tree_node *tree;' >> ${.TARGET} echo '' >> ${.TARGET} -# XXX: consider including i386/biarch64.h instead of below .if ${TARGET_ARCH} == "amd64" - echo '#define TARGET_64BIT_DEFAULT 1' >>${.TARGET} + echo '#include "i386/biarch64.h"' >> ${.TARGET} .endif .if ${TARGET_ARCH} == "ia64" echo '#define TARGET_CPU_DEFAULT (MASK_GNU_AS|MASK_GNU_LD)' >>${.TARGET} ==== //depot/projects/ia64/include/Makefile#29 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.199 2003/06/23 14:43:43 ru Exp $ +# $FreeBSD: src/include/Makefile,v 1.203 2003/06/28 06:08:27 sam Exp $ # # Doing a "make install" builds /usr/include. @@ -27,8 +27,8 @@ LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdint.h syslog.h \ termios.h ucontext.h -LDIRS= cam geom net netatalk netatm netgraph netinet netinet6 netipsec \ - netipx netkey netnatm netncp netsmb nfs nfsclient nfsserver \ +LDIRS= cam geom net net80211 netatalk netatm netgraph netinet netinet6 \ + netipsec netipx netkey netnatm netncp netsmb nfs nfsclient nfsserver \ pccard posix4 sys vm LSUBDIRS= cam/scsi dev/an dev/ic dev/iicbus dev/firewire dev/ofw \ @@ -36,8 +36,9 @@ fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \ fs/procfs fs/smbfs fs/umapfs fs/unionfs isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ - security/mac_biba security/mac_bsdextended security/mac_lomac\ - security/mac_mls security/mac_partition ufs/ffs ufs/ufs + netgraph/atm security/mac_biba security/mac_bsdextended \ + security/mac_lomac security/mac_mls security/mac_partition \ + ufs/ffs ufs/ufs LSUBSUBDIRS= netgraph/bluetooth/include ==== //depot/projects/ia64/include/paths.h#10 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)paths.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/paths.h,v 1.20 2003/06/20 22:50:33 phk Exp $ + * $FreeBSD: src/include/paths.h,v 1.21 2003/06/25 22:28:33 phantom Exp $ */ #ifndef _PATHS_H_ @@ -62,6 +62,7 @@ #define _PATH_IFCONFIG "/sbin/ifconfig" #define _PATH_KMEM "/dev/kmem" #define _PATH_LIBMAP_CONF "/etc/libmap.conf" +#define _PATH_LOCALE "/usr/share/locale" #define _PATH_LOGIN "/usr/bin/login" #define _PATH_MAILDIR "/var/mail" #define _PATH_MAN "/usr/share/man" ==== //depot/projects/ia64/include/rune.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)rune.h 8.1 (Berkeley) 6/27/93 - * $FreeBSD: src/include/rune.h,v 1.3 2002/09/06 04:22:54 mike Exp $ + * $FreeBSD: src/include/rune.h,v 1.4 2003/06/25 22:28:33 phantom Exp $ */ #ifndef _RUNE_H_ @@ -48,8 +48,6 @@ typedef __rune_t rune_t; #endif -#define _PATH_LOCALE "/usr/share/locale" - #define _INVALID_RUNE _CurrentRuneLocale->invalid_rune #define __sgetrune _CurrentRuneLocale->sgetrune ==== //depot/projects/ia64/include/stdlib.h#20 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.51 2003/06/22 10:34:49 dwmalone Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.54 2003/06/25 19:06:40 obrien Exp $ */ #ifndef _STDLIB_H_ @@ -222,7 +222,6 @@ extern void (*_malloc_message)(const char *, const char *, const char *, const char *); -#ifndef alloca /* * The alloca() function can't be implemented in C, and on some * platforms it can't be implemented at all as a callable function. @@ -232,12 +231,12 @@ * programs which use it will fail to link when compiled with non-GNU * compilers. */ -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#if __GNUC__ >= 2 || defined(__INTEL_COMPILER) +#undef alloca /* some GNU bits try to get cute and define this on their own */ #define alloca(sz) __builtin_alloca(sz) -#else +#elif defined(lint) void *alloca(size_t); #endif -#endif __uint32_t arc4random(void); ==== //depot/projects/ia64/lib/Makefile#29 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.160 2003/06/02 22:22:52 peter Exp $ +# $FreeBSD: src/lib/Makefile,v 1.162 2003/06/27 07:41:51 marcel Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -29,7 +29,7 @@ libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \ libnetgraph libopie libpam libpanel libpcap ${_libpthread} \ ${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \ - ${_libstand} ${_libtelnet} ${_libthr} libufs libugidfw libusbhid \ + libstand ${_libtelnet} ${_libthr} libufs libugidfw libusbhid \ ${_libvgl} libwrap libxpg4 liby libz .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) @@ -40,13 +40,12 @@ _csu=csu .endif -.if ${MACHINE_ARCH} != "amd64" -_libstand= libstand -.endif - +# libc_r is obsolete on ia64. +.if ${MACHINE_ARCH} != "ia64" .if !defined(NOLIBC_R) _libc_r= libc_r .endif +.endif .if !defined(NO_BIND) _libbind= libbind @@ -73,6 +72,9 @@ .endif .if ${MACHINE_ARCH} == "ia64" +.if !defined(NOLIBPTHREAD) +_libpthread= libpthread +.endif .if !defined(NOLIBTHR) _libthr= libthr .endif ==== //depot/projects/ia64/lib/libc/gen/getpwent.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getpwent.c,v 1.81 2003/05/01 19:03:13 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getpwent.c,v 1.82 2003/06/27 03:37:44 jwd Exp $"); #include "namespace.h" #include @@ -938,14 +938,15 @@ nis_map(char *domain, enum nss_lookup_type how, char *buffer, size_t bufsize, int *master) { - int rv, order; + int rv; + char *outname; *master = 0; if (geteuid() == 0) { if (snprintf(buffer, bufsize, "master.passwd.by%s", (how == nss_lt_id) ? "uid" : "name") >= bufsize) return (NS_UNAVAIL); - rv = yp_order(domain, buffer, &order); + rv = yp_master(domain, buffer, &outname); if (rv == 0) { *master = 1; return (NS_SUCCESS); @@ -954,7 +955,7 @@ if (snprintf(buffer, bufsize, "passwd.by%s", (how == nss_lt_id) ? "uid" : "name") >= bufsize) return (NS_UNAVAIL); - rv = yp_order(domain, buffer, &order); + rv = yp_master(domain, buffer, &outname); if (rv == 0) return (NS_SUCCESS); return (NS_UNAVAIL); ==== //depot/projects/ia64/lib/libc/gen/sigsetops.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)sigsetops.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/sigsetops.3,v 1.7 2002/12/18 13:33:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/sigsetops.3,v 1.8 2003/06/24 15:27:31 yar Exp $ .\" .Dd June 4, 1993 .Dt SIGSETOPS 3 @@ -110,6 +110,8 @@ .Sh SEE ALSO .Xr kill 2 , .Xr sigaction 2 , +.Xr sigpending 2 , +.Xr sigprocmask 2 , .Xr sigsuspend 2 .Sh STANDARDS These functions are defined by ==== //depot/projects/ia64/lib/libc/gen/ttyname.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)ttyname.c 8.2 (Berkeley) 1/27/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/ttyname.c,v 1.14 2003/06/21 08:16:12 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/ttyname.c,v 1.15 2003/06/24 22:20:06 ache Exp $"); #include "namespace.h" #include @@ -52,7 +52,7 @@ #include "libc_private.h" -static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV; +static char buf[sizeof(_PATH_DEV) + MAXNAMLEN]; static char *oldttyname(int, struct stat *); static char *ttyname_threaded(int fd); static char *ttyname_unthreaded(int fd); ==== //depot/projects/ia64/lib/libc/i386/gen/alloca.S#4 (text+ko) ==== @@ -34,12 +34,14 @@ * SUCH DAMAGE. */ -#ifndef __GNUC__ +#if !defined(__GNUC__) && !defined(__INTEL_COMPILER) +#error Please add alloca support for this compiler on FreeBSD. + #if defined(LIBC_SCCS) && !defined(lint) .asciz "@(#)alloca.s 5.2 (Berkeley) 5/14/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/alloca.S,v 1.11 2003/06/14 06:04:23 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/alloca.S,v 1.12 2003/06/25 19:06:40 obrien Exp $"); /* like alloc, but automatic automatic free in return */ @@ -57,4 +59,4 @@ pushl 0(%ecx) pushl %eax /* dummy to pop at callsite */ jmp *%edx /* "return" */ -#endif /*__GNUC__*/ +#endif /*!__GNUC__*/ ==== //depot/projects/ia64/lib/libc/ia64/gen/Makefile.inc#13 (text+ko) ==== @@ -1,9 +1,10 @@ -# $FreeBSD: src/lib/libc/ia64/gen/Makefile.inc,v 1.7 2003/05/31 19:42:51 marcel Exp $ +# $FreeBSD: src/lib/libc/ia64/gen/Makefile.inc,v 1.8 2003/06/24 05:06:42 marcel Exp $ SRCS+= __divdf3.S __divdi3.S __divsf3.S __divsi3.S __moddi3.S __modsi3.S \ __udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S _setjmp.S fabs.S \ fpgetmask.c fpgetround.c fpsetmask.c fpsetround.c frexp.c infinity.c \ - isinf.c ldexp.c makecontext.c modf.c setjmp.S sigsetjmp.S + isinf.c ldexp.c makecontext.c modf.c setjmp.S signalcontext.c \ + sigsetjmp.S # The following may go away if function _Unwind_FindTableEntry() # will be part of GCC. ==== //depot/projects/ia64/lib/libc/locale/fix_grouping.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/fix_grouping.c,v 1.7 2002/03/22 21:52:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/fix_grouping.c,v 1.8 2003/06/26 10:46:16 phantom Exp $"); #include #include @@ -34,12 +34,15 @@ static const char nogrouping[] = { CHAR_MAX, '\0' }; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 28 22:51:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18B7D37B404; Sat, 28 Jun 2003 22:51:47 -0700 (PDT) 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 42DEB37B401 for ; Sat, 28 Jun 2003 22:51:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64A2543FFD for ; Sat, 28 Jun 2003 22:51:44 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5T5pi0U064112 for ; Sat, 28 Jun 2003 22:51:44 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5T5phkC064100 for perforce@freebsd.org; Sat, 28 Jun 2003 22:51:43 -0700 (PDT) Date: Sat, 28 Jun 2003 22:51:43 -0700 (PDT) Message-Id: <200306290551.h5T5phkC064100@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 33828 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, 29 Jun 2003 05:51:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=33828 Change 33828 by marcel@marcel_nfs on 2003/06/28 22:50:45 New branch: uart Ok, it's getting a bit chaotic. More than I like, but here's the deal: The sio(4) work on the ia64 branch grew beyond ia64 and was moved to the sio branch. On the sio branch, the revamp quickly became unmanageable due to the complexity of sio(4) being a console and a debug port without clean interfaces. On alpha, one cannot even build a kernel without sio(4). Anyway, it became clear that sio(4) could not be merged to CVS in conveniently small chunks or without making people unhappy about breakages. So, the idea grew to start a new driver that could be committed without much trouble and which would eventually replace sio(4). Much like ata replacing wdc. When the name uart(4) came up for the new driver, things started to get more complicated still. UART is not simply a term used for the ns8250 family of chips. It applies more generally. Having a generic UART framework in which the hardware is sufficiently abstracted so that it could support different chips ended up being the preferred solution. It would be ideal for solving the problem pc98 is facing. This is just the initial IFC. Affected files ... .. //depot/projects/uart/Makefile#1 branch .. //depot/projects/uart/alpha/Makefile#1 branch .. //depot/projects/uart/alpha/alpha/alpha-gdbstub.c#1 branch .. //depot/projects/uart/alpha/alpha/api_up1000.c#1 branch .. //depot/projects/uart/alpha/alpha/atomic.s#1 branch .. //depot/projects/uart/alpha/alpha/autoconf.c#1 branch .. //depot/projects/uart/alpha/alpha/busdma_machdep.c#1 branch .. //depot/projects/uart/alpha/alpha/busspace.c#1 branch .. //depot/projects/uart/alpha/alpha/clock.c#1 branch .. //depot/projects/uart/alpha/alpha/clock_if.m#1 branch .. //depot/projects/uart/alpha/alpha/cpuconf.c#1 branch .. //depot/projects/uart/alpha/alpha/critical.c#1 branch .. //depot/projects/uart/alpha/alpha/db_disasm.c#1 branch .. //depot/projects/uart/alpha/alpha/db_instruction.h#1 branch .. //depot/projects/uart/alpha/alpha/db_interface.c#1 branch .. //depot/projects/uart/alpha/alpha/db_trace.c#1 branch .. //depot/projects/uart/alpha/alpha/dec_1000a.c#1 branch .. //depot/projects/uart/alpha/alpha/dec_2100_a50.c#1 branch .. //depot/projects/uart/alpha/alpha/dec_2100_a500.c#1 branch .. //depot/projects/uart/alpha/alpha/dec_3000_300.c#1 branch .. //depot/projects/uart/alpha/alpha/dec_3000_500.c#1 branch .. //depot/projects/uart/alpha/alpha/dec_axppci_33.c#1 branch .. //depot/projects/uart/alpha/alpha/dec_eb164.c#1 branch .. //depot/projects/uart/alpha/alpha/dec_eb64plus.c#1 branch .. //depot/projects/uart/alpha/alpha/dec_kn20aa.c#1 branch .. //depot/projects/uart/alpha/alpha/dec_kn300.c#1 branch .. //depot/projects/uart/alpha/alpha/dec_kn8ae.c#1 branch .. //depot/projects/uart/alpha/alpha/dec_st550.c#1 branch .. //depot/projects/uart/alpha/alpha/dec_st6600.c#1 branch .. //depot/projects/uart/alpha/alpha/divrem.m4#1 branch .. //depot/projects/uart/alpha/alpha/dump_machdep.c#1 branch .. //depot/projects/uart/alpha/alpha/elf_machdep.c#1 branch .. //depot/projects/uart/alpha/alpha/exception.s#1 branch .. //depot/projects/uart/alpha/alpha/fp_emulate.c#1 branch .. //depot/projects/uart/alpha/alpha/genassym.c#1 branch .. //depot/projects/uart/alpha/alpha/ieee_float.c#1 branch .. //depot/projects/uart/alpha/alpha/ieee_float.h#1 branch .. //depot/projects/uart/alpha/alpha/in_cksum.c#1 branch .. //depot/projects/uart/alpha/alpha/interrupt.c#1 branch .. //depot/projects/uart/alpha/alpha/locore.s#1 branch .. //depot/projects/uart/alpha/alpha/machdep.c#1 branch .. //depot/projects/uart/alpha/alpha/mem.c#1 branch .. //depot/projects/uart/alpha/alpha/mp_machdep.c#1 branch .. //depot/projects/uart/alpha/alpha/pal.s#1 branch .. //depot/projects/uart/alpha/alpha/pmap.c#1 branch .. //depot/projects/uart/alpha/alpha/prom.c#1 branch .. //depot/projects/uart/alpha/alpha/prom_disp.s#1 branch .. //depot/projects/uart/alpha/alpha/promcons.c#1 branch .. //depot/projects/uart/alpha/alpha/sgmap.c#1 branch .. //depot/projects/uart/alpha/alpha/support.s#1 branch .. //depot/projects/uart/alpha/alpha/swtch.s#1 branch .. //depot/projects/uart/alpha/alpha/sys_machdep.c#1 branch .. //depot/projects/uart/alpha/alpha/timerreg.h#1 branch .. //depot/projects/uart/alpha/alpha/trap.c#1 branch .. //depot/projects/uart/alpha/alpha/vm_machdep.c#1 branch .. //depot/projects/uart/alpha/compile/.cvsignore#1 branch .. //depot/projects/uart/alpha/conf/GENERIC#1 branch .. //depot/projects/uart/alpha/conf/GENERIC.hints#1 branch .. //depot/projects/uart/alpha/conf/Makefile#1 branch .. //depot/projects/uart/alpha/conf/NOTES#1 branch .. //depot/projects/uart/alpha/conf/gethints.awk#1 branch .. //depot/projects/uart/alpha/include/_inttypes.h#1 branch .. //depot/projects/uart/alpha/include/_limits.h#1 branch .. //depot/projects/uart/alpha/include/_stdint.h#1 branch .. //depot/projects/uart/alpha/include/_types.h#1 branch .. //depot/projects/uart/alpha/include/alpha_cpu.h#1 branch .. //depot/projects/uart/alpha/include/asm.h#1 branch .. //depot/projects/uart/alpha/include/atomic.h#1 branch .. //depot/projects/uart/alpha/include/bootinfo.h#1 branch .. //depot/projects/uart/alpha/include/bus.h#1 branch .. //depot/projects/uart/alpha/include/bus_memio.h#1 branch .. //depot/projects/uart/alpha/include/bus_pio.h#1 branch .. //depot/projects/uart/alpha/include/bwx.h#1 branch .. //depot/projects/uart/alpha/include/chipset.h#1 branch .. //depot/projects/uart/alpha/include/clock.h#1 branch .. //depot/projects/uart/alpha/include/clockvar.h#1 branch .. //depot/projects/uart/alpha/include/cpu.h#1 branch .. //depot/projects/uart/alpha/include/cpuconf.h#1 branch .. //depot/projects/uart/alpha/include/cpufunc.h#1 branch .. //depot/projects/uart/alpha/include/critical.h#1 branch .. //depot/projects/uart/alpha/include/db_machdep.h#1 branch .. //depot/projects/uart/alpha/include/elf.h#1 branch .. //depot/projects/uart/alpha/include/endian.h#1 branch .. //depot/projects/uart/alpha/include/exec.h#1 branch .. //depot/projects/uart/alpha/include/float.h#1 branch .. //depot/projects/uart/alpha/include/floatingpoint.h#1 branch .. //depot/projects/uart/alpha/include/fpu.h#1 branch .. //depot/projects/uart/alpha/include/frame.h#1 branch .. //depot/projects/uart/alpha/include/ieee.h#1 branch .. //depot/projects/uart/alpha/include/ieeefp.h#1 branch .. //depot/projects/uart/alpha/include/in_cksum.h#1 branch .. //depot/projects/uart/alpha/include/inst.h#1 branch .. //depot/projects/uart/alpha/include/intr.h#1 branch .. //depot/projects/uart/alpha/include/intrcnt.h#1 branch .. //depot/projects/uart/alpha/include/ioctl_bt848.h#1 branch .. //depot/projects/uart/alpha/include/ioctl_meteor.h#1 branch .. //depot/projects/uart/alpha/include/kse.h#1 branch .. //depot/projects/uart/alpha/include/limits.h#1 branch .. //depot/projects/uart/alpha/include/md_var.h#1 branch .. //depot/projects/uart/alpha/include/mutex.h#1 branch .. //depot/projects/uart/alpha/include/pal.h#1 branch .. //depot/projects/uart/alpha/include/param.h#1 branch .. //depot/projects/uart/alpha/include/pc/bios.h#1 branch .. //depot/projects/uart/alpha/include/pc/display.h#1 branch .. //depot/projects/uart/alpha/include/pc/msdos.h#1 branch .. //depot/projects/uart/alpha/include/pc/vesa.h#1 branch .. //depot/projects/uart/alpha/include/pcb.h#1 branch .. //depot/projects/uart/alpha/include/pcpu.h#1 branch .. //depot/projects/uart/alpha/include/pmap.h#1 branch .. //depot/projects/uart/alpha/include/proc.h#1 branch .. //depot/projects/uart/alpha/include/profile.h#1 branch .. //depot/projects/uart/alpha/include/prom.h#1 branch .. //depot/projects/uart/alpha/include/pte.h#1 branch .. //depot/projects/uart/alpha/include/ptrace.h#1 branch .. //depot/projects/uart/alpha/include/reg.h#1 branch .. //depot/projects/uart/alpha/include/reloc.h#1 branch .. //depot/projects/uart/alpha/include/resource.h#1 branch .. //depot/projects/uart/alpha/include/rpb.h#1 branch .. //depot/projects/uart/alpha/include/runq.h#1 branch .. //depot/projects/uart/alpha/include/setjmp.h#1 branch .. //depot/projects/uart/alpha/include/sgmap.h#1 branch .. //depot/projects/uart/alpha/include/sigframe.h#1 branch .. //depot/projects/uart/alpha/include/signal.h#1 branch .. //depot/projects/uart/alpha/include/smp.h#1 branch .. //depot/projects/uart/alpha/include/stdarg.h#1 branch .. //depot/projects/uart/alpha/include/swiz.h#1 branch .. //depot/projects/uart/alpha/include/sysarch.h#1 branch .. //depot/projects/uart/alpha/include/ucontext.h#1 branch .. //depot/projects/uart/alpha/include/varargs.h#1 branch .. //depot/projects/uart/alpha/include/vmparam.h#1 branch .. //depot/projects/uart/alpha/isa/isa.c#1 branch .. //depot/projects/uart/alpha/isa/isa_dma.c#1 branch .. //depot/projects/uart/alpha/isa/isavar.h#1 branch .. //depot/projects/uart/alpha/isa/mcclock_isa.c#1 branch .. //depot/projects/uart/alpha/linux/Makefile#1 branch .. //depot/projects/uart/alpha/linux/linux.h#1 branch .. //depot/projects/uart/alpha/linux/linux_dummy.c#1 branch .. //depot/projects/uart/alpha/linux/linux_genassym.c#1 branch .. //depot/projects/uart/alpha/linux/linux_ipc64.h#1 branch .. //depot/projects/uart/alpha/linux/linux_locore.s#1 branch .. //depot/projects/uart/alpha/linux/linux_machdep.c#1 branch .. //depot/projects/uart/alpha/linux/linux_proto.h#1 branch .. //depot/projects/uart/alpha/linux/linux_syscall.h#1 branch .. //depot/projects/uart/alpha/linux/linux_sysent.c#1 branch .. //depot/projects/uart/alpha/linux/linux_sysvec.c#1 branch .. //depot/projects/uart/alpha/linux/syscalls.conf#1 branch .. //depot/projects/uart/alpha/linux/syscalls.master#1 branch .. //depot/projects/uart/alpha/mcbus/mcbus.c#1 branch .. //depot/projects/uart/alpha/mcbus/mcbusreg.h#1 branch .. //depot/projects/uart/alpha/mcbus/mcbusvar.h#1 branch .. //depot/projects/uart/alpha/mcbus/mcmem.c#1 branch .. //depot/projects/uart/alpha/mcbus/mcpcia.c#1 branch .. //depot/projects/uart/alpha/mcbus/mcpciareg.h#1 branch .. //depot/projects/uart/alpha/mcbus/mcpciavar.h#1 branch .. //depot/projects/uart/alpha/osf1/Makefile#1 branch .. //depot/projects/uart/alpha/osf1/README.mach-traps#1 branch .. //depot/projects/uart/alpha/osf1/exec_ecoff.h#1 branch .. //depot/projects/uart/alpha/osf1/imgact_osf1.c#1 branch .. //depot/projects/uart/alpha/osf1/osf1.h#1 branch .. //depot/projects/uart/alpha/osf1/osf1_ioctl.c#1 branch .. //depot/projects/uart/alpha/osf1/osf1_misc.c#1 branch .. //depot/projects/uart/alpha/osf1/osf1_mount.c#1 branch .. //depot/projects/uart/alpha/osf1/osf1_proto.h#1 branch .. //depot/projects/uart/alpha/osf1/osf1_signal.c#1 branch .. //depot/projects/uart/alpha/osf1/osf1_signal.h#1 branch .. //depot/projects/uart/alpha/osf1/osf1_syscall.h#1 branch .. //depot/projects/uart/alpha/osf1/osf1_sysent.c#1 branch .. //depot/projects/uart/alpha/osf1/osf1_sysvec.c#1 branch .. //depot/projects/uart/alpha/osf1/osf1_util.h#1 branch .. //depot/projects/uart/alpha/osf1/syscalls.conf#1 branch .. //depot/projects/uart/alpha/osf1/syscalls.master#1 branch .. //depot/projects/uart/alpha/pci/alphapci_if.m#1 branch .. //depot/projects/uart/alpha/pci/apecs.c#1 branch .. //depot/projects/uart/alpha/pci/apecs_pci.c#1 branch .. //depot/projects/uart/alpha/pci/apecsreg.h#1 branch .. //depot/projects/uart/alpha/pci/apecsvar.h#1 branch .. //depot/projects/uart/alpha/pci/bwx.c#1 branch .. //depot/projects/uart/alpha/pci/cia.c#1 branch .. //depot/projects/uart/alpha/pci/cia_pci.c#1 branch .. //depot/projects/uart/alpha/pci/ciareg.h#1 branch .. //depot/projects/uart/alpha/pci/ciavar.h#1 branch .. //depot/projects/uart/alpha/pci/irongate.c#1 branch .. //depot/projects/uart/alpha/pci/irongate_pci.c#1 branch .. //depot/projects/uart/alpha/pci/irongatereg.h#1 branch .. //depot/projects/uart/alpha/pci/irongatevar.h#1 branch .. //depot/projects/uart/alpha/pci/lca.c#1 branch .. //depot/projects/uart/alpha/pci/lca_pci.c#1 branch .. //depot/projects/uart/alpha/pci/lcareg.h#1 branch .. //depot/projects/uart/alpha/pci/lcavar.h#1 branch .. //depot/projects/uart/alpha/pci/pci_eb164_intr.s#1 branch .. //depot/projects/uart/alpha/pci/pci_eb64plus_intr.s#1 branch .. //depot/projects/uart/alpha/pci/pcibus.c#1 branch .. //depot/projects/uart/alpha/pci/pcibus.h#1 branch .. //depot/projects/uart/alpha/pci/swiz.c#1 branch .. //depot/projects/uart/alpha/pci/t2.c#1 branch .. //depot/projects/uart/alpha/pci/t2_pci.c#1 branch .. //depot/projects/uart/alpha/pci/t2reg.h#1 branch .. //depot/projects/uart/alpha/pci/t2var.h#1 branch .. //depot/projects/uart/alpha/pci/tsunami.c#1 branch .. //depot/projects/uart/alpha/pci/tsunami_pci.c#1 branch .. //depot/projects/uart/alpha/pci/tsunamireg.h#1 branch .. //depot/projects/uart/alpha/pci/tsunamivar.h#1 branch .. //depot/projects/uart/alpha/tlsb/dwlpx.c#1 branch .. //depot/projects/uart/alpha/tlsb/dwlpxreg.h#1 branch .. //depot/projects/uart/alpha/tlsb/dwlpxvar.h#1 branch .. //depot/projects/uart/alpha/tlsb/gbus.c#1 branch .. //depot/projects/uart/alpha/tlsb/gbusreg.h#1 branch .. //depot/projects/uart/alpha/tlsb/gbusvar.h#1 branch .. //depot/projects/uart/alpha/tlsb/kftxx.c#1 branch .. //depot/projects/uart/alpha/tlsb/kftxxreg.h#1 branch .. //depot/projects/uart/alpha/tlsb/kftxxvar.h#1 branch .. //depot/projects/uart/alpha/tlsb/mcclock_tlsb.c#1 branch .. //depot/projects/uart/alpha/tlsb/tlsb.c#1 branch .. //depot/projects/uart/alpha/tlsb/tlsbcpu.c#1 branch .. //depot/projects/uart/alpha/tlsb/tlsbmem.c#1 branch .. //depot/projects/uart/alpha/tlsb/tlsbreg.h#1 branch .. //depot/projects/uart/alpha/tlsb/tlsbvar.h#1 branch .. //depot/projects/uart/alpha/tlsb/zs_tlsb.c#1 branch .. //depot/projects/uart/alpha/tlsb/zsreg.h#1 branch .. //depot/projects/uart/alpha/tlsb/zsvar.h#1 branch .. //depot/projects/uart/amd64/Makefile#1 branch .. //depot/projects/uart/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/uart/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/uart/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/uart/amd64/amd64/amd64-gdbstub.c#1 branch .. //depot/projects/uart/amd64/amd64/atomic.c#1 branch .. //depot/projects/uart/amd64/amd64/autoconf.c#1 branch .. //depot/projects/uart/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/uart/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/uart/amd64/amd64/critical.c#1 branch .. //depot/projects/uart/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/uart/amd64/amd64/db_interface.c#1 branch .. //depot/projects/uart/amd64/amd64/db_trace.c#1 branch .. //depot/projects/uart/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/uart/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/uart/amd64/amd64/exception.S#1 branch .. //depot/projects/uart/amd64/amd64/genassym.c#1 branch .. //depot/projects/uart/amd64/amd64/identcpu.c#1 branch .. //depot/projects/uart/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/uart/amd64/amd64/initcpu.c#1 branch .. //depot/projects/uart/amd64/amd64/legacy.c#1 branch .. //depot/projects/uart/amd64/amd64/locore.S#1 branch .. //depot/projects/uart/amd64/amd64/machdep.c#1 branch .. //depot/projects/uart/amd64/amd64/mem.c#1 branch .. //depot/projects/uart/amd64/amd64/nexus.c#1 branch .. //depot/projects/uart/amd64/amd64/pmap.c#1 branch .. //depot/projects/uart/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/uart/amd64/amd64/support.S#1 branch .. //depot/projects/uart/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/uart/amd64/amd64/trap.c#1 branch .. //depot/projects/uart/amd64/amd64/tsc.c#1 branch .. //depot/projects/uart/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/uart/amd64/compile/.cvsignore#1 branch .. //depot/projects/uart/amd64/conf/GENERIC#1 branch .. //depot/projects/uart/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/uart/amd64/conf/Makefile#1 branch .. //depot/projects/uart/amd64/conf/gethints.awk#1 branch .. //depot/projects/uart/amd64/ia32/Makefile#1 branch .. //depot/projects/uart/amd64/ia32/ia32.h#1 branch .. //depot/projects/uart/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/uart/amd64/ia32/ia32_genassym.c#1 branch .. //depot/projects/uart/amd64/ia32/ia32_misc.c#1 branch .. //depot/projects/uart/amd64/ia32/ia32_proto.h#1 branch .. //depot/projects/uart/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/uart/amd64/ia32/ia32_signal.h#1 branch .. //depot/projects/uart/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/uart/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/uart/amd64/ia32/ia32_syscall.h#1 branch .. //depot/projects/uart/amd64/ia32/ia32_syscalls.c#1 branch .. //depot/projects/uart/amd64/ia32/ia32_sysent.c#1 branch .. //depot/projects/uart/amd64/ia32/ia32_sysvec.c#1 branch .. //depot/projects/uart/amd64/ia32/ia32_util.h#1 branch .. //depot/projects/uart/amd64/ia32/syscalls.conf#1 branch .. //depot/projects/uart/amd64/ia32/syscalls.master#1 branch .. //depot/projects/uart/amd64/include/_inttypes.h#1 branch .. //depot/projects/uart/amd64/include/_limits.h#1 branch .. //depot/projects/uart/amd64/include/_stdint.h#1 branch .. //depot/projects/uart/amd64/include/_types.h#1 branch .. //depot/projects/uart/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/uart/amd64/include/asm.h#1 branch .. //depot/projects/uart/amd64/include/asmacros.h#1 branch .. //depot/projects/uart/amd64/include/atomic.h#1 branch .. //depot/projects/uart/amd64/include/bus.h#1 branch .. //depot/projects/uart/amd64/include/bus_amd64.h#1 branch .. //depot/projects/uart/amd64/include/bus_dma.h#1 branch .. //depot/projects/uart/amd64/include/bus_memio.h#1 branch .. //depot/projects/uart/amd64/include/bus_pio.h#1 branch .. //depot/projects/uart/amd64/include/clock.h#1 branch .. //depot/projects/uart/amd64/include/cpu.h#1 branch .. //depot/projects/uart/amd64/include/cpufunc.h#1 branch .. //depot/projects/uart/amd64/include/cputypes.h#1 branch .. //depot/projects/uart/amd64/include/critical.h#1 branch .. //depot/projects/uart/amd64/include/db_machdep.h#1 branch .. //depot/projects/uart/amd64/include/elf.h#1 branch .. //depot/projects/uart/amd64/include/endian.h#1 branch .. //depot/projects/uart/amd64/include/exec.h#1 branch .. //depot/projects/uart/amd64/include/float.h#1 branch .. //depot/projects/uart/amd64/include/floatingpoint.h#1 branch .. //depot/projects/uart/amd64/include/frame.h#1 branch .. //depot/projects/uart/amd64/include/ieeefp.h#1 branch .. //depot/projects/uart/amd64/include/in_cksum.h#1 branch .. //depot/projects/uart/amd64/include/kse.h#1 branch .. //depot/projects/uart/amd64/include/legacyvar.h#1 branch .. //depot/projects/uart/amd64/include/limits.h#1 branch .. //depot/projects/uart/amd64/include/md_var.h#1 branch .. //depot/projects/uart/amd64/include/metadata.h#1 branch .. //depot/projects/uart/amd64/include/mutex.h#1 branch .. //depot/projects/uart/amd64/include/npx.h#1 branch .. //depot/projects/uart/amd64/include/param.h#1 branch .. //depot/projects/uart/amd64/include/pc/display.h#1 branch .. //depot/projects/uart/amd64/include/pcb.h#1 branch .. //depot/projects/uart/amd64/include/pcb_ext.h#1 branch .. //depot/projects/uart/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/uart/amd64/include/pcpu.h#1 branch .. //depot/projects/uart/amd64/include/pmap.h#1 branch .. //depot/projects/uart/amd64/include/proc.h#1 branch .. //depot/projects/uart/amd64/include/profile.h#1 branch .. //depot/projects/uart/amd64/include/psl.h#1 branch .. //depot/projects/uart/amd64/include/ptrace.h#1 branch .. //depot/projects/uart/amd64/include/reg.h#1 branch .. //depot/projects/uart/amd64/include/reloc.h#1 branch .. //depot/projects/uart/amd64/include/resource.h#1 branch .. //depot/projects/uart/amd64/include/runq.h#1 branch .. //depot/projects/uart/amd64/include/segments.h#1 branch .. //depot/projects/uart/amd64/include/setjmp.h#1 branch .. //depot/projects/uart/amd64/include/sigframe.h#1 branch .. //depot/projects/uart/amd64/include/signal.h#1 branch .. //depot/projects/uart/amd64/include/smp.h#1 branch .. //depot/projects/uart/amd64/include/specialreg.h#1 branch .. //depot/projects/uart/amd64/include/stdarg.h#1 branch .. //depot/projects/uart/amd64/include/sysarch.h#1 branch .. //depot/projects/uart/amd64/include/trap.h#1 branch .. //depot/projects/uart/amd64/include/tss.h#1 branch .. //depot/projects/uart/amd64/include/ucontext.h#1 branch .. //depot/projects/uart/amd64/include/varargs.h#1 branch .. //depot/projects/uart/amd64/include/vmparam.h#1 branch .. //depot/projects/uart/amd64/isa/clock.c#1 branch .. //depot/projects/uart/amd64/isa/icu.h#1 branch .. //depot/projects/uart/amd64/isa/icu_ipl.S#1 branch .. //depot/projects/uart/amd64/isa/icu_vector.S#1 branch .. //depot/projects/uart/amd64/isa/intr_machdep.c#1 branch .. //depot/projects/uart/amd64/isa/intr_machdep.h#1 branch .. //depot/projects/uart/amd64/isa/isa.c#1 branch .. //depot/projects/uart/amd64/isa/isa.h#1 branch .. //depot/projects/uart/amd64/isa/isa_dma.c#1 branch .. //depot/projects/uart/amd64/isa/isa_dma.h#1 branch .. //depot/projects/uart/amd64/isa/ithread.c#1 branch .. //depot/projects/uart/amd64/isa/npx.c#1 branch .. //depot/projects/uart/amd64/isa/timerreg.h#1 branch .. //depot/projects/uart/amd64/isa/vector.S#1 branch .. //depot/projects/uart/amd64/pci/pci_bus.c#1 branch .. //depot/projects/uart/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/uart/arm/compile/.cvsignore#1 branch .. //depot/projects/uart/arm/include/_limits.h#1 branch .. //depot/projects/uart/arm/include/_stdint.h#1 branch .. //depot/projects/uart/arm/include/_types.h#1 branch .. //depot/projects/uart/arm/include/elf.h#1 branch .. //depot/projects/uart/arm/include/endian.h#1 branch .. //depot/projects/uart/arm/include/exec.h#1 branch .. //depot/projects/uart/arm/include/limits.h#1 branch .. //depot/projects/uart/arm/include/param.h#1 branch .. //depot/projects/uart/arm/include/signal.h#1 branch .. //depot/projects/uart/arm/include/ucontext.h#1 branch .. //depot/projects/uart/boot/Makefile#1 branch .. //depot/projects/uart/boot/README#1 branch .. //depot/projects/uart/boot/alpha/Makefile#1 branch .. //depot/projects/uart/boot/alpha/Makefile.inc#1 branch .. //depot/projects/uart/boot/alpha/boot1/Makefile#1 branch .. //depot/projects/uart/boot/alpha/boot1/boot1.c#1 branch .. //depot/projects/uart/boot/alpha/cdboot/Makefile#1 branch .. //depot/projects/uart/boot/alpha/cdboot/version#1 branch .. //depot/projects/uart/boot/alpha/common/Makefile.common#1 branch .. //depot/projects/uart/boot/alpha/common/conf.c#1 branch .. //depot/projects/uart/boot/alpha/common/help.alpha#1 branch .. //depot/projects/uart/boot/alpha/common/main.c#1 branch .. //depot/projects/uart/boot/alpha/libalpha/Makefile#1 branch .. //depot/projects/uart/boot/alpha/libalpha/OSFpal.c#1 branch .. //depot/projects/uart/boot/alpha/libalpha/alpha_copy.c#1 branch .. //depot/projects/uart/boot/alpha/libalpha/alpha_module.c#1 branch .. //depot/projects/uart/boot/alpha/libalpha/bbinfo.h#1 branch .. //depot/projects/uart/boot/alpha/libalpha/bootinfo.c#1 branch .. //depot/projects/uart/boot/alpha/libalpha/common.h#1 branch .. //depot/projects/uart/boot/alpha/libalpha/delay.c#1 branch .. //depot/projects/uart/boot/alpha/libalpha/devicename.c#1 branch .. //depot/projects/uart/boot/alpha/libalpha/elf_freebsd.c#1 branch .. //depot/projects/uart/boot/alpha/libalpha/getsecs.c#1 branch .. //depot/projects/uart/boot/alpha/libalpha/libalpha.h#1 branch .. //depot/projects/uart/boot/alpha/libalpha/pal.S#1 branch .. //depot/projects/uart/boot/alpha/libalpha/prom.c#1 branch .. //depot/projects/uart/boot/alpha/libalpha/prom_disp.S#1 branch .. //depot/projects/uart/boot/alpha/libalpha/prom_swpal.S#1 branch .. //depot/projects/uart/boot/alpha/libalpha/reboot.c#1 branch .. //depot/projects/uart/boot/alpha/libalpha/srmdisk.c#1 branch .. //depot/projects/uart/boot/alpha/libalpha/srmnet.c#1 branch .. //depot/projects/uart/boot/alpha/libalpha/start.S#1 branch .. //depot/projects/uart/boot/alpha/libalpha/time.c#1 branch .. //depot/projects/uart/boot/alpha/loader/Makefile#1 branch .. //depot/projects/uart/boot/alpha/loader/version#1 branch .. //depot/projects/uart/boot/alpha/netboot/Makefile#1 branch .. //depot/projects/uart/boot/alpha/netboot/version#1 branch .. //depot/projects/uart/boot/arc/Makefile#1 branch .. //depot/projects/uart/boot/arc/Makefile.inc#1 branch .. //depot/projects/uart/boot/arc/include/arcfuncs.h#1 branch .. //depot/projects/uart/boot/arc/include/arctypes.h#1 branch .. //depot/projects/uart/boot/arc/include/libarc.h#1 branch .. //depot/projects/uart/boot/arc/lib/Makefile#1 branch .. //depot/projects/uart/boot/arc/lib/abort.c#1 branch .. //depot/projects/uart/boot/arc/lib/arcconsole.c#1 branch .. //depot/projects/uart/boot/arc/lib/arcdisk.c#1 branch .. //depot/projects/uart/boot/arc/lib/arch/alpha/copy.c#1 branch .. //depot/projects/uart/boot/arc/lib/arch/alpha/rpb.c#1 branch .. //depot/projects/uart/boot/arc/lib/arch/alpha/setjmp.S#1 branch .. //depot/projects/uart/boot/arc/lib/arch/alpha/start.S#1 branch .. //depot/projects/uart/boot/arc/lib/bootinfo.c#1 branch .. //depot/projects/uart/boot/arc/lib/delay.c#1 branch .. //depot/projects/uart/boot/arc/lib/devicename.c#1 branch .. //depot/projects/uart/boot/arc/lib/elf_freebsd.c#1 branch .. //depot/projects/uart/boot/arc/lib/module.c#1 branch .. //depot/projects/uart/boot/arc/lib/prom.c#1 branch .. //depot/projects/uart/boot/arc/lib/setjmperr.c#1 branch .. //depot/projects/uart/boot/arc/lib/time.c#1 branch .. //depot/projects/uart/boot/arc/loader/Makefile#1 branch .. //depot/projects/uart/boot/arc/loader/conf.c#1 branch .. //depot/projects/uart/boot/arc/loader/help.alpha#1 branch .. //depot/projects/uart/boot/arc/loader/main.c#1 branch .. //depot/projects/uart/boot/arc/loader/version#1 branch .. //depot/projects/uart/boot/common/Makefile.inc#1 branch .. //depot/projects/uart/boot/common/bcache.c#1 branch .. //depot/projects/uart/boot/common/boot.c#1 branch .. //depot/projects/uart/boot/common/bootstrap.h#1 branch .. //depot/projects/uart/boot/common/commands.c#1 branch .. //depot/projects/uart/boot/common/console.c#1 branch .. //depot/projects/uart/boot/common/dev_net.c#1 branch .. //depot/projects/uart/boot/common/dev_net.h#1 branch .. //depot/projects/uart/boot/common/devopen.c#1 branch .. //depot/projects/uart/boot/common/help.common#1 branch .. //depot/projects/uart/boot/common/interp.c#1 branch .. //depot/projects/uart/boot/common/interp_backslash.c#1 branch .. //depot/projects/uart/boot/common/interp_forth.c#1 branch .. //depot/projects/uart/boot/common/interp_parse.c#1 branch .. //depot/projects/uart/boot/common/isapnp.c#1 branch .. //depot/projects/uart/boot/common/isapnp.h#1 branch .. //depot/projects/uart/boot/common/load.c#1 branch .. //depot/projects/uart/boot/common/load_elf.c#1 branch .. //depot/projects/uart/boot/common/load_elf32.c#1 branch .. //depot/projects/uart/boot/common/load_elf64.c#1 branch .. //depot/projects/uart/boot/common/loader.8#1 branch .. //depot/projects/uart/boot/common/ls.c#1 branch .. //depot/projects/uart/boot/common/merge_help.awk#1 branch .. //depot/projects/uart/boot/common/misc.c#1 branch .. //depot/projects/uart/boot/common/module.c#1 branch .. //depot/projects/uart/boot/common/newvers.sh#1 branch .. //depot/projects/uart/boot/common/panic.c#1 branch .. //depot/projects/uart/boot/common/pnp.c#1 branch .. //depot/projects/uart/boot/common/pnpdata#1 branch .. //depot/projects/uart/boot/common/ufsread.c#1 branch .. //depot/projects/uart/boot/efi/Makefile#1 branch .. //depot/projects/uart/boot/efi/Makefile.inc#1 branch .. //depot/projects/uart/boot/efi/include/README#1 branch .. //depot/projects/uart/boot/efi/include/efi.h#1 branch .. //depot/projects/uart/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/uart/boot/efi/include/efiapi.h#1 branch .. //depot/projects/uart/boot/efi/include/eficon.h#1 branch .. //depot/projects/uart/boot/efi/include/efidebug.h#1 branch .. //depot/projects/uart/boot/efi/include/efidef.h#1 branch .. //depot/projects/uart/boot/efi/include/efidevp.h#1 branch .. //depot/projects/uart/boot/efi/include/efierr.h#1 branch .. //depot/projects/uart/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/uart/boot/efi/include/efifs.h#1 branch .. //depot/projects/uart/boot/efi/include/efilib.h#1 branch .. //depot/projects/uart/boot/efi/include/efinet.h#1 branch .. //depot/projects/uart/boot/efi/include/efipart.h#1 branch .. //depot/projects/uart/boot/efi/include/efiprot.h#1 branch .. //depot/projects/uart/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/uart/boot/efi/include/efiser.h#1 branch .. //depot/projects/uart/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/uart/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/uart/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/uart/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/uart/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/uart/boot/efi/libefi/Makefile#1 branch .. //depot/projects/uart/boot/efi/libefi/arch/ia64/ldscript.ia64#1 branch .. //depot/projects/uart/boot/efi/libefi/arch/ia64/start.S#1 branch .. //depot/projects/uart/boot/efi/libefi/bootinfo.c#1 branch .. //depot/projects/uart/boot/efi/libefi/copy.c#1 branch .. //depot/projects/uart/boot/efi/libefi/delay.c#1 branch .. //depot/projects/uart/boot/efi/libefi/devicename.c#1 branch .. //depot/projects/uart/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/uart/boot/efi/libefi/efiboot.h#1 branch .. //depot/projects/uart/boot/efi/libefi/efifpswa.c#1 branch .. //depot/projects/uart/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/uart/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/uart/boot/efi/libefi/elf_freebsd.c#1 branch .. //depot/projects/uart/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/uart/boot/efi/libefi/module.c#1 branch .. //depot/projects/uart/boot/efi/libefi/time.c#1 branch .. //depot/projects/uart/boot/efi/loader/Makefile#1 branch .. //depot/projects/uart/boot/efi/loader/conf.c#1 branch .. //depot/projects/uart/boot/efi/loader/main.c#1 branch .. //depot/projects/uart/boot/efi/loader/version#1 branch .. //depot/projects/uart/boot/ficl/Makefile#1 branch .. //depot/projects/uart/boot/ficl/alpha/sysdep.c#1 branch .. //depot/projects/uart/boot/ficl/alpha/sysdep.h#1 branch .. //depot/projects/uart/boot/ficl/dict.c#1 branch .. //depot/projects/uart/boot/ficl/ficl.c#1 branch .. //depot/projects/uart/boot/ficl/ficl.h#1 branch .. //depot/projects/uart/boot/ficl/fileaccess.c#1 branch .. //depot/projects/uart/boot/ficl/float.c#1 branch .. //depot/projects/uart/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/uart/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/uart/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/uart/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/uart/boot/ficl/loader.c#1 branch .. //depot/projects/uart/boot/ficl/math64.c#1 branch .. //depot/projects/uart/boot/ficl/math64.h#1 branch .. //depot/projects/uart/boot/ficl/prefix.c#1 branch .. //depot/projects/uart/boot/ficl/search.c#1 branch .. //depot/projects/uart/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/uart/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/uart/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/uart/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/uart/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/uart/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/uart/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/uart/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/uart/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/uart/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/uart/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/uart/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/uart/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/uart/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/uart/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/uart/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/uart/boot/ficl/stack.c#1 branch .. //depot/projects/uart/boot/ficl/testmain.c#1 branch .. //depot/projects/uart/boot/ficl/tools.c#1 branch .. //depot/projects/uart/boot/ficl/unix.c#1 branch .. //depot/projects/uart/boot/ficl/vm.c#1 branch .. //depot/projects/uart/boot/ficl/words.c#1 branch .. //depot/projects/uart/boot/forth/beastie.4th#1 branch .. //depot/projects/uart/boot/forth/frames.4th#1 branch .. //depot/projects/uart/boot/forth/loader.4th#1 branch .. //depot/projects/uart/boot/forth/loader.4th.8#1 branch .. //depot/projects/uart/boot/forth/loader.conf#1 branch .. //depot/projects/uart/boot/forth/loader.conf.5#1 branch .. //depot/projects/uart/boot/forth/loader.rc#1 branch .. //depot/projects/uart/boot/forth/pnp.4th#1 branch .. //depot/projects/uart/boot/forth/screen.4th#1 branch .. //depot/projects/uart/boot/forth/support.4th#1 branch .. //depot/projects/uart/boot/i386/Makefile#1 branch .. //depot/projects/uart/boot/i386/Makefile.inc#1 branch .. //depot/projects/uart/boot/i386/boot0/Makefile#1 branch .. //depot/projects/uart/boot/i386/boot0/boot0.s#1 branch .. //depot/projects/uart/boot/i386/boot2/Makefile#1 branch .. //depot/projects/uart/boot/i386/boot2/boot1.s#1 branch .. //depot/projects/uart/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/uart/boot/i386/boot2/lib.h#1 branch .. //depot/projects/uart/boot/i386/boot2/sio.s#1 branch .. //depot/projects/uart/boot/i386/btx/Makefile#1 branch .. //depot/projects/uart/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/uart/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/uart/boot/i386/btx/btx/btx.s#1 branch .. //depot/projects/uart/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/uart/boot/i386/btx/btxldr/btxldr.s#1 branch .. //depot/projects/uart/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/uart/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/uart/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/uart/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/uart/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/uart/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/uart/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/uart/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/uart/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/uart/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/uart/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/uart/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/uart/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/uart/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/uart/boot/i386/libi386/Makefile#1 branch .. //depot/projects/uart/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/uart/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/uart/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/uart/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/uart/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/uart/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/uart/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/uart/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/uart/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/uart/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/uart/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/uart/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/uart/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/uart/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/uart/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/uart/boot/i386/libi386/gatea20.c#1 branch .. //depot/projects/uart/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/uart/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/uart/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/uart/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/uart/boot/i386/libi386/pread.c#1 branch .. //depot/projects/uart/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/uart/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/uart/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/uart/boot/i386/libi386/time.c#1 branch .. //depot/projects/uart/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/uart/boot/i386/loader/Makefile#1 branch .. //depot/projects/uart/boot/i386/loader/conf.c#1 branch .. //depot/projects/uart/boot/i386/loader/help.i386#1 branch .. //depot/projects/uart/boot/i386/loader/loader.rc#1 branch .. //depot/projects/uart/boot/i386/loader/main.c#1 branch .. //depot/projects/uart/boot/i386/loader/version#1 branch .. //depot/projects/uart/boot/i386/mbr/Makefile#1 branch .. //depot/projects/uart/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/uart/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/uart/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/uart/boot/i386/pxeldr/pxeldr.s#1 branch .. //depot/projects/uart/boot/ia64/Makefile#1 branch .. //depot/projects/uart/boot/ia64/Makefile.inc#1 branch .. //depot/projects/uart/boot/ia64/libski/Makefile#1 branch .. //depot/projects/uart/boot/ia64/libski/acpi_stub.c#1 branch .. //depot/projects/uart/boot/ia64/libski/bootinfo.c#1 branch .. //depot/projects/uart/boot/ia64/libski/copy.c#1 branch .. //depot/projects/uart/boot/ia64/libski/delay.c#1 branch .. //depot/projects/uart/boot/ia64/libski/devicename.c#1 branch .. //depot/projects/uart/boot/ia64/libski/efi_stub.c#1 branch .. //depot/projects/uart/boot/ia64/libski/elf_freebsd.c#1 branch .. //depot/projects/uart/boot/ia64/libski/exit.c#1 branch .. //depot/projects/uart/boot/ia64/libski/libski.h#1 branch .. //depot/projects/uart/boot/ia64/libski/module.c#1 branch .. //depot/projects/uart/boot/ia64/libski/pal_stub.s#1 branch .. //depot/projects/uart/boot/ia64/libski/sal_stub.c#1 branch .. //depot/projects/uart/boot/ia64/libski/skiconsole.c#1 branch .. //depot/projects/uart/boot/ia64/libski/skifs.c#1 branch .. //depot/projects/uart/boot/ia64/libski/ssc.c#1 branch .. //depot/projects/uart/boot/ia64/libski/time.c#1 branch .. //depot/projects/uart/boot/ia64/skiload/Makefile#1 branch .. //depot/projects/uart/boot/ia64/skiload/conf.c#1 branch .. //depot/projects/uart/boot/ia64/skiload/ldscript.ia64#1 branch .. //depot/projects/uart/boot/ia64/skiload/main.c#1 branch .. //depot/projects/uart/boot/ia64/skiload/skiload.cmd#1 branch .. //depot/projects/uart/boot/ia64/skiload/version#1 branch .. //depot/projects/uart/boot/ofw/Makefile#1 branch .. //depot/projects/uart/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/uart/boot/ofw/common/main.c#1 branch .. //depot/projects/uart/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/uart/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/uart/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/uart/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/uart/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/uart/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/uart/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/uart/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/uart/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/uart/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/uart/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/uart/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/uart/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/uart/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/uart/boot/pc98/Makefile#1 branch .. //depot/projects/uart/boot/pc98/Makefile.inc#1 branch .. //depot/projects/uart/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/uart/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/uart/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/uart/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/uart/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/uart/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/uart/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/uart/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/uart/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/uart/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/uart/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/uart/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/uart/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/uart/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/uart/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/uart/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/uart/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/uart/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/uart/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/uart/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/uart/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/uart/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/uart/boot/pc98/boot2/io.c#1 branch .. //depot/projects/uart/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/uart/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/uart/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/uart/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/uart/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/uart/boot/pc98/boot2/start.S#1 branch .. //depot/projects/uart/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/uart/boot/pc98/boot2/table.c#1 branch .. //depot/projects/uart/boot/pc98/btx/Makefile#1 branch .. //depot/projects/uart/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/uart/boot/pc98/btx/btx/btx.s#1 branch .. //depot/projects/uart/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/uart/boot/pc98/btx/btxldr/btxldr.s#1 branch .. //depot/projects/uart/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/uart/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/uart/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/uart/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/uart/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/uart/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/uart/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/uart/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/uart/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/uart/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/uart/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/uart/boot/pc98/libpc98/gatea20.c#1 branch .. //depot/projects/uart/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/uart/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/uart/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/uart/boot/pc98/loader/Makefile#1 branch .. //depot/projects/uart/boot/pc98/loader/conf.c#1 branch .. //depot/projects/uart/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/uart/boot/pc98/loader/main.c#1 branch .. //depot/projects/uart/boot/powerpc/Makefile#1 branch .. //depot/projects/uart/boot/powerpc/loader/Makefile#1 branch .. //depot/projects/uart/boot/powerpc/loader/conf.c#1 branch .. //depot/projects/uart/boot/powerpc/loader/help.ofw#1 branch .. //depot/projects/uart/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/uart/boot/powerpc/loader/start.c#1 branch .. //depot/projects/uart/boot/powerpc/loader/version#1 branch .. //depot/projects/uart/boot/sparc64/Makefile#1 branch .. //depot/projects/uart/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/uart/boot/sparc64/boot1/_start.S#1 branch .. //depot/projects/uart/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/uart/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/uart/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/uart/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/uart/boot/sparc64/loader/main.c#1 branch .. //depot/projects/uart/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/uart/boot/sparc64/loader/version#1 branch .. //depot/projects/uart/cam/cam.c#1 branch .. //depot/projects/uart/cam/cam.h#1 branch .. //depot/projects/uart/cam/cam_ccb.h#1 branch .. //depot/projects/uart/cam/cam_debug.h#1 branch .. //depot/projects/uart/cam/cam_periph.c#1 branch .. //depot/projects/uart/cam/cam_periph.h#1 branch .. //depot/projects/uart/cam/cam_queue.c#1 branch .. //depot/projects/uart/cam/cam_queue.h#1 branch .. //depot/projects/uart/cam/cam_sim.c#1 branch .. //depot/projects/uart/cam/cam_sim.h#1 branch .. //depot/projects/uart/cam/cam_xpt.c#1 branch .. //depot/projects/uart/cam/cam_xpt.h#1 branch .. //depot/projects/uart/cam/cam_xpt_periph.h#1 branch .. //depot/projects/uart/cam/cam_xpt_sim.h#1 branch .. //depot/projects/uart/cam/scsi/scsi_all.c#1 branch .. //depot/projects/uart/cam/scsi/scsi_all.h#1 branch .. //depot/projects/uart/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/uart/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/uart/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/uart/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/uart/cam/scsi/scsi_da.c#1 branch .. //depot/projects/uart/cam/scsi/scsi_da.h#1 branch .. //depot/projects/uart/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/uart/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/uart/cam/scsi/scsi_low.c#1 branch .. //depot/projects/uart/cam/scsi/scsi_low.h#1 branch .. //depot/projects/uart/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/uart/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/uart/cam/scsi/scsi_message.h#1 branch .. //depot/projects/uart/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/uart/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/uart/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/uart/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/uart/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/uart/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/uart/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/uart/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/uart/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/uart/cam/scsi/scsi_target.c#1 branch .. //depot/projects/uart/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/uart/coda/00READ#1 branch .. //depot/projects/uart/coda/README#1 branch .. //depot/projects/uart/coda/TODO#1 branch .. //depot/projects/uart/coda/cnode.h#1 branch .. //depot/projects/uart/coda/coda.h#1 branch .. //depot/projects/uart/coda/coda_fbsd.c#1 branch .. //depot/projects/uart/coda/coda_io.h#1 branch .. //depot/projects/uart/coda/coda_kernel.h#1 branch .. //depot/projects/uart/coda/coda_namecache.c#1 branch .. //depot/projects/uart/coda/coda_namecache.h#1 branch .. //depot/projects/uart/coda/coda_opstats.h#1 branch .. //depot/projects/uart/coda/coda_pioctl.h#1 branch .. //depot/projects/uart/coda/coda_psdev.c#1 branch .. //depot/projects/uart/coda/coda_psdev.h#1 branch .. //depot/projects/uart/coda/coda_subr.c#1 branch .. //depot/projects/uart/coda/coda_subr.h#1 branch .. //depot/projects/uart/coda/coda_venus.c#1 branch .. //depot/projects/uart/coda/coda_venus.h#1 branch .. //depot/projects/uart/coda/coda_vfsops.c#1 branch .. //depot/projects/uart/coda/coda_vfsops.h#1 branch .. //depot/projects/uart/coda/coda_vnops.c#1 branch .. //depot/projects/uart/coda/coda_vnops.h#1 branch .. //depot/projects/uart/compat/linprocfs/linprocfs.c#1 branch .. //depot/projects/uart/compat/linux/linux_file.c#1 branch .. //depot/projects/uart/compat/linux/linux_getcwd.c#1 branch .. //depot/projects/uart/compat/linux/linux_ioctl.c#1 branch .. //depot/projects/uart/compat/linux/linux_ioctl.h#1 branch .. //depot/projects/uart/compat/linux/linux_ipc.c#1 branch .. //depot/projects/uart/compat/linux/linux_ipc.h#1 branch .. //depot/projects/uart/compat/linux/linux_mib.c#1 branch .. //depot/projects/uart/compat/linux/linux_mib.h#1 branch .. //depot/projects/uart/compat/linux/linux_misc.c#1 branch .. //depot/projects/uart/compat/linux/linux_signal.c#1 branch .. //depot/projects/uart/compat/linux/linux_signal.h#1 branch .. //depot/projects/uart/compat/linux/linux_socket.c#1 branch .. //depot/projects/uart/compat/linux/linux_socket.h#1 branch .. //depot/projects/uart/compat/linux/linux_stats.c#1 branch .. //depot/projects/uart/compat/linux/linux_sysctl.c#1 branch .. //depot/projects/uart/compat/linux/linux_uid16.c#1 branch .. //depot/projects/uart/compat/linux/linux_util.c#1 branch .. //depot/projects/uart/compat/linux/linux_util.h#1 branch .. //depot/projects/uart/compat/pecoff/imgact_pecoff.c#1 branch .. //depot/projects/uart/compat/pecoff/imgact_pecoff.h#1 branch .. //depot/projects/uart/compat/svr4/Makefile#1 branch .. //depot/projects/uart/compat/svr4/imgact_svr4.c#1 branch .. //depot/projects/uart/compat/svr4/svr4.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_acl.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_dirent.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_errno.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_exec.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_fcntl.c#1 branch .. //depot/projects/uart/compat/svr4/svr4_fcntl.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_filio.c#1 branch .. //depot/projects/uart/compat/svr4/svr4_filio.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_fuser.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_hrt.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_ioctl.c#1 branch .. //depot/projects/uart/compat/svr4/svr4_ioctl.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_ipc.c#1 branch .. //depot/projects/uart/compat/svr4/svr4_ipc.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_misc.c#1 branch .. //depot/projects/uart/compat/svr4/svr4_mman.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_proto.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_resource.c#1 branch .. //depot/projects/uart/compat/svr4/svr4_resource.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_siginfo.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_signal.c#1 branch .. //depot/projects/uart/compat/svr4/svr4_signal.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_socket.c#1 branch .. //depot/projects/uart/compat/svr4/svr4_socket.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_sockio.c#1 branch .. //depot/projects/uart/compat/svr4/svr4_sockio.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_sockmod.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_stat.c#1 branch .. //depot/projects/uart/compat/svr4/svr4_stat.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_statvfs.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_stream.c#1 branch .. //depot/projects/uart/compat/svr4/svr4_stropts.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_syscall.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_syscallnames.c#1 branch .. //depot/projects/uart/compat/svr4/svr4_sysconfig.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_sysent.c#1 branch .. //depot/projects/uart/compat/svr4/svr4_systeminfo.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_sysvec.c#1 branch .. //depot/projects/uart/compat/svr4/svr4_termios.c#1 branch .. //depot/projects/uart/compat/svr4/svr4_termios.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_time.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_timod.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_ttold.c#1 branch .. //depot/projects/uart/compat/svr4/svr4_ttold.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_types.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_ucontext.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_ulimit.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_ustat.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_util.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_utsname.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_wait.h#1 branch .. //depot/projects/uart/compat/svr4/syscalls.conf#1 branch .. //depot/projects/uart/compat/svr4/syscalls.master#1 branch .. //depot/projects/uart/conf/Makefile.alpha#1 branch .. //depot/projects/uart/conf/Makefile.amd64#1 branch .. //depot/projects/uart/conf/Makefile.i386#1 branch .. //depot/projects/uart/conf/Makefile.ia64#1 branch .. //depot/projects/uart/conf/Makefile.pc98#1 branch .. //depot/projects/uart/conf/Makefile.powerpc#1 branch .. //depot/projects/uart/conf/Makefile.sparc64#1 branch .. //depot/projects/uart/conf/NOTES#1 branch .. //depot/projects/uart/conf/defines#1 branch .. //depot/projects/uart/conf/files#1 branch .. //depot/projects/uart/conf/files.alpha#1 branch .. //depot/projects/uart/conf/files.amd64#1 branch .. //depot/projects/uart/conf/files.i386#1 branch .. //depot/projects/uart/conf/files.ia64#1 branch .. //depot/projects/uart/conf/files.pc98#1 branch .. //depot/projects/uart/conf/files.powerpc#1 branch .. //depot/projects/uart/conf/files.sparc64#1 branch .. //depot/projects/uart/conf/kern.mk#1 branch .. //depot/projects/uart/conf/kern.post.mk#1 branch .. //depot/projects/uart/conf/kern.pre.mk#1 branch .. //depot/projects/uart/conf/kmod.mk#1 branch .. //depot/projects/uart/conf/kmod_syms.awk#1 branch .. //depot/projects/uart/conf/ldscript.alpha#1 branch .. //depot/projects/uart/conf/ldscript.amd64#1 branch .. //depot/projects/uart/conf/ldscript.i386#1 branch .. //depot/projects/uart/conf/ldscript.ia64#1 branch .. //depot/projects/uart/conf/ldscript.powerpc#1 branch .. //depot/projects/uart/conf/ldscript.sparc64#1 branch .. //depot/projects/uart/conf/majors#1 branch .. //depot/projects/uart/conf/majors.awk#1 branch .. //depot/projects/uart/conf/makeLINT.mk#1 branch .. //depot/projects/uart/conf/makeLINT.sed#1 branch .. //depot/projects/uart/conf/newvers.sh#1 branch .. //depot/projects/uart/conf/options#1 branch .. //depot/projects/uart/conf/options.alpha#1 branch .. //depot/projects/uart/conf/options.amd64#1 branch .. //depot/projects/uart/conf/options.i386#1 branch .. //depot/projects/uart/conf/options.ia64#1 branch .. //depot/projects/uart/conf/options.pc98#1 branch .. //depot/projects/uart/conf/options.powerpc#1 branch .. //depot/projects/uart/conf/options.sparc64#1 branch .. //depot/projects/uart/conf/systags.sh#1 branch .. //depot/projects/uart/contrib/dev/acpica/CHANGES.txt#1 branch .. //depot/projects/uart/contrib/dev/acpica/acapps.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acconfig.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acdebug.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acdisasm.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acdispat.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acefi.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acenv.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acevents.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acexcep.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acfreebsd.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acgcc.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acglobal.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/achware.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acinterp.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/aclocal.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acmacros.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acnamesp.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acobject.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acoutput.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acparser.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acpi.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acpica_prep.sh#1 branch .. //depot/projects/uart/contrib/dev/acpica/acpiosxf.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acpixf.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acresrc.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acstruct.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/actables.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/actbl.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/actbl1.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/actbl2.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/actypes.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acutils.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/amlcode.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/amlresrc.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/dbcmds.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/dbdisply.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/dbexec.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/dbfileio.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/dbhistry.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/dbinput.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/dbstats.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/dbutils.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/dbxface.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/dmbuffer.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/dmnames.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/dmopcode.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/dmresrc.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/dmresrcl.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/dmresrcs.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/dmutils.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/dmwalk.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/dsfield.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/dsinit.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/dsmethod.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/dsmthdat.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/dsobject.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/dsopcode.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 28 23:47:56 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3144537B404; Sat, 28 Jun 2003 23:47:56 -0700 (PDT) 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 DCFE737B401 for ; Sat, 28 Jun 2003 23:47:55 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F6884400E for ; Sat, 28 Jun 2003 23:47:55 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5T6lt0U082162 for ; Sat, 28 Jun 2003 23:47:55 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5T6lsAF082159 for perforce@freebsd.org; Sat, 28 Jun 2003 23:47:54 -0700 (PDT) Date: Sat, 28 Jun 2003 23:47:54 -0700 (PDT) Message-Id: <200306290647.h5T6lsAF082159@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 33832 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, 29 Jun 2003 06:47:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=33832 Change 33832 by marcel@marcel_nfs on 2003/06/28 23:47:05 Initial submission of the uart(4) driver. The driver is mostly non-functional. At this stage it's important to play with the hardware abstraction and the overall setup of the framework. The overall structure of the uart(4) driver is: uart_bus_* - bus front-ends. uart_dev_* - hardware device drivers. uart_cpu_* - machine dependent functions. uart_cons.c - low-level console code. uart_core.c - the device oriented framework. uart_tty.c - high-level TTY code. Affected files ... .. //depot/projects/uart/dev/uart/uart.h#1 add .. //depot/projects/uart/dev/uart/uart_bus.h#1 add .. //depot/projects/uart/dev/uart/uart_bus_acpi.c#1 add .. //depot/projects/uart/dev/uart/uart_bus_ebus.c#1 add .. //depot/projects/uart/dev/uart/uart_bus_isa.c#1 add .. //depot/projects/uart/dev/uart/uart_bus_pci.c#1 add .. //depot/projects/uart/dev/uart/uart_bus_puc.c#1 add .. //depot/projects/uart/dev/uart/uart_cons.c#1 add .. //depot/projects/uart/dev/uart/uart_core.c#1 add .. //depot/projects/uart/dev/uart/uart_cpu.h#1 add .. //depot/projects/uart/dev/uart/uart_cpu_alpha.c#1 add .. //depot/projects/uart/dev/uart/uart_cpu_i386.c#1 add .. //depot/projects/uart/dev/uart/uart_cpu_ia64.c#1 add .. //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#1 add .. //depot/projects/uart/dev/uart/uart_dev_ns8250.c#1 add .. //depot/projects/uart/dev/uart/uart_dev_ns8250.h#1 add .. //depot/projects/uart/dev/uart/uart_dev_sab82532.c#1 add .. //depot/projects/uart/dev/uart/uart_dev_sab82532.h#1 add .. //depot/projects/uart/dev/uart/uart_if.m#1 add .. //depot/projects/uart/dev/uart/uart_tty.c#1 add .. //depot/projects/uart/dev/uart/uart_tty.h#1 add Differences ...